sunrize 1.7.17 → 1.7.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.17",
+  "version": "1.7.19",
   "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.0"
+    "x_ite": "^10.5.2"
   },
   "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/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/Core/ToolColors.js

@@ -26,8 +26,9 @@ module .exports = class ToolColors
    static DARK_RED    = new X3D .Color3 (0.5, 0.175, 0.175); //
    static DARK_ORANGE = new X3D .Color3 (0.5, 0.35, 0.175);  // VolumeData
 
-   static GREY      = new X3D .Color3 (0.7, 0.7, 0.7);       //
-   static DARK_GREY = new X3D .Color3 (0.35, 0.35, 0.35);    // StaticGroup
+   static LIGHT_GREY = new X3D .Color3 (0.90, 0.90, 0.90);    // Hull
+   static GREY       = new X3D .Color3 (0.7, 0.7, 0.7);       //
+   static DARK_GREY  = new X3D .Color3 (0.35, 0.35, 0.35);    // StaticGroup
 
    static PROXIMITY_SENSOR  = new X3D .Color3 (0.5, 0, 1);
    static TRANSFORM_SENSOR  = new X3D .Color3 (0, 1, 0);

package/src/Tools/Core/X3DChildNodeTool.js

@@ -8,11 +8,6 @@ class X3DChildNodeTool extends X3DNodeTool
    {
       return true;
    }
-
-   async initializeTool (... args)
-   {
-      await super .loadTool (... args);
-   }
 }
 
 module .exports = X3DChildNodeTool;

package/src/Tools/Core/X3DNodeTool.js

@@ -30,10 +30,11 @@ class X3DNodeTool extends X3DBaseTool
    static #sensors = [ ];        // Always empty
 
    tool           = null;
+   #tools         = new Set ();
    #proxy         = null;
    #selected      = false;
-   #promise       = null;
-   #innerNode     = null;
+   #promise       = new Map ();
+   #innerNodes    = [ ];
    #externalNodes = new Map ();
    #groupedTools  = new Set ();
    #initialValues = new Map ();
