multi-edit: Fix bugs: transformation matrix is not updated when T/R/S…

… is changed during edit of armed parameter. (#165)
Inochi2D · Jan 19, 2023 · 59e899e · 59e899e
1 parent 7c58a55
commit 59e899e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/source/creator/panels/inspector.d b/source/creator/panels/inspector.d
@@ -6,6 +6,7 @@
 */
 module creator.panels.inspector;
 import creator.viewport.vertex;
+import creator.viewport.model.deform;
 import creator.core;
 import creator.panels;
 import creator.widgets;
@@ -1154,6 +1155,12 @@ void incInspectorDeformFloatDragVal(string name, string paramName, float adjustS
         } else {
             incActionPush(action);
         }
+
+        if (auto editor = incViewportModelDeformGetEditor()) {
+            if (auto e = editor.getEditorFor(node)) {
+                e.adjustPathTransform();
+            }
+        }
     }
 }
 
@@ -1297,6 +1304,12 @@ void incInspectorDeformSetValue(Node node, Parameter param, string paramName, ve
         } else {
             incActionPush(action);
         }
+
+        if (auto editor = incViewportModelDeformGetEditor()) {
+            if (auto e = editor.getEditorFor(node)) {
+                e.adjustPathTransform();
+            }
+        }
 }
 
 void incInspectorDeformTRS(Node node, Parameter param, vec2u cursor) {

diff --git a/source/creator/viewport/common/mesheditor.d b/source/creator/viewport/common/mesheditor.d
@@ -422,7 +422,6 @@ public:
         mousePos = incInputGetMousePosition();
         if (deformOnly) {
             vec4 pIn = vec4(-mousePos.x, -mousePos.y, 0, 1);
-//            mat4 tr = target.transform.matrix().inverse();
             mat4 tr = transform.inverse();
             vec4 pOut = tr * pIn;
             mousePos = vec2(pOut.x, pOut.y);
@@ -894,7 +893,7 @@ public:
 
     override
     void removeVertexAt(vec2 vertex) {
-        mesh.removeVertexAt(vertex); // mirror(axis, mousePos)
+        mesh.removeVertexAt(vertex);
     }
 
     override
@@ -1111,7 +1110,12 @@ public:
 
     override
     void adjustPathTransform() {
+        mat4 trans = (target? target.transform.matrix: transform).inverse * transform;
         ref CatmullSpline doAdjust(ref CatmullSpline p) {
+            for (int i; i < p.points.length; i++) {
+                p.points[i].position = (trans * vec4(p.points[i].position, 0, 1)).xy;
+            }
+            p.update();
             remapPathTarget(p, mat4.identity);
             return p;
         }
@@ -1120,6 +1124,8 @@ public:
                 path.target = doAdjust(path.target);
             path = doAdjust(path);
         }
+        lastMousePos = (trans * vec4(lastMousePos, 0, 1)).xy;
+        transform = this.target.transform.matrix;
         forceResetAction();
     }
 
@@ -1148,7 +1154,6 @@ public:
     override
     void setTarget(Node target) {
         super.setTarget(target);
-//        transform = (target && target.parent()) ? target.parent().transform.matrix : mat4.identity;
         transform = target? target.transform.matrix : mat4.identity;
         refreshMesh();
     }
@@ -1391,7 +1396,6 @@ public:
 
         if (vtxAtMouse !is null && !isSelecting) {
             MeshVertex*[] one = [vtxAtMouse];
-//            mesh.drawPointSubset(one, vec4(1, 1, 1, 0.3), trans, 15);
         }
 
         if (isSelecting) {

diff --git a/source/creator/viewport/model/deform.d b/source/creator/viewport/model/deform.d
@@ -49,19 +49,6 @@ void incViewportNodeDeformNotifyParamValueChanged() {
                 e.adjustPathTransform();
             }
         }
-        /*
-        foreach (d; drawables) {
-            if (Drawable drawable = cast(Drawable)d) {
-                DeformationParameterBinding deform = cast(DeformationParameterBinding)param.getBinding(drawable, "deform");
-                if (deform) {
-                    auto binding = deform.getValue(param.findClosestKeypoint());
-                    auto e = editor.getEditorFor(drawable);
-                    e.applyOffsets(binding.vertexOffsets);
-                    e.adjustPathTransform();
-                }
-            }
-        }
-        */
     } else {
         editor = null;
     }

diff --git a/source/creator/viewport/package.d b/source/creator/viewport/package.d
@@ -12,6 +12,7 @@ import creator.core.input;
 import creator.actions;
 import creator.viewport;
 import creator.viewport.model;
+import creator.viewport.model.deform;
 import creator.viewport.vertex;
 import creator.viewport.anim;
 import creator.viewport.test;
@@ -339,6 +340,11 @@ void incViewportTransformHandle() {
                     param.addBinding(b);
                     status.actions["Add"]= new ParameterBindingAddAction(param, b);
                 }
+                if (auto editor = incViewportModelDeformGetEditor()) {
+                    if (auto e = editor.getEditorFor(node)) {
+                        e.adjustPathTransform();
+                    }
+                }
                 // Push action
                 if (paramName !in status.actions)
                     status.actions[paramName] = new ParameterBindingValueChangeAction!(float)(b.getName(), b, index.x, index.y);