Deleted some comments and made the code easier to read

__init__.py

@@ -21,7 +21,6 @@
     bpy.context.preferences.filepaths.use_relative_paths = False
 
 from bseq import *
-
 from bseq.operators import menu_func_import
 
 classes = [

additional_file_formats/bin.py

@@ -18,7 +18,6 @@ def readBIN_to_meshio(filepath):
     # currently assume that numBodies is always 1
     (numBodies,), bytes = struct.unpack('i', bytes[:4]), bytes[4:]
     numBodies *= isFirstFile
-    #print("numBodies: ", numBodies)
 
     field_datas = []
     for i in range(0, numBodies):
@@ -30,8 +29,6 @@ def readBIN_to_meshio(filepath):
         if i == 0:
             objFileString = objFile.decode('ascii')
 
-        #print("objFileString: ", objFileString)
-
         cur_field_data = {}
         cur_field_data["translation"] = None
         cur_field_data["scaling"] = None
@@ -60,8 +57,6 @@ def readBIN_to_meshio(filepath):
         dirPath = os.path.dirname(filepath)
         objPath = os.path.join(dirPath, objFileString)
 
-        #print("Tried to load object at path: ", objPath)
-
         mesh = meshio.read(objPath)
     else:
         otherFile = open(filepath, 'rb')
@@ -73,13 +68,6 @@ def readBIN_to_meshio(filepath):
         # since there is no object referenced, create empty mesh
         mesh = meshio.Mesh([], [])
 
-    #print("Field Data List:", field_datas)
-    #print()
-    #print("Bytes left:", len(bytes))
-    #print()
-
-    #print(mesh.points)
-
     i = 0
     while len(bytes) != 0:
         cur_field_data = {}
@@ -107,17 +95,10 @@ def readBIN_to_meshio(filepath):
         rotationMatrix[2][0:3] = r[2], r[5], r[8]
 
         cur_field_data["rotation"] = rotationMatrix.to_quaternion()
-
-        cur_field_data["transformation_matrix"] = mathutils.Matrix.LocRotScale(cur_field_data["translation"], cur_field_data["rotation"], cur_field_data["scaling"])
-
-        #print("Translation:")
-        #print(cur_field_data["translation"])
-        #print("Rotation:")
-        #print(cur_field_data["rotation"])
-        #print("Scaling:")
-        #print(cur_field_data["scaling"])
-        #print("Transformation matrix:")
-        #print(cur_field_data["transformation_matrix"])
+        cur_field_data["transformation_matrix"] = mathutils.Matrix.LocRotScale(
+                                                    cur_field_data["translation"], 
+                                                    cur_field_data["rotation"], 
+                                                    cur_field_data["scaling"])
 
         if isFirstFile:
             field_datas[i]["translation"] = cur_field_data["translation"]
@@ -131,17 +112,7 @@ def readBIN_to_meshio(filepath):
 
     mesh.field_data = field_datas[0]
 
-    #print("Field data:")
-    #print(mesh.field_data)
-
     return mesh
 
-    #print("-----------------------")
-    #print(objPath)
-    #print("-----------------------")
-    bpy.ops.import_scene.obj(filepath=objPath)
-
-    return meshio.Mesh([], [], field_data=field_data)
-
 # no need for write function
 meshio.register_format("bin", [".bin"], readBIN_to_meshio, {".bin": None})

bseq/importer.py

@@ -119,7 +119,6 @@ def update_mesh(meshio_mesh, mesh):
         faces_loop_start = np.roll(faces_loop_start, 1)
         faces_loop_start[0] = 0
 
-
     if len(mesh.vertices) == n_verts and len(mesh.polygons) == n_poly and len(mesh.loops) == n_loop:
         pass
     else:
@@ -224,6 +223,7 @@ def create_obj(fileseq, use_relative, root_path, transform_matrix=Matrix([[1, 0,
         object.BSEQ.pattern = str(fileseq)
     object.BSEQ.init = True
     object.BSEQ.enabled = enabled
+    # Flatten custom transformation matrix for the property
     object.BSEQ.initial_transform_matrix = [transform_matrix[j][i] for i in range(4) for j in range(4)]
     driver = object.driver_add("BSEQ.frame")
     driver.driver.expression = 'frame'

bseq/operators.py

@@ -42,9 +42,11 @@ def execute(self, context):
             show_message_box(traceback.format_exc(), "Can't find sequence: " + str(fs), "ERROR")
             return {"CANCELLED"}
 
-        transform_matrix = Matrix.Identity(4)
-        if importer_prop.use_custom_transform:
-            transform_matrix = Matrix.LocRotScale(importer_prop.custom_location, importer_prop.custom_rotation, importer_prop.custom_scale)
+        transform_matrix = (Matrix.LocRotScale(
+                                    importer_prop.custom_location, 
+                                    importer_prop.custom_rotation, 
+                                    importer_prop.custom_scale)
+                                    if importer_prop.use_custom_transform else Matrix.Identity(4))
 
         create_obj(fs, importer_prop.relative, importer_prop.root_path, transform_matrix=transform_matrix)
         return {"FINISHED"}
@@ -332,24 +334,20 @@ def execute(self, context):
         importer_prop = scene.BSEQ
 
         folder = Path(self.filepath)
-        used_seqs = []
+        used_seqs = set()
+
         for selection in self.files:
+            # Check if there exists a matching file sequence for every selection
             fp = str(Path(folder.parent, selection.name))
-
             seqs = fileseq.findSequencesOnDisk(str(folder.parent))
-
-            for s in seqs:
-                if fp in list(s) and s not in used_seqs:
-                    transform_matrix = Matrix.Identity(4)
-                    if importer_prop.use_custom_transform:
-                        transform_matrix = Matrix.LocRotScale(importer_prop.custom_location, importer_prop.custom_rotation, importer_prop.custom_scale)
-
-                    create_obj(s, False, importer_prop.root_path, transform_matrix=transform_matrix)
-
-                    used_seqs.append(s)
-                    break
-            # load that specific file sequence (only if it is not already in the scene)
-            #bpy.ops.sequence.load()
+            matching_seqs = [s for s in seqs if fp in list(s) and s not in used_seqs]
+
+            if matching_seqs:
+                s = matching_seqs[0]
+                transform_matrix = (Matrix.LocRotScale(importer_prop.custom_location, importer_prop.custom_rotation, importer_prop.custom_scale)
+                                    if importer_prop.use_custom_transform else Matrix.Identity(4))
+                create_obj(s, False, importer_prop.root_path, transform_matrix=transform_matrix)
+                used_seqs.add(s)
         return {'FINISHED'}
 
 class WM_OT_MeshioObject(bpy.types.Operator, ImportHelper):