Merge pull request #57 from Robert-N7/single_bone

Single bone option and bone transformation fixes
Robert-N7 · Apr 30, 2021 · 9d1774e · 9d1774e
2 parents 010572e + 40a68bd
commit 9d1774e
Show file tree

Hide file tree

Showing 117 changed files with 4,078 additions and 719 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.brres
 *.szs
 *.d
+tracks/
 
 # Pycharm
 __pycache*

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/mkwii.iml b/.idea/mkwii.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations/Unittests_in_tests.xml b/.idea/runConfigurations/Unittests_in_tests.xml
diff --git a/.idea/runConfigurations/abmatt.xml b/.idea/runConfigurations/abmatt.xml
diff --git a/.idea/runConfigurations/analyze.xml b/.idea/runConfigurations/analyze.xml
diff --git a/.idea/runConfigurations/build.xml b/.idea/runConfigurations/build.xml
diff --git a/.idea/runConfigurations/convert_dae.xml b/.idea/runConfigurations/convert_dae.xml
diff --git a/.idea/runConfigurations/integration_tests.xml b/.idea/runConfigurations/integration_tests.xml
diff --git a/.idea/runConfigurations/main_window.xml b/.idea/runConfigurations/main_window.xml
diff --git a/.idea/runConfigurations/time_test.xml b/.idea/runConfigurations/time_test.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ preset = 'preset' preset_name;
 save = 'save' [filename] ['as' destination] ['overwrite']
 copy = 'copy' type;
 paste = 'paste' type;
-convert = 'convert' filename ['to' destination] ['no-colors'] ['no-normals']
+convert = 'convert' filename ['to' destination] ['--no-colors'] ['--no-normals'] ['--single-bone']
 
 selection = name ['in' container]
 container = ['brres' filename] ['model' name];

diff --git a/abmatt/brres/brres.py b/abmatt/brres/brres.py
@@ -90,8 +90,8 @@ def set_str(self, key, value):
             raise ValueError('Unknown key "{}"'.format(key))
 
     def import_model(self, file_path):
-        from abmatt.converters.convert_dae import DaeConverter2
-        converter = DaeConverter2(self, file_path)
+        from abmatt.converters.convert_dae import DaeConverter
+        converter = DaeConverter(self, file_path)
         converter.load_model()
         self.mark_modified()
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     *.brres
     *.szs
     *.d
+    tracks/
     # Pycharm
     __pycache*
@@ Expand Down @@