- Bumed version number to 3.0.4

- Accelerated the importer

Author: AlwarrenSidh

ArmaToolbox/MDLImporter.py

@@ -295,6 +295,18 @@ def loadLOD(context, filePtr, objectName, materialData, layerFlag, lodnr):
     #scn.objects.link(obj)
     #scn.objects.active = obj   
 
+    # Build Edge database to make finding sharp edges easier
+    edgeDict = dict()
+    for edge in mymesh.edges:
+        v1 = edge.vertices[0]
+        v2 = edge.vertices[1]
+        if (v1 > v2): # Swap if out of order
+            temp = v2
+            v2 = v1
+            v1 = temp
+        #print(f"adding edge index {edge.index} as ({v1},{v2}) to edge dictionary")
+        edgeDict[(v1,v2)] = edge.index
+
     print("taggs")    
     loop = True
     sharpEdges = None
@@ -320,7 +332,7 @@ def loadLOD(context, filePtr, objectName, materialData, layerFlag, lodnr):
                     n1 = readULong(filePtr)
                     n2 = readULong(filePtr)
                     sharpEdges.append([n1, n2])
-                #print (sharpEdges)
+                #print ("sharp edges", sharpEdges)
             elif tagName == "#Property#":
                 # Read named property
                 propName  = struct.unpack("64s", filePtr.read(64))[0].decode("utf-8")
@@ -432,14 +444,29 @@ def loadLOD(context, filePtr, objectName, materialData, layerFlag, lodnr):
 
     print("sharp edges")
     # Set sharp edges
+    #if sharpEdges is not None:
+    #    for edge in mymesh.edges:
+    #        v1 = edge.vertices[0]
+    #        v2 = edge.vertices[1]
+    #        if [v1,v2] in sharpEdges:
+    #            mymesh.edges[edge.index].use_edge_sharp = True
+    #        elif [v2,v1] in sharpEdges:
+    #            mymesh.edges[edge.index].use_edge_sharp = True
+
+    # New Code
     if sharpEdges is not None:
-        for edge in mymesh.edges:
-            v1 = edge.vertices[0]
-            v2 = edge.vertices[1]
-            if [v1,v2] in sharpEdges:
-                mymesh.edges[edge.index].use_edge_sharp = True
-            elif [v2,v1] in sharpEdges:
-                mymesh.edges[edge.index].use_edge_sharp = True
+        for sharpEdge in sharpEdges:
+            v1 = sharpEdge[0]
+            v2 = sharpEdge[1]
+            if (v1 > v2): # Swap if out of order
+                temp = v2
+                v2 = v1
+                v1 = temp
+            idx = edgeDict[(v1,v2)]
+            mymesh.edges[idx].use_edge_sharp = True
+
+
+
     #for pair in sharpEdges:
     #    p1 = pair[0]
     #    p2 = pair[1]

ArmaToolbox/__init__.py

@@ -2,7 +2,7 @@
     "name": "Arma: Toolbox",
     "description": "Collection of tools for editing Arma 2/3 content",
     "author": "Hans-Joerg \"Alwarren\" Frieden.",
-    "version": (3, 0, 0),
+    "version": (3, 0, 4),
     "blender": (2, 80, 0),
     "location": "View3D > Panels",
     "warning": '',
@@ -150,14 +150,14 @@ class ATBX_OT_rtm_export(bpy.types.Operator, bpy_extras.io_utils.ExportHelper):
     bl_description = "Export an Arma 2/3 RTM Animation file"
 
     filename_ext = ".rtm"
-    filter_glob = bpy.props.StringProperty(
+    filter_glob : bpy.props.StringProperty(
             default="*.rtm",
             options={'HIDDEN'})
-    staticPose = bpy.props.BoolProperty(
+    staticPose : bpy.props.BoolProperty(
             name="Static Pose", 
             description="Export the current pose as a static pose", 
             default=False)
-    clipFrames = bpy.props.BoolProperty(
+    clipFrames : bpy.props.BoolProperty(
             name="Clip Frames to [0,1]", 
             description="Do not export frames that are outside the 0,1 interval for RTM files", 
             default=True)
@@ -216,11 +216,11 @@ class ATBX_OT_p3d_export(bpy.types.Operator, bpy_extras.io_utils.ExportHelper):
     def execute(self, context):
         if context.view_layer.objects.active == None:
             context.view_layer.objects.active = bpy.data.objects[0]
-            
+
         #try:
         # Open the file and export 
         filePtr = open(self.filepath, "wb")
-        exportMDL(filePtr, self.selectionOnly);
+        exportMDL(self, filePtr, self.selectionOnly);
         filePtr.close()
 
         # Write a temporary O2script file for this