Meshgroup adaptation for creator. (#194)

* mesh recalculation: Cleanup algorithm to use matrix-based transformation. * meshgroup: Added MeshGroup (WIP) * node: Using "reparent" method to insert node into some parent node. * Added code to apply all deformation transfer from mesh group to its children on export to INP. * Added configuration UI for MeshGroup.
Inochi2D · Mar 3, 2023 · 49bcd84 · 49bcd84
1 parent 757eb65
commit 49bcd84
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 3 deletions.
diff --git a/source/creator/actions/node.d b/source/creator/actions/node.d
@@ -77,8 +77,7 @@ public:
 
             // Set relative position
             if (new_) {
-                sn.setRelativeTo(new_);
-                sn.insertInto(new_, pOffset);
+                sn.reparent(new_, pOffset);
             } else sn.parent = null;
         }
         incActivePuppet().rescanNodes();

diff --git a/source/creator/io/inpexport.d b/source/creator/io/inpexport.d
@@ -74,6 +74,9 @@ void incExportINP(Puppet origin, Atlas[] atlasses, string file) {
     }
     editable.parameters = params;
 
+    // Apply all deformation of mesh groups to its children.
+    editable.applyDeformToChildren();
+
     // Discard invalid lanes
     foreach(ref Animation animation; editable.getAnimations()) {
         animation.finalize(editable);

diff --git a/source/creator/panels/inspector.d b/source/creator/panels/inspector.d
@@ -95,6 +95,11 @@ protected:
                             if (SimplePhysics part = cast(SimplePhysics)node) {
                                 incInspectorModelSimplePhysics(part);
                             }
+
+                            // Node MeshGroup Section
+                            if (MeshGroup group = cast(MeshGroup)node) {
+                                incInspectorModelMeshGroup(group);
+                            }
                         }
 
                     break;
@@ -1125,6 +1130,24 @@ void incInspectorModelSimplePhysics(SimplePhysics node) {
     incEndCategory();
 }
 
+
+void incInspectorModelMeshGroup(MeshGroup node) {
+    if (incBeginCategory(__("MeshGroup"))) {
+
+
+        igSpacing();
+
+        bool dynamic = node.dynamic;
+        if (igCheckbox(__("Use post-processing mode (slower)"), &dynamic)) {
+            node.switchMode(dynamic);
+        }
+
+        // Padding
+        igSpacing();
+    }
+    incEndCategory();
+}
+
 //
 //  MODEL MODE ARMED
 //

diff --git a/source/creator/panels/nodes.d b/source/creator/panels/nodes.d
@@ -71,6 +71,10 @@ protected:
                 igSameLine(0, 2);
                 if (igMenuItem(__("Camera"), "", false, true)) incAddChildWithHistory(new ExCamera(n), n);
 
+                incText(incTypeIdToIcon("MeshGroup"));
+                igSameLine(0, 2);
+                if (igMenuItem(__("MeshGroup"), "", false, true)) incAddChildWithHistory(new MeshGroup(n), n);
+
                 igEndMenu();
             }
 

diff --git a/source/creator/utils/package.d b/source/creator/utils/package.d
@@ -11,6 +11,7 @@ string incTypeIdToIcon(string typeId) {
         case "Mask": return "\ue14e";
         case "SimplePhysics": return "\ue922";
         case "Camera": return "";
+        case "MeshGroup": return "";
         default: return "\ue97a"; 
     }
 }
diff --git a/source/creator/viewport/vertex/package.d b/source/creator/viewport/vertex/package.d
@@ -199,9 +199,16 @@ void incViewportVertexDraw(Camera camera) {
     if (targets.length > 0) {
         foreach (target; targets) {
             if (Part part = cast(Part)target) {
-
                 // Draw albedo texture at 0, 0
                 inDrawTextureAtPosition(part.textures[0], vec2(0, 0));
+            } else if (MeshGroup mgroup = cast(MeshGroup)target) {
+                Transform transform = mgroup.globalTransform;
+                transform.translation.x *= -1;
+                transform.translation.y *= -1;
+                transform.update();
+                mgroup.setOneTimeTransform(&transform);
+                mgroup.draw();
+                mgroup.setOneTimeTransform(null);
             }
         }
     }