Fix path deform tool crashing on meshless nodes (#344)

* Fix path deform tool crashing with meshless nodes * Fix crash from path tool desync * Fix crash when trying to remove desync path points
Inochi2D · May 3, 2024 · 45c43a3 · 45c43a3
1 parent 04e8434
commit 45c43a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/source/creator/viewport/common/mesheditor/tools/pathdeform.d b/source/creator/viewport/common/mesheditor/tools/pathdeform.d
@@ -250,13 +250,14 @@ class PathDeformTool : NodeSelect {
         }
 
         if (action == PathDeformActionID.StartTransform || action == PathDeformActionID.StartShiftTransform) {
-            (cast(MeshEditorAction!DeformationAction)(impl.getDeformAction())).clear();
+            auto deform = (cast(MeshEditorAction!DeformationAction)(impl.getDeformAction()));
+            if(deform !is null) deform.clear();
         }
 
         if (action == PathDeformActionID.RemovePoint || action == PathDeformActionID.AddPoint) {
             if (action == PathDeformActionID.RemovePoint) {
                 int idx = path.findPoint(impl.mousePos);
-                path.removePoint(idx);
+                if(idx != -1) path.removePoint(idx);
             } else if (action == PathDeformActionID.AddPoint) {
                 path.addPoint(impl.mousePos);
             }
@@ -289,13 +290,17 @@ class PathDeformTool : NodeSelect {
             }
 
         } else if (action == PathDeformActionID.Shift || action == PathDeformActionID.StartShiftTransform) {
-            float off = path.findClosestPointOffset(impl.mousePos);
-            vec2 pos  = path.eval(off);
-            editPath.points[pathDragTarget].position = pos;
+            if(pathDragTarget != -1){
+                float off = path.findClosestPointOffset(impl.mousePos);
+                vec2 pos  = path.eval(off);
+                editPath.points[pathDragTarget].position = pos;
+            }
 
         } else if (action == PathDeformActionID.Transform || action == PathDeformActionID.StartTransform) {
-            vec2 relTranslation = impl.mousePos - impl.lastMousePos;
-            editPath.points[pathDragTarget].position += relTranslation;
+            if(pathDragTarget != -1){
+                vec2 relTranslation = impl.mousePos - impl.lastMousePos;
+                editPath.points[pathDragTarget].position += relTranslation;
+            }
         }
 
         editPath.update();

diff --git a/source/creator/viewport/common/spline.d b/source/creator/viewport/common/spline.d
@@ -175,6 +175,10 @@ public:
         return mat4.identity();
     }
 
+    mat4 exportTarget(T)(ref T mesh, size_t i, ref vec2 vtx, vec2 tangent, vec2 initTangent) {
+        return mat4.identity();
+    }
+
     mat4 exportTarget(ref IncMesh mesh, size_t i, ref vec2 vtx, vec2 tangent, vec2 initTangent, mat4 invert, vec2 deformation) {
         mesh.vertices[i].position = (invert * vec4(vtx, 0, 1)).xy - deformation;
         return mat4.identity();
@@ -252,7 +256,11 @@ public:
                 pt.y + rel.y * tangent.x + rel.x * tangent.y
             );
 //             writefln("%s %s %s", vtx, rel, tangent);
-            result = exportTarget(mesh, i, vtx, tangent, initTangents.length > i ? initTangents[i]: tangent, invert, deformations[i]);
+            if(deformations is null){
+                result = exportTarget(mesh, i, vtx, tangent, initTangents.length > i ? initTangents[i]: tangent);
+            } else {
+                result = exportTarget(mesh, i, vtx, tangent, initTangents.length > i ? initTangents[i]: tangent, invert, deformations[i]);
+            }
         }
         return result;
     }