@@ -68,25 +69,28 @@ class X3DNodeTool extends X3DBaseTool
    {
       this .#selected = value;
 
-      if (!this .tool)
-         return;
+      for (const tool of this .#tools)
+      {
+         if (!this [tool])
+            continue;
 
-      if (this .tool .hasOwnProperty ("selected"))
-         this .tool .selected = value;
+         if (this [tool] .hasOwnProperty ("selected"))
+            this [tool] .selected = value;
+      }
    }
 
    // Tool Loading
 
-   async getToolInstance ()
+   async getToolInstance (tool = "tool")
    {
-      await this .#promise;
+      await this .#promise .get (tool);
 
-      return this .tool;
+      return this [tool];
    }
 
-   getToolScene ()
+   getToolScene (tool = "tool")
    {
-      return this .tool .getValue () .getExecutionContext ();
+      return this [tool] .getValue () .getExecutionContext ();
    }
 
    addTool ()
@@ -109,15 +113,18 @@ class X3DNodeTool extends X3DBaseTool
       {
          await this .initializeTool ();
 
-         // X3DLayerNodeTool and X3DPrototypeInstanceTool have no own tool.
+         for (const tool of this .#tools)
+         {
+            // X3DLayerNodeTool and X3DPrototypeInstanceTool have no own tool.
 
-         if (!this .tool)
-            return;
+            if (!this [tool])
+               continue;
 
-         this .#innerNode = this .tool .getValue () .getInnerNode ();
+            this .#innerNodes .push (this [tool] .getValue () .getInnerNode ());
 
-         if (this .tool .hasOwnProperty ("selected"))
-            this .tool .selected = this .#selected;
+            if (this [tool] .hasOwnProperty ("selected"))
+               this [tool] .selected = this .#selected;
+         }
       }
       catch (error)
       {
@@ -125,9 +132,9 @@ class X3DNodeTool extends X3DBaseTool
       }
    }
 
-   async initializeTool () { }
+   initializeTool () { }
 
-   loadTool (... args)
+   loadTool (tool, ... args)
    {
       const
          filePath  = path .resolve (... args),
@@ -135,9 +142,11 @@ class X3DNodeTool extends X3DBaseTool
          protoURL  = url .pathToFileURL (filePath),
          promise   = X3DNodeTool .#scenes .get (protoURL .href);
 
+      this .#tools .add (tool);
+
       if (promise)
       {
-         this .#promise = promise;
+         this .#promise .set (tool, promise);
       }
       else
       {
@@ -163,22 +172,22 @@ class X3DNodeTool extends X3DBaseTool
 
          X3DNodeTool .#scenes .set (protoURL .href, promise);
 
-         this .#promise = promise;
+         this .#promise .set (tool, promise);
       }
 
       if (this .#disposed)
          return Promise .reject (new Error ("Tool is already disposed."));
 
-      this .#promise .then (scene => this .createTool (scene, protoName));
+      this .#promise .get (tool) .then (scene => this .createTool (tool, scene, protoName));
 
-      return this .#promise;
+      return this .#promise .get (tool);
    }
 
-   createTool (scene, protoName)
+   createTool (tool, scene, protoName)
    {
-      this .tool = scene .createProto (protoName);
+      this [tool] = scene .createProto (protoName);
 
-      this .tool .getValue () .setPrivate (true);
+      this [tool] .getValue () .setPrivate (true);
 
       X3DNodeTool .tools .add (this);
       X3DNodeTool .processToolInterests ();
@@ -207,7 +216,10 @@ class X3DNodeTool extends X3DBaseTool
 
       const nodesToDispose = [ ]
 
-      Traverse .traverse (this .tool, Traverse .ROOT_NODES | Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES, node => nodesToDispose .push (node));
+      for (const tool of this .#tools)
+      {
+         Traverse .traverse (this [tool], Traverse .ROOT_NODES | Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES, node => nodesToDispose .push (node));
+      }
 
       for (const node of nodesToDispose .filter (node => !this .#externalNodes .has (node)))
          node .dispose ();
@@ -435,12 +447,19 @@ class X3DNodeTool extends X3DBaseTool
 
    // Traverse
 
+   #childBBox = new X3D .Box3 ();
+
    getToolBBox (bbox, shadows)
    {
+      bbox .set ();
+
       if (shadows)
-         return bbox .set ();
+         return bbox;
+
+      for (const innerNode of this .#innerNodes)
+         bbox .add (innerNode .getBBox (this .#childBBox, shadows));
 
-      return this .#innerNode ?.getBBox (bbox, shadows) ?? bbox .set ();
+      return bbox;
    }
 
    toolPointingEnabled = true;
@@ -463,7 +482,8 @@ class X3DNodeTool extends X3DBaseTool
       renderObject .getHumanoids () .push (null);
       renderObject .getSensors ()   .push (X3DNodeTool .#sensors);
 
-      this .#innerNode ?.traverse (type, renderObject);
+      for (const innerNode of this .#innerNodes)
+         innerNode ?.traverse (type, renderObject);
 
       renderObject .getSensors ()   .pop ();
       renderObject .getHumanoids () .pop ();

package/src/Tools/EnvironmentalSensor/X3DEnvironmentalSensorNodeTool.js

@@ -10,7 +10,7 @@ class X3DEnvironmentalSensorNodeTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "X3DEnvironmentalSensorNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DEnvironmentalSensorNodeTool.x3d");
 
       this .tool .getField ("size")   .addReference (this .node ._size);
       this .tool .getField ("center") .addReference (this .node ._center);

package/src/Tools/Grouping/X3DBoundedObjectTool.js

@@ -8,7 +8,7 @@ class X3DBoundedObjectTool extends X3DChildNodeTool
 {
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "X3DBoundedObjectTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DBoundedObjectTool.x3d");
 
       this .getBrowser () .displayEvents () .addInterest ("reshapeTool", this);
 

package/src/Tools/Grouping/X3DTransformNodeTool.js

@@ -14,7 +14,7 @@ class X3DTransformNodeTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "X3DTransformNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DTransformNodeTool.x3d");
 
       X3DTransformNodeTool .#transformTools .add (this);
 

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);
@@ -19,7 +17,7 @@ class X3DActiveLayerNodeTool extends X3DChildNodeTool
 
    async initializeTool (... args)
    {
-      await super .initializeTool (... args);
+      await super .loadTool ("tool", ... args);
 
       this .getBrowser () ._activeLayer .addInterest ("set_activeLayer", this);
 

package/src/Tools/Lighting/X3DLightNodeTool.js

@@ -8,7 +8,7 @@ class X3DLightNodeTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "X3DLightNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DLightNodeTool.x3d");
 
       this .tool .getField ("on")        .addReference (this .node ._on);
       this .tool .getField ("color")     .addReference (this .node ._color);

package/src/Tools/NURBS/NurbsCurveTool.js

@@ -1,7 +1,25 @@
 "use strict";
 
-const X3DLineGeometryNodeTool = require ("../Rendering/X3DLineGeometryNodeTool");
+const
+   X3DParametricGeometryNodeTool = require ("./X3DParametricGeometryNodeTool"),
+   X3DLineGeometryNodeTool       = require ("../Rendering/X3DLineGeometryNodeTool");
 
-class NurbsCurveTool extends X3DLineGeometryNodeTool { }
+class NurbsCurveTool extends X3DParametricGeometryNodeTool (X3DLineGeometryNodeTool)
+{
+   async initializeTool ()
+   {
+      await super .initializeTool ();
+
+      this .set_toolRebuildParametricGeometry ();
+   }
+
+   set_toolRebuildParametricGeometry ()
+   {
+      this .parametricGeometryNodeTool .uDimension = this .node ._controlPoint .getValue () ?._point .length ?? 0;
+      this .parametricGeometryNodeTool .vDimension = 1;
+
+      super .set_toolRebuildParametricGeometry ();
+   }
+}
 
 module .exports = NurbsCurveTool;

package/src/Tools/NURBS/NurbsPatchSurfaceTool.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool");
+const X3DNurbsSurfaceGeometryNodeTool = require ("./X3DNurbsSurfaceGeometryNodeTool");
 
-class NurbsPatchSurfaceTool extends X3DGeometryNodeTool { }
+class NurbsPatchSurfaceTool extends X3DNurbsSurfaceGeometryNodeTool { }
 
 module .exports = NurbsPatchSurfaceTool;

package/src/Tools/NURBS/NurbsTrimmedSurfaceTool.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool");
+const X3DNurbsSurfaceGeometryNodeTool = require ("./X3DNurbsSurfaceGeometryNodeTool");
 
-class NurbsTrimmedSurfaceTool extends X3DGeometryNodeTool { }
+class NurbsTrimmedSurfaceTool extends X3DNurbsSurfaceGeometryNodeTool { }
 
 module .exports = NurbsTrimmedSurfaceTool;

package/src/Tools/NURBS/X3DNurbsSurfaceGeometryNodeTool.js

@@ -0,0 +1,21 @@
+"use strict";
+
+const
+   X3DGeometryNodeTool           = require ("../Rendering/X3DGeometryNodeTool"),
+   X3DParametricGeometryNodeTool = require ("./X3DParametricGeometryNodeTool");;
+
+class X3DNurbsSurfaceGeometryNodeTool extends X3DParametricGeometryNodeTool (X3DGeometryNodeTool)
+{
+   async initializeTool ()
+   {
+      await super .initializeTool ();
+
+      this .parametricGeometryNodeTool .getField ("uDimension") .addReference (this .node ._uDimension);
+      this .parametricGeometryNodeTool .getField ("vDimension") .addReference (this .node ._vDimension);
+
+      this .set_toolRebuildParametricGeometry ();
+   }
+}
+
+
+module .exports = X3DNurbsSurfaceGeometryNodeTool;

package/src/Tools/NURBS/X3DParametricGeometryNodeTool.js

@@ -0,0 +1,68 @@
+"use strict";
+
+const ToolColors = require ("../Core/ToolColors");
+
+const X3DParametricGeometryNodeTool = Base => class extends Base
+{
+   async initializeTool ()
+   {
+      await Promise .all ([
+         super .initializeTool (),
+         super .loadTool ("parametricGeometryNodeTool", __dirname, "X3DParametricGeometryNodeTool.x3d"),
+      ]);
+
+      this .node ._rebuild .addInterest ("set_toolRebuildParametricGeometry", this);
+
+      this .parametricGeometryNodeTool .hullColor         = ToolColors .LIGHT_GREY;
+      this .parametricGeometryNodeTool .controlPointColor = ToolColors .DARK_BLUE;
+
+      this .parametricGeometryNodeTool .getField ("controlPoint") .addReference (this .node ._controlPoint);
+
+      this .addExternalNode (this .node ._controlPoint);
+   }
+
+   disposeTool ()
+   {
+      this .node ._rebuild .removeInterest ("set_toolRebuildParametricGeometry", this);
+
+      super .disposeTool ();
+   }
+
+   set_toolRebuildParametricGeometry ()
+   {
+      const
+         uDimension = this .parametricGeometryNodeTool .uDimension,
+         vDimension = this .parametricGeometryNodeTool .vDimension,
+         hullIndex  = [ ];
+
+      // Generate u connections.
+
+      if (uDimension > 1)
+      {
+         for (let v = 0; v < vDimension; ++ v)
+         {
+            for (let u = 0; u < uDimension; ++ u)
+               hullIndex .push (v * uDimension + u);
+
+            hullIndex .push (-1);
+         }
+      }
+
+      // Generate v connections.
+
+      if (vDimension > 1)
+      {
+         for (let u = 0; u < uDimension; ++ u)
+         {
+            for (let v = 0; v < vDimension; ++ v)
+               hullIndex .push (v * uDimension + u);
+
+            hullIndex .push (-1);
+         }
+      }
+
+      this .parametricGeometryNodeTool .set_hullIndex = hullIndex;
+   }
+};
+
+module .exports = X3DParametricGeometryNodeTool;

package/src/Tools/NURBS/X3DParametricGeometryNodeTool.x3d

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 4.0//EN" "http://www.web3d.org/specifications/x3d-4.0.dtd">
+<X3D profile='Interchange' version='4.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-4.0.xsd'>
+  <head>
+    <component name='Scripting' level='1'/>
+    <component name='X_ITE' level='1'/>
+    <meta name='created' content='Tue, 28 Nov 2023 21:59:27 GMT'/>
+    <meta name='comment' content='Rise and Shine'/>
+    <meta name='creator' content='Holger Seelig'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.7.17, https://create3000.github.io/sunrize/'/>
+    <meta name='modified' content='Sun, 08 Sep 2024 13:04:14 GMT'/>
+  </head>
+  <Scene>
+    <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
+      <field accessType='inputOutput' type='SFBool' name='instanced'/>
+    </ExternProtoDeclare>
+    <ProtoDeclare name='X3DParametricGeometryNodeTool'>
+      <ProtoInterface>
+        <field accessType='inputOutput' type='SFBool' name='selected'/>
+        <field accessType='inputOutput' type='SFString' name='group' value='NONE'/>
+        <field accessType='inputOutput' type='SFBool' name='undo'/>
+        <field accessType='inputOutput' type='SFInt32' name='uDimension'/>
+        <field accessType='inputOutput' type='SFInt32' name='vDimension'/>
+        <field accessType='inputOnly' type='MFInt32' name='set_hullIndex'/>
+        <field accessType='inputOutput' type='SFColor' name='hullColor' value='1 1 1'/>
+        <field accessType='inputOutput' type='SFColor' name='controlPointColor' value='1 1 1'/>
+        <field accessType='inputOutput' type='SFNode' name='controlPoint'/>
+      </ProtoInterface>
+      <ProtoBody>
+        <Group>
+          <Shape DEF='Hull'>
+            <Appearance>
+              <LineProperties
+                  linetype='3'
+                  linewidthScaleFactor='2'/>
+              <UnlitMaterial>
+                <IS>
+                  <connect nodeField='emissiveColor' protoField='hullColor'/>
+                </IS>
+              </UnlitMaterial>
+              <DepthMode DEF='_4'
+                  depthRange='0 0'/>
+            </Appearance>
+            <IndexedLineSet DEF='_3'>
+              <IS>
+                <connect nodeField='set_coordIndex' protoField='set_hullIndex'/>
+                <connect nodeField='coord' protoField='controlPoint'/>
+              </IS>
+            </IndexedLineSet>
+          </Shape>
+          <Shape DEF='ControlPoints'>
+            <Appearance>
+              <PointProperties
+                  pointSizeScaleFactor='5'
+                  pointSizeMinValue='5'
+                  pointSizeMaxValue='5'/>
+              <Material
+                  diffuseColor='0 0 0'>
+                <IS>
+                  <connect nodeField='emissiveColor' protoField='controlPointColor'/>
+                </IS>
+              </Material>
+              <ProtoInstance name='ToolShader' containerField='shaders'/>
+              <DepthMode USE='_4'/>
+            </Appearance>
+            <PointSet DEF='_2'>
+              <IS>
+                <connect nodeField='coord' protoField='controlPoint'/>
+              </IS>
+            </PointSet>
+          </Shape>
+        </Group>
+        <Script DEF='CloneCountScript'>
+          <field accessType='initializeOnly' type='SFNode' name='points'>
+            <PointSet USE='_2'/>
+          </field>
+          <field accessType='initializeOnly' type='SFNode' name='lines'>
+            <IndexedLineSet USE='_3'/>
+          </field>
+<![CDATA[ecmascript:
+
+function initialize ()
+{
+   points .getValue () .setPrivate (true);
+   lines  .getValue () .setPrivate (true);
+}
+]]>
+        </Script>
+      </ProtoBody>
+    </ProtoDeclare>
+  </Scene>
+</X3D>

package/src/Tools/Navigation/X3DViewpointNodeTool.js

@@ -10,7 +10,7 @@ class X3DViewpointNodeTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "X3DViewpointNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DViewpointNodeTool.x3d");
 
       this .tool .getField ("isActive") .addInterest ("handleUndo", this);
 

package/src/Tools/Rendering/X3DGeometryNodeTool.js

@@ -8,38 +8,38 @@ class X3DGeometryNodeTool extends X3DNodeTool
 {
    async initializeTool (type)
    {
-      await super .loadTool (__dirname, "X3DGeometryNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DGeometryNodeTool.x3d");
 
       this .tool .linesColor = ToolColors .BLUE;
 
       if (type === "CUSTOM")
          return;
 
-      this .node ._rebuild .addInterest ("set_toolGeometry", this);
+      this .node ._rebuild .addInterest ("set_toolRebuildGeometry", this);
 
       this .tool .linesCoord = this .getToolScene () .createNode ("CoordinateDouble");
 
-      this .set_toolGeometry ();
+      this .set_toolRebuildGeometry ();
    }
 
    disposeTool ()
    {
-      this .node ._rebuild .removeInterest ("set_toolGeometry", this);
+      this .node ._rebuild .removeInterest ("set_toolRebuildGeometry", this);
 
       super .disposeTool ();
    }
 
-   set_toolGeometry ()
+   set_toolRebuildGeometry ()
    {
       const
-         points = this .node .getVertices () .filter ((_, i) => i % 4 !== 3),
-         length = points .length / 3;
+         points    = this .node .getVertices () .filter ((_, i) => i % 4 < 3),
+         numPoints = points .length / 3;
 
-      if (length !== this .tool .linesCoord .point .length)
+      if (numPoints !== this .tool .linesCoord .point .length)
       {
          const coordIndex = [ ];
 
-         for (let i = 0; i < length; i += 3)
+         for (let i = 0; i < numPoints; i += 3)
             coordIndex .push (i, i + 1, i + 2, i, -1);
 
          this .tool .set_linesCoordIndex = coordIndex;

package/src/Tools/Rendering/X3DLineGeometryNodeTool.js

@@ -8,30 +8,30 @@ class X3DLineGeometryNodeTool extends X3DGeometryNodeTool
 {
    async initializeTool (type)
    {
-      await super .loadTool (__dirname, "X3DLineGeometryNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DLineGeometryNodeTool.x3d");
 
       this .tool .pointsColor = ToolColors .BLUE;
 
       if (type === "CUSTOM")
          return;
 
-      this .node ._rebuild .addInterest ("set_toolGeometry", this);
+      this .node ._rebuild .addInterest ("set_toolRebuildGeometry", this);
 
       this .tool .pointsCoord = this .getToolScene () .createNode ("CoordinateDouble");
 
-      this .set_toolGeometry ();
+      this .set_toolRebuildGeometry ();
    }
 
    disposeTool ()
    {
-      this .node ._rebuild .removeInterest ("set_toolGeometry", this);
+      this .node ._rebuild .removeInterest ("set_toolRebuildGeometry", this);
 
       super .disposeTool ();
    }
 
-   set_toolGeometry ()
+   set_toolRebuildGeometry ()
    {
-      const points = this .node .getVertices () .filter ((_, i) => i % 4 !== 3);
+      const points = this .node .getVertices () .filter ((_, i) => i % 4 < 3);
 
       this .tool .pointsCoord .point = points;
    }

package/src/Tools/Rendering/X3DPointGeometryNodeTool.js

@@ -8,30 +8,30 @@ class X3DPointGeometryNodeTool extends X3DGeometryNodeTool
 {
    async initializeTool (type)
    {
-      await super .loadTool (__dirname, "X3DPointGeometryNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DPointGeometryNodeTool.x3d");
 
       this .tool .pointsColor = ToolColors .BLUE;
 
       if (type === "CUSTOM")
          return;
 
-      this .node ._rebuild .addInterest ("set_toolGeometry", this);
+      this .node ._rebuild .addInterest ("set_toolRebuildGeometry", this);
 
       this .tool .pointsCoord = this .getToolScene () .createNode ("CoordinateDouble");
 
-      this .set_toolGeometry ();
+      this .set_toolRebuildGeometry ();
    }
 
    disposeTool ()
    {
-      this .node ._rebuild .removeInterest ("set_toolGeometry", this);
+      this .node ._rebuild .removeInterest ("set_toolRebuildGeometry", this);
 
       super .disposeTool ();
    }
 
-   set_toolGeometry ()
+   set_toolRebuildGeometry ()
    {
-      const points = this .node .getVertices () .filter ((_, i) => i % 4 !== 3);
+      const points = this .node .getVertices () .filter ((_, i) => i % 4 < 3);
 
       this .tool .pointsCoord .point = points;
    }

package/src/Tools/Sound/ListenerPointSourceTool.js

@@ -8,7 +8,7 @@ class ListenerPointSourceTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "ListenerPointSourceTool.x3d");
+      await super .loadTool ("tool", __dirname, "ListenerPointSourceTool.x3d");
 
       this .tool .getField ("position")    .addReference (this .node ._position);
       this .tool .getField ("orientation") .addReference (this .node ._orientation);

package/src/Tools/Sound/SoundTool.js

@@ -10,7 +10,7 @@ class SoundTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "SoundTool.x3d");
+      await super .loadTool ("tool", __dirname, "SoundTool.x3d");
 
       this .tool .getField ("location")  .addReference (this .node ._location);
       this .tool .getField ("direction") .addReference (this .node ._direction);

package/src/Tools/Sound/SpatialSoundTool.js

@@ -8,7 +8,7 @@ class SpatialSoundTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "SpatialSoundTool.x3d");
+      await super .loadTool ("tool", __dirname, "SpatialSoundTool.x3d");
 
       this .tool .getField ("location")          .addReference (this .node ._location);
       this .tool .getField ("direction")         .addReference (this .node ._direction);

package/src/Tools/TextureProjection/X3DTextureProjectorNodeTool.js

@@ -8,7 +8,7 @@ class X3DTextureProjectorNodeTool extends X3DChildNodeTool
 
    async initializeTool ()
    {
-      await super .initializeTool (__dirname, "X3DTextureProjectorNodeTool.x3d");
+      await super .loadTool ("tool", __dirname, "X3DTextureProjectorNodeTool.x3d");
 
       this .tool .getField ("on")        .addReference (this .node ._on);
       this .tool .getField ("location")  .addReference (this .node ._location);

package/src/Tools/TextureProjection/X3DTextureProjectorNodeTool.x3d

@@ -220,8 +220,8 @@
 
 async function initialize ()
 {
-   this .getValue () .collectCloneCount = () => 0;
-   textureAppearance .getValue () .collectCloneCount = () => 0;
+   this              .getValue () .setPrivate (true);
+   textureAppearance .getValue () .setPrivate (true);
 
    const tool = await transform .getValue () .addTool () .getToolInstance ();
 

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 ())));