Fixed blur, added unrestricted shapekeys support and skeleton scale i…

…nput filed
SpectrumQT · Jul 13, 2024 · 356678e · 356678e
1 parent 1fffb41
commit 356678e
Show file tree

Hide file tree

Showing 5 changed files with 275 additions and 172 deletions.
diff --git a/wwmi-tools/__init__.py b/wwmi-tools/__init__.py
@@ -4,8 +4,8 @@
 
 bl_info = {
     "name": "WWMI Tools",
-    "version": (0, 8, 6),
-    "wwmi_version": (0, 6, 1),
+    "version": (0, 9, 0),
+    "wwmi_version": (0, 7, 0),
     "blender": (2, 80, 0),
     "author": "SpectrumQT, DarkStarSword",
     "location": "View3D > Sidebar > Tool Tab",

diff --git a/wwmi-tools/blender_export/blender_export.py b/wwmi-tools/blender_export/blender_export.py
@@ -120,7 +120,7 @@ def get_default_data_map():
             ]},
         VertexBuffers={
             'Position': [
-                BufferSemantic(AbstractSemantic(Semantic.Position, 0), DXGIFormat.R32_FLOAT, stride=12)
+                BufferSemantic(AbstractSemantic(Semantic.Position, 0), DXGIFormat.R32G32B32_FLOAT)
             ],
             'Blend': [
                 BufferSemantic(AbstractSemantic(Semantic.Blendindices, 0), DXGIFormat.R8_UINT, stride=4),
@@ -282,7 +282,7 @@ def build_buffers(data_map, vertex_count, faces, vertex_cache, shapekey_offsets,
         buffers[name] = vertex_buffer
 
     # Build Shape Key Buffers
-    if len(data_map.ShapeKeyBuffers) > 0 and shapekey_offsets is not None:
+    if len(data_map.ShapeKeyBuffers) > 0 and shapekey_offsets is not None and len(shapekey_vertex_ids) > 0:
         shapekey_offset_buffer = ByteBuffer(BufferElementLayout(data_map.ShapeKeyBuffers['ShapeKeyOffset']))
         shapekey_offset_buffer.extend(128)
         shapekey_offset_buffer.set_values(AbstractSemantic(Semantic.RawData), shapekey_offsets)
@@ -333,7 +333,6 @@ def blender_export(operator, context, cfg, data_map):
     mesh = merged_object.mesh
 
     # Collect merged temp object data
-
     faces, loop_data, vertex_data = get_mesh_data(context, mesh, data_map, cfg.component_collection)
 
     shapekey_offsets, shapekey_vertex_ids, shapekey_vertex_offsets = get_shapekey_data(obj, mesh, data_map, loop_data)
@@ -377,6 +376,8 @@ def blender_export(operator, context, cfg, data_map):
             buffers=buffers,
             textures=textures,
             comment_code=cfg.comment_ini,
+            skeleton_scale=cfg.skeleton_scale,
+            unrestricted_custom_shape_keys=cfg.unrestricted_custom_shape_keys,
         )
 
         with open(ini_path, "w") as f: