release version 3.0.0

* Support NGS1 TMC.
* Improve material emulation.
* Import mesh objects as separate objects.

and some other improvements.

Author: Nozomi Miyamori

README.md

@@ -1,9 +1,9 @@
-Ninja Gaiden Sigam 2 TMC Blender Extension
-==========================================
+Ninja Gaiden Master Collection TMC Importer Blender Extension
+=============================================================
 
 Author: Nozomi Miyamori
 
-A blender extension to import Ninja Gaiden Sigma 2 TMC into
+A blender extension to import Ninja Gaiden Sigma 1 and 2 TMC into
 your blender project.
 
 Requirements
@@ -23,9 +23,7 @@ Installation
 Caveats
 -------
 
-* It does not import material parameters (e.g. color, metalness, roughness) yet
 * It does not support exporting a blender project to an TMC file
-* It may not import some TMC models (I tested the extension only with some human models)
 
 License
 -------

src/ninja_gaiden_tmc/__init__.py

@@ -1,9 +1,9 @@
-# NINJA GAIDEN SIGMA 2 TMC Importer by Nozomi Miyamori is under the public domain
+# NINJA GAIDEN Model Importer by Nozomi Miyamori is under the public domain
 # and also marked with CC0 1.0. This file is a part of NINJA GAIDEN SIGMA 2 TMC Importer.
 
-from .importer import import_ngs2_tmc
-
 from . import tcmlib
+from .ngs1.importer import import_tmc as ngs1_import_tmc
+from .ngs2.importer import import_tmc as ngs2_import_tmc
 
 import bpy
 
@@ -14,14 +14,63 @@
 import os
 import mmap
 
-def import_tmc_wrapper(context, tmc_path, tmcl_path):
-    tmc_m, tmcl_m = mmap_open(tmc_path), mmap_open(tmcl_path)
-    with tmc_m, tmcl_m:
-        with tcmlib.ngs2.TMCParser(tmc_m, tmcl_m) as tmc:
-            import_ngs2_tmc(context, tmc)
+class NGS1SelectG1TGImportTMC(Operator, ImportHelper):
+    bl_idname = 'ninja_gaiden_tmc.ngs1_select_g1tg_import_tmc'
+    bl_label = 'Select TMCL2 or G1TG'
+    bl_options = {'REGISTER', 'UNDO'}
+
+    filter_glob: StringProperty(
+            default="*.g1t;*.gt1;*.g1tg;*.tmcl2;*.dat",
+            options={'SKIP_SAVE', 'HIDDEN'},
+    )
+    directory: StringProperty(subtype='DIR_PATH')
 
-class SelectTMCLImportTMC(Operator, ImportHelper):
-    bl_idname = 'ninja_gaiden_tmc.select_tmcl_import_tmc'
+    tmc_path: StringProperty(
+            subtype='FILE_PATH',
+            default='',
+            options={'SKIP_SAVE', 'HIDDEN'}
+    )
+
+    tmcl_path: StringProperty(
+            subtype='FILE_PATH',
+            default='',
+            options={'SKIP_SAVE', 'HIDDEN'}
+    )
+
+    def execute(self, context):
+        if not self.tmc_path or not self.tmcl_path:
+            return {'CANCELLED'}
+
+        try:
+            with (mmap_open(self.tmc_path) as tmc, mmap_open(self.tmcl_path) as tmcl,
+                  mmap_open(self.filepath) as g1tg, tcmlib.ngs1.TMCParser(tmc, tmcl) as tmc):
+                ngs1_import_tmc(context, tmc, g1tg)
+        except tcmlib.ParserError as e:
+            self.report({'ERROR'}, f"Failed to parse TMC: {e}")
+            return {'CANCELLED'}
+        return {'FINISHED'}
+
+class NGS1SelectTMCL(Operator, ImportHelper):
+    bl_idname = 'ninja_gaiden_tmc.ngs1_select_tmcl'
+    bl_label = 'Select TMCL'
+
+    filter_glob: StringProperty(
+            default="*.tmcl;*.dat",
+            options={'SKIP_SAVE', 'HIDDEN'},
+    )
+    directory: StringProperty(subtype='DIR_PATH')
+
+    tmc_path: StringProperty(
+            subtype='FILE_PATH',
+            default='',
+            options={'SKIP_SAVE', 'HIDDEN'}
+    )
+
+    def execute(self, context):
+        return bpy.ops.ninja_gaiden_tmc.ngs1_select_g1tg_import_tmc('INVOKE_DEFAULT', tmc_path=self.tmc_path, tmcl_path=self.filepath, directory=self.directory)
+
+class NGS2SelectTMCLImportTMC(Operator, ImportHelper):
+    bl_idname = 'ninja_gaiden_tmc.ngs2_select_tmcl_import_tmc'
     bl_label = 'Select TMCL'
     bl_options = {'REGISTER', 'UNDO'}
 
