Merge pull request #30 from Robert-N7/develop

Fix Blue fog bug and overloading Image Manager

Author: Robert-N7

.gitignore

@@ -1,13 +1,37 @@
 *.o
 *.out
 *.exe
-*.gch
 *.tags*
-*.pyc
+
+# Mario Kart Wii general files
 *.brres
 *.szs
 *.d
+
+# Pycharm
+__pycache*
+.idea*
+*.spec
+*.pyc
+*.gch
+venv*
+
+# Temporary files
 tmp.*
+tmp/*
+temp/*
 temp.*
 test.*
-__pycache*
+temp_files*
+
+# build and dist folders
+abmatt/dist/abmatt_*
+abmatt/dist/main*
+abmatt/build/main*
+abmatt/build/version
+
+# debugging files
+names.txt
+
+#Images
+*.png

.idea/runConfigurations/abmatt.xml

@@ -3,6 +3,7 @@
 ANoob's Brres Material Editor
 For editing Mario Kart Wii files
 """
+import os.path
 import sys
 
 from abmatt import load_config
@@ -18,7 +19,7 @@ def main():
     if getattr(sys, 'frozen', False):
         base_path = sys.executable
     else:
-        base_path = __file__
+        base_path = os.path.abspath(__file__)
     try:
         files = load_config.parse_args(argv, base_path)
         # cleanup

abmatt/__main__.py

@@ -38,7 +38,7 @@ def __init__(self, filename, mode='r', bom='>'):
 
         # debugging
         # self.linked_offsets = []
-        # self.target = [18231, 18267, 18284, 18285]
+        # self.target = [2183799]
         # end debugging
 
         self.isWriteMode = (mode == 'w')
@@ -344,13 +344,13 @@ def write(self, fmt, *args):
         # debugging
         # for x in self.target:
         #     if self.offset >= x - 4:
-        #         return len
-        return len
+        #         self.target.remove(x)
+        #         return
+        # return
 
     def writeOffset(self, fmt, offset, args):
         """ packs data at offset, must be less than file length """
         pack_into(self.bom + fmt, self.file, offset, args)
-        return len
 
     def writeRemaining(self, data):
         """ writes the remaining bytes at current offset """

abmatt/brres/lib/binfile.py

@@ -143,7 +143,7 @@ def pack_color(binfile, index, color, is_constant):
 
 
 def pack_color_reg(binfile, bpmem, left_bits, right_bits):
-    data = (left_bits & 0x7ff) << 12 | right_bits & 0xfff
+    data = (left_bits & 0xfff) << 12 | right_bits & 0xfff
     pack_bp(binfile, bpmem, data)
 
 

abmatt/brres/lib/packing/pack_mdl0/bp.py

@@ -168,7 +168,7 @@ def pack_mat_gx(self, binfile):
         mat = self.node
         bp.pack_alpha_function(binfile, mat.ref0, mat.ref1, mat.comp0, mat.comp1, mat.logic)
         bp.pack_zmode(binfile, mat.depth_test, mat.depth_update, mat.depth_function)
-        bp.pack_bp_mask(binfile)
+        bp.pack_bp_mask(binfile, 0xffe3)
         bp.pack_blend_mode(binfile, mat.blend_enabled, mat.blend_logic_enabled, mat.blend_dither,
                            mat.blend_update_color, mat.blend_update_alpha, mat.blend_subtract, mat.blend_logic,
                            mat.blend_source, mat.blend_dest)

abmatt/brres/lib/packing/pack_mdl0/pack_material.py

@@ -88,6 +88,16 @@ def get_format(self, point):
             return point.get_format()
         return 0
 
+    def get_format_color(self, color):
+        if color:
+            return color.get_format()
+        return 5
+
+    def get_format_uv(self, uv):
+        if uv:
+            return uv.get_format()
+        return 4
+
     def get_divisor(self, point):
         if point:
             return point.get_divisor()
@@ -102,21 +112,21 @@ def get_uvat(self):
         uvs = poly.get_uvs()
         tex_e = poly.tex_e
         uvata = poly.vertex_e | self.get_format(vert) << 1 | self.get_divisor(vert) << 4 \
-                | poly.normal_e << 9 | self.get_format(normal) << 10 \
-                | poly.color0_e << 13 | self.get_format(color0) << 14 \
-                | poly.color1_e << 17 | self.get_format(color1) << 18 \
-                | tex_e[0] << 21 | self.get_format(uvs[0]) << 22 | self.get_divisor(uvs[0]) << 25 \
+                | poly.normal_e << 9 | self.get_format_uv(normal) << 10 \
+                | poly.color0_e << 13 | self.get_format_color(color0) << 14 \
+                | poly.color1_e << 17 | self.get_format_color(color1) << 18 \
+                | tex_e[0] << 21 | self.get_format_uv(uvs[0]) << 22 | self.get_divisor(uvs[0]) << 25 \
                 | 1 << 30 | poly.normal_index3 << 31
 
         shifter = uvatb = 0
         for i in range(1, 4):
-            uvatb |= (self.get_format(uvs[i]) << 1 | self.get_divisor(uvs[i]) << 4 | tex_e[i]) << shifter
+            uvatb |= (self.get_format_uv(uvs[i]) << 1 | self.get_divisor(uvs[i]) << 4 | tex_e[i]) << shifter
             shifter += 9
-        uvatb |= poly.tex_e[4] << shifter | self.get_format(uvs[4]) << shifter + 1 | 1 << 31
+        uvatb |= poly.tex_e[4] << shifter | self.get_format_uv(uvs[4]) << shifter + 1 | 1 << 31
         shifter = 5
         uvatc = self.get_divisor(uvs[4])
         for i in range(5, 8):
-            uvatc |= (tex_e[i] | self.get_format(uvs[i]) << 1 | self.get_divisor(uvs[i]) << 3) << shifter
+            uvatc |= (tex_e[i] | self.get_format_uv(uvs[i]) << 1 | self.get_divisor(uvs[i]) << 3) << shifter
             shifter += 9
         return uvata, uvatb, uvatc
 

abmatt/brres/lib/packing/pack_mdl0/pack_polygon.py

@@ -142,7 +142,7 @@ def force11bitFloat(self, val):
 
 
 def unpack_color(binfile, is_constant):
-    red, alpha = unpack_color_reg(binfile)
+    alpha, red = unpack_color_reg(binfile)
     green, blue = unpack_color_reg(binfile)
     if not is_constant:
         binfile.advance(10)
@@ -151,7 +151,7 @@ def unpack_color(binfile, is_constant):
 
 def unpack_color_reg(binfile):
     data = unpack_bp(binfile)
-    return data >> 12 & 0x7ff, data & 0xfff
+    return data >> 12 & 0xfff, data & 0xfff
 
 
 def unpack_bp(binfile, return_enabled=False):

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

@@ -109,7 +109,7 @@ def unpack_light_channels(self, binfile, nlights):
     def unpack_matgx(self, mat, binfile):
         mat.ref0, mat.ref1, mat.comp0, mat.comp1, mat.logic = bp.unpack_alpha_function(binfile)
         mat.depth_test, mat.depth_update, mat.depth_function = bp.unpack_zmode(binfile)
-        bp.unpack_bp(binfile)   # mask
+        bp.unpack_bp(binfile)   # mask 0xffe3
         mat.blend_enabled, mat.blend_logic_enabled, mat.blend_dither, \
             mat.blend_update_color, mat.blend_update_alpha, \
             mat.blend_subtract, mat.blend_logic, \

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

@@ -141,6 +141,9 @@ def parse_uvat(self, polygon, uvata, uvatb, uvatc):
         # polygon.color0_format = uvata >> 14 & 7
         polygon.color1_e = uvata >> 17 & 1
         # polygon.color1_format = uvata >> 18 & 7
+
+        # polygon.tex_format = [0] * 8
+        # polygon.tex_divisor = [0] * 8
         polygon.tex_e[0] = uvata >> 21 & 1
         # polygon.tex_format[0] = uvata >> 22 & 7
         # polygon.tex_divisor[0] = uvata >> 25 & 0x1f

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

@@ -221,7 +221,7 @@ def setPriority(self, id, priority):
         return True
 
     def sort(self):
-        self.list = sorted(self.list, key=lambda x: x.priority)
+        self.list = sorted(self.list, key=lambda x: (x.priority, x.matIndex))
 
     def unpack(self, binfile):
         li = self.list

abmatt/brres/mdl0/definition.py

@@ -15,7 +15,7 @@ def __eq__(self, other):
         :return: True if equal
         """
         return type(other) == LightChannel and self.materialColorEnabled == other.materialColorEnabled and \
-            self.materialAlphaEnabled == other and \
+            self.materialAlphaEnabled == other.materialAlphaEnabled and \
             self.ambientAlphaEnabled == other.ambientAlphaEnabled and \
             self.ambientColorEnabled == other.ambientColorEnabled and \
             self.rasterAlphaEnabled == other.rasterAlphaEnabled and \

abmatt/brres/mdl0/material/light.py

@@ -1,5 +1,5 @@
 build_name = main   # build output name
 build_type = onedir   # the type of build, (auto|onefile|onedir)
-version = 0.9.2
+version = 0.9.3
 run_integration_tests = True
 run_unit_tests = True

abmatt/build/config.txt

@@ -495,7 +495,7 @@ def __initialize_libraries(self, initial_name):
     def __initialize_assets(self, root):
         asset = XMLNode('asset', parent=root)
         contributor = XMLNode('contributor', parent=asset)
-        authoring_tool = XMLNode('authoring_tool', 'ABMATT COLLADA exporter v0.9.2', parent=contributor)
+        authoring_tool = XMLNode('authoring_tool', 'ABMATT COLLADA exporter v0.9.3', parent=contributor)
         time_stamp = datetime.now()
         created = XMLNode('created', str(time_stamp), parent=asset)
         modified = XMLNode('modified', str(time_stamp), parent=asset)

abmatt/converters/dae.py

@@ -138,15 +138,15 @@ def save(self):
         self.save_obj()
 
     def save_mtllib(self, folder):
-        s = '# Wavefront MTL exported with ABMATT v0.9.2'
+        s = '# Wavefront MTL exported with ABMATT v0.9.3'
         materials = self.materials
         for x in materials:
             s += '\n' + materials[x].get_save_str()
         with open(os.path.join(folder, self.mtllib), 'w') as f:
             f.write(s)
 
     def save_obj(self):
-        s = '# Wavefront OBJ exported with ABMATT v0.9.2\n\nmtllib ' + self.mtllib + '\n\n'
+        s = '# Wavefront OBJ exported with ABMATT v0.9.3\n\nmtllib ' + self.mtllib + '\n\n'
         vertex_index = 1
         normal_index = 1
         normal_offset = -1

abmatt/converters/obj.py

@@ -1,6 +1,6 @@
 ====================================================================================
 ANOOB'S BRRES MATERIAL TOOL
-Version: 0.9.2
+Version: 0.9.3
 Author: Robert Nelson
 OS: linux
 Github: https://github.com/Robert-N7/abmatt

abmatt/dist/install-ubu.txt

@@ -1,6 +1,6 @@
 ===================================================================================================
 ANOOB'S BRRES MATERIAL TOOL
-Version 0.9.2
+Version 0.9.3
 Robert Nelson
 OS: Windows 10 64-bit
 Github: https://github.com/Robert-N7/abmatt

abmatt/dist/install-win.txt

@@ -1,4 +1,4 @@
-!define VERSION "0.9.2"
+!define VERSION "0.9.3"
 !define PROGRAM_NAME "ANoob's Brres Material Tool ${VERSION}"
 InstallDir "$Documents\abmatt"
 Name "${PROGRAM_NAME}"

abmatt/dist/make_installer.nsi

@@ -45,10 +45,10 @@ def main(argv):
         file1 = sys.argv[0]
         file2 = sys.argv[1]
     else:
-        file1 = 'C:/Users/rober/Desktop/candyland/course_model_0.7.4.brres'
+        file1 = '../brres_files/beginner_course.brres'
         file2 = '../brres_files/test.brres'
     compare_start0 = 0  # 2183680
     compare_start1 = 0  # 2183264
-    compare_length = 18300
-    ignore_offsets = [40, 96, 136, 452, 508, 548, 732, 916, 1100, 1284, 1468, 1652, 56, 72, 112, 360, 524, 2008, 152, 1260, 1444, 1796, 15688, 16728, 57876, 168, 1180, 1364, 1716, 8168, 9208, 63380, 184, 1244, 1428, 1780, 14184, 15224, 107092, 200, 1228, 1412, 1764, 12680, 13720, 150804, 216, 1148, 1332, 1684, 5160, 6200, 153588, 232, 1164, 1348, 1700, 6664, 7704, 154324, 248, 1132, 1316, 1668, 3656, 4696, 241684, 264, 1212, 1396, 1748, 11176, 12216, 329044, 280, 1196, 1380, 1732, 9672, 10712, 503700, 468, 484, 564, 748, 1484, 22360, 35852, 46700, 580, 764, 1500, 22840, 36204, 46764, 596, 780, 1516, 25016, 38188, 47212, 612, 796, 1532, 25400, 38348, 47276, 628, 812, 1548, 25784, 38476, 47340, 644, 828, 1564, 26520, 39276, 47628, 660, 844, 1580, 31512, 42284, 49388, 676, 860, 1596, 32248, 43116, 49484, 692, 876, 1612, 32760, 43596, 49548, 708, 892, 1628, 33720, 44844, 49612, 932, 50060, 948, 50316, 964, 51788, 980, 51884, 996, 51980, 1012, 52364, 1028, 55436, 1044, 55788, 1060, 56012, 1076, 56492, 1116, 1300, 2216, 32, 36, 44, 48, 52, 64, 68, 88, 92, 100, 104, 108, 116, 128, 132, 140, 144, 148, 156, 160, 164, 172, 176, 180, 188, 192, 196, 204, 208, 212, 220, 224, 228, 236, 240, 244, 252, 256, 260, 268, 272, 276, 284, 304, 308, 312, 316, 320, 324, 328, 332, 336, 340, 344, 348, 352, 356, 400, 444, 448, 456, 460, 464, 472, 476, 480, 488, 500, 504, 512, 516, 520, 528, 540, 544, 552, 556, 560, 568, 572, 576, 584, 588, 592, 600, 604, 608, 616, 620, 624, 632, 636, 640, 648, 652, 656, 664, 668, 672, 680, 684, 688, 696, 700, 704, 712, 724, 728, 736, 740, 744, 752, 756, 760, 768, 772, 776, 784, 788, 792, 800, 804, 808, 816, 820, 824, 832, 836, 840, 848, 852, 856, 864, 868, 872, 880, 884, 888, 896, 908, 912, 920, 924, 928, 936, 940, 944, 952, 956, 960, 968, 972, 976, 984, 988, 992, 1000, 1004, 1008, 1016, 1020, 1024, 1032, 1036, 1040, 1048, 1052, 1056, 1064, 1068, 1072, 1080, 1092, 1096, 1104, 1108, 1112, 1120, 1124, 1128, 1136, 1140, 1144, 1152, 1156, 1160, 1168, 1172, 1176, 1184, 1188, 1192, 1200, 1204, 1208, 1216, 1220, 1224, 1232, 1236, 1240, 1248, 1252, 1256, 1264, 1276, 1280, 1288, 1292, 1296, 1304, 1308, 1312, 1320, 1324, 1328, 1336, 1340, 1344, 1352, 1356, 1360, 1368, 1372, 1376, 1384, 1388, 1392, 1400, 1404, 1408, 1416, 1420, 1424, 1432, 1436, 1440, 1448, 1460, 1464, 1472, 1476, 1480, 1488, 1492, 1496, 1504, 1508, 1512, 1520, 1524, 1528, 1536, 1540, 1544, 1552, 1556, 1560, 1568, 1572, 1576, 1584, 1588, 1592, 1600, 1604, 1608, 1616, 1620, 1624, 1632, 1644, 1648, 1656, 1660, 1664, 1672, 1676, 1680, 1688, 1692, 1696, 1704, 1708, 1712, 1720, 1724, 1728, 1736, 1740, 1744, 1752, 1756, 1760, 1768, 1772, 1776, 1784, 1788, 1792, 1800, 1808, 1812, 1820, 1824, 1832, 1836, 1844, 1848, 1856, 1860, 1868, 1872, 1880, 1884, 1892, 1896, 1904, 1908, 2096, 2100, 2248, 2256, 2268, 3688, 3696, 3708, 5192, 5200, 5212, 6696, 6704, 6716, 8200, 8208, 8220, 9704, 9712, 9724, 11208, 11216, 11228, 12712, 12720, 12732, 14216, 14224, 14236, 15720, 15728, 15740, 22404, 22884, 25060, 25444, 25828, 26564, 31556, 32292, 32804, 33764, 35848, 36200, 38184, 38344, 38472, 39272, 42280, 43112, 43592, 44840, 46696, 46760, 47208, 47272, 47336, 47624, 49384, 49480, 49544, 49608, 50056, 50312, 51784, 51880, 51976, 52360, 55432, 55784, 56008, 56488, 57872, 63376, 107088, 150800, 153584, 154320, 241680, 329040, 503696]
+    compare_length = 41000000
+    ignore_offsets = []
     main((file1, file2, compare_start0, compare_start1, compare_length, ignore_offsets))

abmatt/file_compare.py

@@ -60,6 +60,7 @@ def stop():
 
     @pyqtSlot()
     def run(self):
+        AutoFix.get().info('Started converter... ', 5)
         try:
             while True:
                 if len(self.queue):

abmatt/gui/converter.py

@@ -112,6 +112,7 @@ def notify_image_observers(self, brres, directory):
     @pyqtSlot()
     def run(self):
         try:
+            AutoFix.get().info('Started image manager...', 5)
             self.__clean()
             while self.enabled:
                 if len(self.queue):
@@ -122,9 +123,9 @@ def run(self):
         except:
             AutoFix.get().exception(shutdown=True)
 
-
     def __enqueue(self, brres):
-        self.queue.append(brres)
+        if brres not in self.queue:
+            self.queue.append(brres)
         self.is_ready = False
 
     def enqueue(self, brres):
@@ -156,7 +157,6 @@ def __decode_brres_images(self, brres):
             self.signals.on_image_update.emit((brres, folder_name))
         except DecodeError as e:
             AutoFix.get().exception(e)
-        # self.__on_update_brres_images(name, folder_name)
 
     def __get_unique_folder_name(self):
         return os.path.join(self.tmp_dir, str(uuid.uuid4()))

abmatt/gui/image_manager.py

@@ -42,16 +42,21 @@ def __init__(self, brres_files=[]):
         self.shell = None
         for file in brres_files:
             self.open(file.name)
+        AutoFix.get().info('Initialized main window', 5)
         self.show()
 
     def __init_threads(self):
+        AutoFix.get().info('Starting threads...', 5)
         self.threadpool = QThreadPool()     # for multi-threading
+        self.threadpool.setMaxThreadCount(5)
         self.converter = converter = ConvertManager.get()
         converter.signals.on_conversion_finish.connect(self.on_conversion_finish)
         self.image_manager = image_manager = ImageManager.get()
         if image_manager.enabled:
             image_manager.signals.on_image_update.connect(self.on_image_update)
             self.threadpool.start(image_manager)
+        else:
+            AutoFix.get().warn('Image Manager disabled, do you have Wiimms SZS Tools installed?')
         self.threadpool.start(converter)
         log_pipe = LoggerPipe()
         log_pipe.info_sig.connect(self.info)
@@ -164,9 +169,9 @@ def locate_material(self, brres_path):
     def __init_child_UI(self, top_layout):
         # left
         vert_widget = QWidget(self)
-        policy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.MinimumExpanding)
-        policy.setHorizontalStretch(2)
-        vert_widget.setSizePolicy(policy)
+        # policy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.MinimumExpanding)
+        # policy.setHorizontalStretch(2)
+        # vert_widget.setSizePolicy(policy)
         top_layout.addWidget(vert_widget)
         self.left = vert_layout = QVBoxLayout()
         vert_widget.setLayout(vert_layout)
@@ -180,6 +185,7 @@ def __init_child_UI(self, top_layout):
         vert_layout.addWidget(self.logger)
 
         self.treeview = BrresTreeView(self)
+        self.treeview.setMinimumWidth(300)
         center_layout.addWidget(self.treeview)
         self.poly_editor = PolyEditor(self)
         center_layout.addWidget(self.poly_editor)
@@ -416,6 +422,7 @@ def closeEvent(self, event):
                 return
             for x in files_to_save:
                 x.close()
+        self.threadpool.clear()
         self.image_manager.stop()
         self.converter.stop()
         event.accept()
@@ -443,7 +450,7 @@ def main():
     if getattr(sys, 'frozen', False):
         base_path = sys.executable
     else:
-        base_path = os.path.dirname(__file__)
+        base_path = os.path.dirname(os.path.abspath(__file__))
     load_config.parse_args(argv, base_path)
     exe = QApplication(argv)
     exe.setStyle('Fusion')

abmatt/gui/main_window.py

@@ -108,7 +108,7 @@ def load_config(app_dir, loudness=None, autofix_level=None):
     return conf
 
 
-VERSION = '0.9.2'
+VERSION = '0.9.3'
 USAGE = "USAGE: abmatt [command_line][--interactive -f <file> -b <brres-file> -d <destination> --overwrite]"
 
 

abmatt/load_config.py

@@ -28,7 +28,7 @@
 
 # calling the setup function
 setup(name='abmatt',
-      version='0.9.2',
+      version='0.9.3',
       entry_points={
           'console_scripts': [
               'abmatt = abmatt.__main__:main'