Merge pull request #59 from Robert-N7/develop

Fix obj import of single bone

Author: Robert-N7

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'] ['--single-bone']
+convert = 'convert' filename ['to' destination] ['--no-colors'] ['--no-normals'] ['--single-bone'] ['--no-uvs']
 
 selection = name ['in' container]
 container = ['brres' filename] ['model' name];

abmatt/__main__.py

@@ -7,7 +7,6 @@
 import sys
 
 from abmatt import load_config
-from abmatt.autofix import AutoFix
 
 
 def main():
@@ -20,15 +19,10 @@ def main():
         base_path = sys.executable
     else:
         base_path = os.path.abspath(__file__)
-    try:
-        files = load_config.parse_args(argv, base_path)
-        # cleanup
-        for file in files.values():
-            file.close()
-    except:
-        AutoFix.get().quit()
-        raise
-    AutoFix.get().quit()
+    files = load_config.parse_args(argv, base_path)
+    # cleanup
+    for file in files.values():
+        file.close()
 
 
 if __name__ == "__main__":

abmatt/autofix.py

@@ -35,14 +35,14 @@ def __init__(self, bug_level, notify_level, description, fix_des=None):
         self.description = description
         self.fix_des = fix_des
         self.is_resolved = False
-        AutoFix.get().notify(self)
+        AutoFix.notify(self)
 
     # def should_fix(self):
-    #     return not self.is_resolved and AutoFix.get().should_fix(self)
+    #     return not self.is_resolved and AutoFix.should_fix(self)
 
     def resolve(self):
         self.is_resolved = True
-        AutoFix.get().info(f'(FIXED): {self.fix_des}', self.notify_level)
+        AutoFix.info(f'(FIXED): {self.fix_des}', self.notify_level)
 
 
 class AutoFixAbort(BaseException):
@@ -54,6 +54,7 @@ def __init__(self):
 
 class MessageReceiver:
     """Interface to receive messages"""
+
     def info(self, message):
         raise NotImplementedError()
 
@@ -114,29 +115,32 @@ def __init__(self, fix_level=3, loudness=3):
         self.loudness = loudness
         self.fix_level = fix_level
         self.queue = []
-        self.is_running = True
+        self.is_running = False
         self.pipe = None  # if set, output is sent to the pipe, must implement info warn and error.
-        self.thread = Thread(target=self.run)
         AutoFix.__AUTO_FIXER = self
-        self.thread.start()
 
     @staticmethod
     def quit():
         a = AutoFix.__AUTO_FIXER
         if a is not None:
-            a.is_running = False
-            a.thread.join()
-            AutoFix.__AUTO_FIXER = None
+            if a.is_running:
+                a.is_running = False
+                a.thread.join()
+                AutoFix.__AUTO_FIXER = None
 
     def run(self):
-        while self.is_running:
-            sleep(0.01)
+        self.is_running = True
+        while len(self.queue):
             if len(self.queue):
-                message = self.queue.pop(0)
-                message.send(self.pipe)
+                self.queue.pop(0).send(self.pipe)
+            sleep(0.01)
+        self.is_running = False
 
     def enqueue(self, message):
         self.queue.append(message)
+        if not self.is_running:
+            self.thread = Thread(target=self.run)
+            self.thread.start()
 
     @staticmethod
     def get(fixe_level=3, loudness=3):
@@ -164,7 +168,7 @@ def log(self, message):
         if self.loudness >= 5:
             self.enqueue(self.Info(str(message)))
 
-    def info(self, message, loudness=2):
+    def info(self, message, loudness=3):
         if self.loudness >= loudness:
             self.enqueue(self.Info(str(message)))
 
@@ -178,7 +182,7 @@ def error(self, message, loudness=1):
 
     def exception(self, exception=None, shutdown=False):
         exc_type, exc_value, exc_tb = sys.exc_info()
-        if self.loudness >= 5:      # Debug level
+        if self.loudness >= 5:  # Debug level
             s = traceback.format_exception(exc_type, exc_value, exc_tb)
         elif self.loudness >= 1:
             s = traceback.format_exception(exc_type, exc_value, exc_tb, 10)
@@ -244,3 +248,6 @@ def get_level(self, level_str):
 
     def set_loudness(self, level_str):
         self.loudness = self.get_level(level_str)
+
+
+AutoFix = AutoFix()

abmatt/brres/brres.py

@@ -159,14 +159,14 @@ def save(self, filename=None, overwrite=None, check=True):
         if overwrite is None:
             overwrite = self.OVERWRITE
         if not overwrite and os.path.exists(filename):