@@ -42,14 +91,15 @@ def execute(self, context):
             return {'CANCELLED'}
 
         try:
-            import_tmc_wrapper(context, self.tmc_path, self.filepath)
+            with mmap_open(self.tmc_path) as tmc, mmap_open(self.filepath) as tmcl, tcmlib.ngs2.TMCParser(tmc, tmcl) as tmc:
+                ngs2_import_tmc(context, tmc)
         except tcmlib.ParserError as e:
-            self.report({'ERROR'}, "Failed to parse TMC: {e}")
+            self.report({'ERROR'}, f"Failed to parse TMC: {e}")
             return {'CANCELLED'}
         return {'FINISHED'}
 
 class ImportTMCEntry(Operator, ImportHelper):
-    '''Load a TMC file (NGS2)'''
+    '''Load a TMC file'''
     bl_idname = 'ninja_gaiden_tmc.import_tmc_entry'
     bl_label = 'Select TMC'
     old_dir = ''
@@ -58,6 +108,7 @@ class ImportTMCEntry(Operator, ImportHelper):
             default="*.tmc;*.dat",
             options={'SKIP_SAVE', 'HIDDEN'},
     )
+    filename: StringProperty()
     directory: StringProperty(subtype='DIR_PATH')
 
     def invoke(self, context, event):
@@ -66,22 +117,35 @@ def invoke(self, context, event):
 
     def execute(self, context):
         ImportTMCEntry.old_dir = self.directory
-        return bpy.ops.ninja_gaiden_tmc.select_tmcl_import_tmc('INVOKE_DEFAULT', tmc_path=self.filepath, directory=self.directory)
+        try:
+            with mmap_open(self.filepath) as tmc, tcmlib.ContainerParser(b'TMC', tmc) as tmc:
+                min_v = tmc._minor_ver
+        except tcmlib.ParserError as e:
+            self.report({'ERROR'}, f"{self.filename} is not TMC")
+            return {'CANCELLED'}
+        if min_v == 0:
+            return bpy.ops.ninja_gaiden_tmc.ngs1_select_tmcl('INVOKE_DEFAULT', tmc_path=self.filepath, directory=self.directory)
+        else:
+            return bpy.ops.ninja_gaiden_tmc.ngs2_select_tmcl_import_tmc('INVOKE_DEFAULT', tmc_path=self.filepath, directory=self.directory)
 
 def mmap_open(path):
     with open(path, 'rb') as f:
         return mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
 
 def menu_func_import(self, context):
-    self.layout.operator(ImportTMCEntry.bl_idname, text="Ninja Gaiden Sigam 2 TMC (.tmc/.tmcl)")
+    self.layout.operator(ImportTMCEntry.bl_idname, text="Ninja Gaiden Master Collection TMC (.tmc)")
 
 def register():
-    bpy.utils.register_class(SelectTMCLImportTMC)
+    bpy.utils.register_class(NGS1SelectG1TGImportTMC)
+    bpy.utils.register_class(NGS1SelectTMCL)
+    bpy.utils.register_class(NGS2SelectTMCLImportTMC)
     bpy.utils.register_class(ImportTMCEntry)
     bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
 
 def unregister():
-    bpy.utils.unregister_class(SelectTMCLImportTMC)
+    bpy.utils.unregister_class(NGS1SelectG1TGImportTMC)
+    bpy.utils.unregister_class(NGS1SelectTMCL)
+    bpy.utils.unregister_class(NGS2SelectTMCLImportTMC)
     bpy.utils.unregister_class(ImportTMCEntry)
     bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
 

src/ninja_gaiden_tmc/blender_manifest.toml

@@ -1,9 +1,9 @@
 schema_version = "1.0.0"
 
 id = "ninja_gaiden_tmc"
-version = "2.1.0"
-name = "Ninja Gaiden Sigma 2 TMC Format"
-tagline = "Import Ninja Gaiden Sigma 2 TMC"
+version = "3.0.0"
+name = "Ninja Gaiden Sigma 1 and 2 TMC Format"
+tagline = "Import Ninja Gaiden Sigma 1 and 2 TMC"
 maintainer = "Nozomi Miyamori"
 type = "add-on"