fix distance3d

cables-gl · Nov 8, 2023 · dfa658a · dfa658a
1 parent b946205
commit dfa658a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 33 deletions.
diff --git a/src/ops/base/Ops.Gl.Matrix.CameraPosition/screenshot.png b/src/ops/base/Ops.Gl.Matrix.CameraPosition/screenshot.png
diff --git a/src/ops/base/Ops.Math.Distance3d_v2/Ops.Math.Distance3d_v2.js b/src/ops/base/Ops.Math.Distance3d_v2/Ops.Math.Distance3d_v2.js
@@ -1,39 +1,22 @@
 const
     calc = op.inTriggerButton("Calc"),
-
     x1 = op.inValueFloat("x1"),
     y1 = op.inValueFloat("y1"),
     z1 = op.inValueFloat("z1"),
-
     x2 = op.inValueFloat("x2"),
     y2 = op.inValueFloat("y2"),
     z2 = op.inValueFloat("z2"),
-
-    inMin = op.inValue("Min", 0);
+    next = op.outTrigger("Next"),
+    dist = op.addOutPort(new CABLES.Port(op, "distance"));
 
 op.setPortGroup("Point 1", [x1, y1, z1]);
 op.setPortGroup("Point 2", [x2, y2, z2]);
 
-const next = op.outTrigger("Next");
-const dist = op.addOutPort(new CABLES.Port(op, "distance"));
-
-let min = inMin.get();
-
-inMin.onChange = function ()
-{
-    min = inMin.get();
-};
-
 calc.onTriggered = function ()
 {
     const xd = x2.get() - x1.get();
-    if (Math.abs(xd) > min) return;
-
     const yd = y2.get() - y1.get();
-    if (Math.abs(yd) > min) return;
-
     const zd = z2.get() - z1.get();
-    if (Math.abs(zd) > min) return;
 
     dist.set(Math.sqrt(xd * xd + yd * yd + zd * zd));
 

diff --git a/src/ops/base/Ops.Math.Distance3d_v2/Ops.Math.Distance3d_v2.json b/src/ops/base/Ops.Math.Distance3d_v2/Ops.Math.Distance3d_v2.json
@@ -5,58 +5,53 @@
     "layout": {
         "portsIn": [
             {
-                "type": "1",
+                "type": 1,
                 "name": "Calc"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "x1",
                 "group": "Point 1",
                 "subType": "number"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "y1",
                 "group": "Point 1",
                 "subType": "number"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "z1",
                 "group": "Point 1",
                 "subType": "number"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "x2",
                 "group": "Point 2",
                 "subType": "number"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "y2",
                 "group": "Point 2",
                 "subType": "number"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "z2",
                 "group": "Point 2",
                 "subType": "number"
-            },
-            {
-                "type": "0",
-                "name": "Min",
-                "subType": "number"
             }
         ],
         "portsOut": [
             {
-                "type": "1",
+                "type": 1,
                 "name": "Next"
             },
             {
-                "type": "0",
+                "type": 0,
                 "name": "distance",
                 "subType": "number"
             }

diff --git a/src/ops/base/Ops.Value.Boolean/screenshot.png b/src/ops/base/Ops.Value.Boolean/screenshot.png