sunrize 1.7.18 → 1.7.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.18",
+  "version": "1.7.20",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -90,14 +90,14 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^32.0.2",
+    "electron": "^32.1.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
     "fullname": "^5.0.0",
     "jquery": "^3.7.1",
     "jquery-ui-dist": "^1.13.3",
-    "jstree": "^3.3.16",
+    "jstree": "^3.3.17",
     "material-icons": "^1.13.12",
     "material-symbols": "^0.23.0",
     "md5": "^2.3.0",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.5.1"
+    "x_ite": "^10.5.3"
   },
   "config": {
     "forge": {

package/src/Application/Application.js

@@ -137,7 +137,22 @@ module .exports = class Application
 
    set currentFile (currentFile)
    {
-      this .#currentFile = currentFile .startsWith ("file:") ? url .fileURLToPath (currentFile) : "";
+      const protocol = currentFile .match (/^(.+?:)/);
+
+      switch (protocol ?.[1])
+      {
+         default:
+            this .#currentFile = new URL (currentFile) .pathname .split ("/") .at (-1);
+            break;
+         case "file:":
+            this .#currentFile = url .fileURLToPath (currentFile);
+            break;
+         case "data:":
+         case "id:":
+         case undefined:
+            this .#currentFile = "";
+            break;
+      }
 
       this .mainWindow .setRepresentedFilename (this .#currentFile);
    }
@@ -802,6 +817,11 @@ module .exports = class Application
                      label: _("Using the Script Editor"),
                      click: () => electron .shell .openExternal ("https://create3000.github.io/sunrize/documentation/using-the-script-editor/"),
                   },
+                  { type: "separator" },
+                  {
+                     label: _("Report a Bug"),
+                     click: () => electron .shell .openExternal ("https://github.com/create3000/sunrize/issues"),
+                  },
                ],
             },
          ]));

package/src/Application/Document.js

@@ -108,7 +108,7 @@ module .exports = class Document extends Interface
       // Layout Menu
 
       electron .ipcRenderer .on ("browser-frame", () => this .browserFrame .open ());
-      electron .ipcRenderer .on ("grid-tool", (event, typeName, visible) => this .activateGridTool (typeName, visible));
+      electron .ipcRenderer .on ("grid-tool", (event, typeName, visible) => this .activateGridTool (typeName, visible, true));
       electron .ipcRenderer .on ("grid-options", () => this .showGridOptions ());
 
       electron .ipcRenderer .on ("activate-snap-target",                 (event, visible) => this .activateSnapTarget (visible));
@@ -342,7 +342,7 @@ Viewpoint {
 }
             `));
 
-            this .activateGridTool ("GridTool", true);
+            this .activateGridTool ("GridTool", true, false);
          }
       }
       else

package/src/Application/Interface.js

@@ -174,7 +174,7 @@ module .exports = class Interface
     * @param {string} from path|URL
     * @param {string} to path|URL
     */
-   updateFileConfigs (from, to)
+   updateFileConfigs (from = "", to = "")
    {
       const
          fromHash = `.${md5 (from)}.`,

package/src/Application/Traverse.js

@@ -16,7 +16,7 @@ module .exports = class Traverse
    static PROTOTYPE_INSTANCES           = flags <<= 1;
    static INLINE_SCENE                  = flags <<= 1;
    static ALL                           = (flags << 1) - 1;
-   
+
    /**
     *
     * @param {X3DScene|X3DExecutionContext|MFNode|Array<SFNode>|SFNode} object
@@ -353,7 +353,7 @@ module .exports = class Traverse
                case X3D .X3DConstants .MFNode:
                {
                   for (const node of field)
-                     this .findInNode (node .getValue (), object, flags, hierarchies, hierarchy, seen);
+                     this .findInNode (node ?.getValue (), object, flags, hierarchies, hierarchy, seen);
 
                   break;
                }

package/src/Editors/OutlineView.js

@@ -2968,7 +2968,7 @@ module .exports = class OutlineView extends Interface
       const elements = this .sceneGraph .find ("> .root-nodes > ul > li[node-id]");
 
       for (const element of elements)
-         this .selectNodeElement ($(element));
+         this .selectNodeElement ($(element), true);
    }
 
    deselectAll ()

package/src/Editors/Primitives.js

@@ -381,6 +381,436 @@ EnvironmentLight {
    }
 }
 `