-            AutoFix.get().error('File {} already exists!'.format(filename), 1)
+            AutoFix.error('File {} already exists!'.format(filename), 1)
         else:
             if check:
                 self.check()
             f = BinFile(filename, mode="w")
             self.pack(f)
             if f.commitWrite():
-                AutoFix.get().info("Wrote file '{}'".format(filename), 2)
+                AutoFix.info("Wrote file '{}'".format(filename), 2)
                 self.rename(filename)
                 self.has_new_model = False
                 self.mark_unmodified()
@@ -179,7 +179,7 @@ def get_trace(self):
         return self.name
 
     def info(self, key=None, indentation_level=0):
-        AutoFix.get().info('{}{}:\t{} model(s)\t{} texture(s)'.format('  ' * indentation_level + '>',
+        AutoFix.info('{}{}:\t{} model(s)\t{} texture(s)'.format('  ' * indentation_level + '>',
                                     self.name, len(self.models), len(self.textures)), 1)
         indentation_level += 2
         self.sub_info('MDL0', self.models, key, indentation_level)
@@ -257,7 +257,7 @@ def add_tex0(self, tex0, replace=True, mark_modified=True):
             if not replace:
                 return False
             self.remove_tex0(tex0.name)
-            AutoFix.get().info('Replaced tex0 {}'.format(tex0.name))
+            AutoFix.info('Replaced tex0 {}'.format(tex0.name))
         if tex0.parent is not None and tex0.parent is not self:
             t = Tex0(tex0.name, self)
             t.paste(tex0)
@@ -315,7 +315,7 @@ def remove_tex0(self, name):
             self.textures.remove(tex)
             self.mark_modified()
         except KeyError:
-            AutoFix.get().warn('No texture {} in {}'.format(name, self.name))
+            AutoFix.warn('No texture {} in {}'.format(name, self.name))
 
     def remove_tex0_i(self, i):
         tex = self.textures.pop(i)
@@ -351,7 +351,7 @@ def pack(self, binfile):
 
     # --------------------------------------------------------------------------
     def check(self):
-        AutoFix.get().info('checking file {}'.format(self.name), 4)
+        AutoFix.info('checking file {}'.format(self.name), 4)
         expected = self.get_expected_mdl_name()
         for mdl in self.models:
             mdl.check(expected)

abmatt/brres/lib/decoder.py

@@ -40,10 +40,10 @@ def decode_data(color):
 
     @staticmethod
     def decode_rgb565(color_data, num_colors):
-        data = unpack('>{}H'.format(num_colors), color_data)
+        data = unpack_from('>{}H'.format(num_colors), color_data, 0)
         colors = []
         for color in data:
-            colors.append(((color >> 8) & 0xf8, (color >> 3) & 0xfc, (color & 0x1f) << 3, 0xff))
+            colors.append(((color >> 8) & 0xf8 | 0x7, (color >> 3) & 0xfc | 0x3, (color & 0x1f) << 3 | 0x7, 0xff))
         return colors
 
     @staticmethod
@@ -69,10 +69,10 @@ def decode_rgba8(data, num_colors):
     @staticmethod
     def decode_rgba4(data, num_colors):
         colors = []
-        c_data = unpack('>{}H'.format(num_colors), data)
+        c_data = unpack_from('>{}H'.format(num_colors), data, 0)
         for color in c_data:
-            colors.append((color >> 8 & 0xf0, color >> 4 & 0xf0,
-                           color & 0xf0, color << 4 & 0xf0))
+            colors.append((color >> 8 & 0xf0 | 0xf, color >> 4 & 0xf0 | 0xf,
+                           color & 0xf0 | 0xf, color << 4 & 0xf0 | 0xf))
         return colors
 
     @staticmethod
@@ -81,8 +81,8 @@ def decode_rgba6(data, num_colors):
         offset = 0
         for i in range(num_colors):
             d = unpack_from('>3B', data, offset)
-            colors.append((d[0] & 0xfc, (d[0] & 0x3) << 6 | (d[1] & 0xf0) >> 2,
-                           d[1] << 4 & 0xf0 | d[2] >> 4 & 0xc, d[2] << 2 & 0xfc))
+            colors.append((d[0] & 0xfc | 0x3, (d[0] & 0x3) << 6 | (d[1] & 0xf0) >> 2 | 0x3,
+                           d[1] << 4 & 0xf0 | d[2] >> 4 & 0xc | 0x3, d[2] << 2 & 0xfc | 0x3))
             offset += 3
         return colors
 
@@ -147,13 +147,13 @@ def decode_polygon(polygon, influences=None):
         influence_collection = InfluenceCollection({0: influence})
     for x in polygon.uv_mtx_indices:
         if x >= 0:
-            AutoFix.get().warn('{} uv matrices data lost in export.'.format(polygon.name))
+            AutoFix.warn('{} uv matrices data lost in export.'.format(polygon.name))
             indices = face_point_indices[:, :, x] // 3
             if (indices < 10).any():
                 print('Less than 10!')
     from abmatt.converters.geometry import Geometry
     geometry = Geometry(polygon.name, polygon.get_material().name, g_verts,
-                        triangles=face_point_indices[:, :, vertex_index:], influences=influence_collection,
+                        triangles=None, influences=influence_collection,
                         linked_bone=linked_bone)
     # create the point collections
     if normals:
@@ -254,7 +254,7 @@ def decode_indices(polygon, fmt_str):
             else:
                 raise error.ConvertError('Texture matrices not supported')
         elif cmd == 0x00:
-            AutoFix.get().warn('Finished parsing {} indices early, possible bug?'.format(polygon.name))
+            AutoFix.warn('Finished parsing {} indices early, possible bug?'.format(polygon.name))
             break
         else:
             raise ValueError('Unsupported draw cmd {}'.format(cmd))
@@ -295,7 +295,7 @@ def decode_pos_mtx_indices(all_influences, weight_groups, vertices, pos_mtx_indi
                 influences[vertex_index] = influence = all_influences[weight_indices[i]]
                 points[vertex_index] = influence.apply_to(points[vertex_index], decode=True)
             elif influences[vertex_index].influence_id != weight_indices[i]:
-                AutoFix.get().warn(f'vertex {vertex_index} has multiple different influences!')
+                AutoFix.warn(f'vertex {vertex_index} has multiple different influences!')
                 influences[vertex_index] = all_influences[weight_indices[i]]
 
     # assert len(influences) == len(points)

abmatt/brres/lib/node.py

@@ -176,7 +176,7 @@ def info(self, key='', indentation_level=0):
         else:
             key += ':' + self.get_str(key)
         start = '>' + indentation_level * '  '
-        AutoFix.get().info('{}{}> {}'.format(start, self.name, key), 1)
+        AutoFix.info('{}{}> {}'.format(start, self.name, key), 1)
 
     def get_full_path(self):
         return os.path.join(self.parent.get_full_path(), self.name)

abmatt/brres/lib/unpacking/unpack_brres.py

@@ -41,7 +41,7 @@ def generate_srt_collections(self, srt0_anims):
             anim_collections.append(collection)
             mdl = brres.get_model(key)
             if not mdl:
-                AutoFix.get().info('No model found matching srt0 animation {} in {}'.format(key, brres.name), 3)
+                AutoFix.info('No model found matching srt0 animation {} in {}'.format(key, brres.name), 3)
             else:
                 mdl.set_srt0(collection)
         return anim_collections
@@ -57,7 +57,7 @@ def generate_pat0_collections(self, pat0_anims):
             anim_collections.append(collection)
             mdl = brres.get_model(key)
             if not mdl:
-                AutoFix.get().info('No model found matching pat0 animation {} in {}'.format(key, brres.name), 3)
+                AutoFix.info('No model found matching pat0 animation {} in {}'.format(key, brres.name), 3)
             else:
                 mdl.set_pat0(collection)
         return anim_collections

abmatt/brres/lib/unpacking/unpack_mdl0/unpack_point.py

@@ -22,7 +22,7 @@ def unpack(self, pt, binfile):
         binfile.advance(4)
         pt.index, pt.comp_count, pt.format, pt.divisor, pt.stride, pt.count = binfile.read('3I2BH', 16)
         if not self.is_valid_comp_count(pt.comp_count):
-            AutoFix.get().error('{} has invalid component count {}, using default {}'.format(pt.name, pt.comp_count,
+            AutoFix.error('{} has invalid component count {}, using default {}'.format(pt.name, pt.comp_count,
                                                                                              pt.default_comp_count))
             pt.comp_count = pt.default_comp_count
         if not is_valid_format(pt.format):
@@ -37,7 +37,7 @@ def unpack(self, pt, binfile):
                 pt.format = point.FMT_INT16
             else:
                 pt.format = point.FMT_INT8
-            AutoFix.get().error('{} has invalid format {}, using format {}'.format(pt.name, old_format,
+            AutoFix.error('{} has invalid format {}, using format {}'.format(pt.name, old_format,
                                                                                    point.FMT_STR[pt.format]))
         # print(self)