+   },
+   {
+      componentInfo: { name: "NURBS" },
+      typeName: "NurbsCircle2D",
+      x3dSyntax: `
+DEF NurbsCircle2D Transform {
+  children Shape {
+    appearance Appearance {
+      material UnlitMaterial { }
+    }
+    geometry NurbsCurve {
+      closed TRUE
+      knot [
+        0,
+        0,
+        0,
+        0.25,
+        0.25,
+        0.5,
+        0.5,
+        0.75,
+        0.75,
+        1,
+        1,
+        1
+      ]
+      weight [
+        1,
+        0.7071067811865476,
+        1,
+        0.7071067811865476,
+        1,
+        0.7071067811865476,
+        1,
+        0.7071067811865476,
+        1
+      ]
+      controlPoint CoordinateDouble {
+        point [
+          1 0 0,
+          0.7071067811865476 -0.7071067811865476 0,
+          0 -1 0,
+          -0.7071067811865476 -0.7071067811865476 0,
+          -1 0 0,
+          -0.7071067811865476 0.7071067811865476 0,
+          0 1 0,
+          0.7071067811865476 0.7071067811865476 0,
+          1 0 0
+        ]
+      }
+    }
+  }
+}`
+   },
+   {
+      componentInfo: { name: "NURBS" },
+      typeName: "NurbsCylinder",
+      x3dSyntax: `
+DEF NurbsCylinder Transform {
+  children Shape {
+    appearance Appearance {
+      material Material { }
+    }
+    geometry NurbsPatchSurface {
+      uClosed TRUE
+      vOrder 2
+      uDimension 9
+      vDimension 2
+      uKnot [
+        0,
+        0,
+        0,
+        0.25,
+        0.25,
+        0.5,
+        0.5,
+        0.75,
+        0.75,
+        1,
+        1,
+        1
+      ]
+      vKnot [
+        0,
+        0,
+        1,
+        1
+      ]
+      weight [
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1
+      ]
+      controlPoint CoordinateDouble {
+        point [
+          1 -1 0,
+          0.707106781186548 -0.707106781186548 -0.707106781186548,
+          0 -1 -1,
+          -0.707106781186548 -0.707106781186548 -0.707106781186548,
+          -1 -1 0,
+          -0.707106781186548 -0.707106781186548 0.707106781186548,
+          0 -1 1,
+          0.707106781186548 -0.707106781186548 0.707106781186548,
+          1 -1 0,
+          1 1 0,
+          0.707106781186548 0.707106781186548 -0.707106781186548,
+          0 1 -1,
+          -0.707106781186548 0.707106781186548 -0.707106781186548,
+          -1 1 0,
+          -0.707106781186548 0.707106781186548 0.707106781186548,
+          0 1 1,
+          0.707106781186548 0.707106781186548 0.707106781186548,
+          1 1 0
+        ]
+      }
+    }
+  }
+}`
+   },
+   {
+      componentInfo: { name: "NURBS" },
+      typeName: "NurbsDisk2D",
+      x3dSyntax: `
+DEF NurbsDisk2D Transform {
+  children Shape {
+    appearance Appearance {
+      material Material { }
+    }
+    geometry NurbsPatchSurface {
+      solid FALSE
+      uDimension 3
+      vDimension 3
+      weight [
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1
+      ]
+      controlPoint CoordinateDouble {
+        point [
+          -0.707106781186548 -0.707106781186548 0,
+          0 -1 0,
+          0.707106781186548 -0.707106781186548 0,
+          -1 0 0,
+          0 0 0,
+          1 0 0,
+          -0.707106781186548 0.707106781186548 0,
+          0 1 0,
+          0.707106781186548 0.707106781186548 0
+        ]
+      }
+    }
+  }
+}`,
+   },
+   {
+      componentInfo: { name: "NURBS" },
+      typeName: "NurbsCone",
+      x3dSyntax: `
+DEF NurbsCone Transform {
+  children Shape {
+    appearance Appearance {
+      material Material { }
+    }
+    geometry NurbsPatchSurface {
+      uClosed TRUE
+      vOrder 2
+      uDimension 9
+      vDimension 2
+      uKnot [
+        0,
+        0,
+        0,
+        0.25,
+        0.25,
+        0.5,
+        0.5,
+        0.75,
+        0.75,
+        1,
+        1,
+        1
+      ]
+      vKnot [
+        0,
+        0,
+        1,
+        1
+      ]
+      weight [
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1
+      ]
+      controlPoint CoordinateDouble {
+        point [
+          1 -1 0,
+          0.707106781186548 -0.707106781186548 -0.707106781186548,
+          0 -1 -1,
+          -0.707106781186548 -0.707106781186548 -0.707106781186548,
+          -1 -1 0,
+          -0.707106781186548 -0.707106781186548 0.707106781186548,
+          0 -1 1,
+          0.707106781186548 -0.707106781186548 0.707106781186548,
+          1 -1 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0
+        ]
+      }
+    }
+  }
+}`
+   },
+   {
+      componentInfo: { name: "NURBS" },
+      typeName: "NurbsRectangle2D",
+      x3dSyntax: `
+DEF NurbsRectangle2D Transform {
+  children Shape {
+    appearance Appearance {
+      material Material { }
+    }
+    geometry NurbsPatchSurface {
+      solid FALSE
+      uOrder 2
+      vOrder 2
+      uDimension 2
+      vDimension 2
+      uKnot [
+        -1,
+        -1,
+        1,
+        1
+      ]
+      vKnot [
+        -1,
+        -1,
+        1,
+        1
+      ]
+      controlPoint CoordinateDouble {
+        point [
+          -1 -1 0,
+          1 -1 0,
+          -1 1 0,
+          1 1 0
+        ]
+      }
+    }
+  }
+}`
+   },
+   {
+      componentInfo: { name: "NURBS" },
+      typeName: "NurbsSphere",
+      x3dSyntax: `
+DEF NurbsSphere Transform {
+  children Shape {
+    appearance Appearance {
+      material Material { }
+    }
+    geometry NurbsPatchSurface {
+      uClosed TRUE
+      uDimension 9
+      vDimension 5
+      uKnot [
+        0,
+        0,
+        0,
+        0.25,
+        0.25,
+        0.5,
+        0.5,
+        0.75,
+        0.75,
+        1,
+        1,
+        1
+      ]
+      vKnot [
+        0,
+        0,
+        0,
+        0.5,
+        0.5,
+        1,
+        1,
+        1
+      ]
+      weight [
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        0.5,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1,
+        0.707106781186548,
+        1
+      ]
+      controlPoint CoordinateDouble {
+        point [
+          0 -1 0,
+          0 -0.707106781186548 0,
+          0 -1 0,
+          0 -0.707106781186548 0,
+          0 -1 0,
+          0 -0.707106781186548 0,
+          0 -1 0,
+          0 -0.707106781186548 0,
+          0 -1 0,
+          0 -0.707106781186548 -0.707106781186548,
+          -0.5 -0.5 -0.5,
+          -0.707106781186548 -0.707106781186548 0,
+          -0.5 -0.5 0.5,
+          0 -0.707106781186548 0.707106781186548,
+          0.5 -0.5 0.5,
+          0.707106781186548 -0.707106781186548 0,
+          0.5 -0.5 -0.5,
+          0 -0.707106781186548 -0.707106781186548,
+          0 0 -1,
+          -0.707106781186548 0 -0.707106781186548,
+          -1 0 0,
+          -0.707106781186548 0 0.707106781186548,
+          0 0 1,
+          0.707106781186548 0 0.707106781186548,
+          1 0 0,
+          0.707106781186548 0 -0.707106781186548,
+          0 0 -1,
+          0 0.707106781186548 -0.707106781186548,
+          -0.5 0.5 -0.5,
+          -0.707106781186548 0.707106781186548 0,
+          -0.5 0.5 0.5,
+          0 0.707106781186548 0.707106781186548,
+          0.5 0.5 0.5,
+          0.707106781186548 0.707106781186548 0,
+          0.5 0.5 -0.5,
+          0 0.707106781186548 -0.707106781186548,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0,
+          0 0.707106781186548 0,
+          0 1 0
+        ]
+      }
+    }
+  }
+}`,
    },
    {
       componentInfo: { name: "Text" },

package/src/Tools/Layering/X3DActiveLayerNodeTool.js

@@ -10,8 +10,6 @@ class X3DActiveLayerNodeTool extends X3DChildNodeTool
    {
       const node = executionContext .createNode ("Group", false);
 
-      node ._visible = false;
-
       node .setup ();
 
       super (node);

package/src/Tools/NURBS/X3DParametricGeometryNodeTool.js

@@ -21,6 +21,13 @@ const X3DParametricGeometryNodeTool = Base => class extends Base
       this .addExternalNode (this .node ._controlPoint);
    }
 
+   disposeTool ()
+   {
+      this .node ._rebuild .removeInterest ("set_toolRebuildParametricGeometry", this);
+
+      super .disposeTool ();
+   }
+
    set_toolRebuildParametricGeometry ()
    {
       const

package/src/Undo/Editor.js

@@ -2700,6 +2700,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                      return new X3D .Box3 (X3D .Vector3 .One, innerNode ._position .getValue ())
                         .multLeft (new X3D .Matrix4 () .setRotation (innerNode ._orientation .getValue ()))
                         .multRight (modelMatrix);
+                  case X3D .X3DConstants .X3DLayerNode:
+                     return innerNode .getBBox (new X3D .Box3 ());
                   default:
                      continue;
                }
@@ -3335,6 +3337,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                break;
             }
             case X3D .X3DConstants .Coordinate:
+            case X3D .X3DConstants .CoordinateDouble:
             {
                const point = node ._point
                   .map (p => this .roundToIntegerIfAlmostEqual (modelMatrix .multVecMatrix (p .getValue () .copy ())));