sunrize 2.0.7 → 2.0.9

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "2.0.7",
-  "description": "A Multi-Platform X3D Editor",
+  "version": "2.0.9",
+  "description": "Sunrize — A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
     "sunrize": "bin/sunrize.js"
@@ -89,10 +89,10 @@
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
-    "@vscode/codicons": "^0.0.44",
+    "@vscode/codicons": "^0.0.45",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^40.8.0",
+    "electron": "^41.0.2",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -109,9 +109,9 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "tweakpane": "^3.1.10",
+    "tweakpane": "^4.0.5",
     "update-electron-app": "^3.1.2",
-    "x_ite": "^14.0.8",
+    "x_ite": "^14.0.9",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Application.js

@@ -51,6 +51,8 @@ module .exports = class Application
 
    constructor ()
    {
+      // process .env .SUNRISE_ENVIRONMENT = "DEVELOPMENT"; // Windows test
+
       if (process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT")
          process .env .ELECTRON_ENABLE_LOGGING = 1;
 
@@ -527,15 +529,6 @@ module .exports = class Application
                      label: _("Show All Objects"),
                      click: () => this .mainWindow .webContents .send ("show-all-objects"),
                   },
-                  { type: "separator" },
-                  {
-                     label: _("Transform to Zero"),
-                     click: () => this .mainWindow .webContents .send ("transform-to-zero"),
-                  },
-                  {
-                     label: _("Remove Empty Groups"),
-                     click: () => this .mainWindow .webContents .send ("remove-empty-groups"),
-                  },
                ],
             },
             {

package/src/Application/Document.js

@@ -1267,6 +1267,8 @@ Viewpoint {
             label: _("Viewpoints"),
             submenu: viewpoints .filter ((_, index) => index > 0) .map ((viewpointNode, index) => ({
                label: `${viewpointNode ._description .getValue () || viewpointNode .getDisplayName () || `VP${index + 1}}`}`,
+               type: "radio",
+               checked: viewpointNode ._isBound .getValue (),
                args: ["bindViewpoint", index + 1],
             })),
          },

package/src/Controls/MaterialPreviewPopover.js

@@ -37,26 +37,22 @@ $.fn.materialPreviewPopover = async function (node)
    // Create material node.
 
    const
-      appearanceNode = browser .currentScene .getExportedNode ("Appearance"),
-      previewNode    = node .copy (scene);
+      x3dSyntax     = await Editor .exportX3D (node .getExecutionContext (), [node]),
+      nodes         = await Editor .importX3D (scene, x3dSyntax),
+      previewNode   = nodes [0],
+      appearanceNode = browser .currentScene .getExportedNode ("Appearance");
 
    // Assign material node.
 
    for (const field of previewNode .getFields ())
+      connect (field, node .getField (field .getName ()));
+
+   for (const [i, extension] of previewNode ._extensions ?.entries () ?? [ ])
    {
-      switch (field .getType ())
-      {
-         case X3D .X3DConstants .SFNode:
-            field .setValue (null);
-            break
-         case X3D .X3DConstants .MFNode:
-            field .length = 0;
-            break;
-         default:
-            field .addReference (node .getField (field .getName ()));
-            field .removeFieldInterest (node .getField (field .getName ()));
-            break;
-      }
+      const original = node ._extensions [i] .getValue ();
+
+      for (const field of extension .getValue () .getFields ())
+         connect (field, original .getField (field .getName ()));
    }
 
    previewNode .setup ();
@@ -90,16 +86,7 @@ $.fn.materialPreviewPopover = async function (node)
             field = backPreviewNode .getField (name),
             back  = `back${name [0] .toUpperCase ()}${name .slice (1)}`;
 
-         switch (field .getType ())
-         {
-            case X3D .X3DConstants .SFNode:
-            case X3D .X3DConstants .MFNode:
-               break;
-            default:
-               field .addReference (node .getField (back));
-               field .removeFieldInterest (node .getField (back));
-               break;
-         }
+         connect (field, node .getField (back));
       }
 
       appearanceNode .material = backPreviewNode;
@@ -119,6 +106,9 @@ $.fn.materialPreviewPopover = async function (node)
       events: {
          hide: (event, api) =>
          {
+            for (const extension of Array .from (previewNode ._extensions ?? [ ]))
+               extension .dispose ();
+
             previewNode      .dispose ();
             backPreviewNode ?.dispose ();
             browser          .dispose ();
@@ -135,3 +125,16 @@ $.fn.materialPreviewPopover = async function (node)
    return this;
 };
 
+function connect (field, original)
+{
+   switch (field .getType ())
+   {
+      case X3D .X3DConstants .SFNode:
+      case X3D .X3DConstants .MFNode:
+         break;
+      default:
+         original .addFieldInterest (field);
+         field .assign (original);
+         break;
+   }
+}

package/src/Controls/TexturePreviewPopover.js

@@ -69,18 +69,7 @@ $.fn.texturePreviewPopover = async function (node)
    // Assign texture node.
 
    for (const field of previewNode .getFields ())
-   {
-      switch (field .getType ())
-      {
-         case X3D .X3DConstants .SFNode:
-         case X3D .X3DConstants .MFNode:
-            break;
-         default:
-            field .addReference (node .getField (field .getName ()));
-            field .removeFieldInterest (node .getField (field .getName ()));
-            break;
-      }
-   }
+      connect (field, node .getField (field .getName ()));
 
    appearanceNode .texture = previewNode;
 
@@ -194,3 +183,16 @@ $.fn.texturePreviewPopover = async function (node)
    return this;
 };
 
+function connect (field, original)
+{
+   switch (field .getType ())
+   {
+      case X3D .X3DConstants .SFNode:
+      case X3D .X3DConstants .MFNode:
+         break;
+      default:
+         original .addFieldInterest (field);
+         field .assign (original);
+         break;
+   }
+}

package/src/Editors/Library.js

@@ -188,7 +188,7 @@ module .exports = new class Library extends Dialog
       const node = nodes .find (node => node .text () .toLowerCase () === input)
          ?? nodes .sort ((a, b) => a .data ("similarity") - b .data ("similarity")) .at (-1);
 
-      node .trigger ("click");
+      node .trigger ("dblclick");
    }
 
    update ()

package/src/Editors/MaterialsLibrary.js

@@ -84,7 +84,7 @@ module .exports = class MaterialsLibrary extends LibraryPane
                   .addClass ("text")
                   .text (`${group .getNodeName ()} ${c + 1}`))
                .appendTo (this .#list)
-               .on ("click", () => this .importMaterial (material .getNodeName ())));
+               .on ("dblclick", () => this .importMaterial (material .getNodeName ())));
          }
       }
 

package/src/Editors/NodesLibrary.js

@@ -77,7 +77,7 @@ module .exports = class NodesLibrary extends LibraryPane
                .text (node .typeName)
                .attr ("componentName", node .componentInfo .name)
                .appendTo (this .#list)
-               .on ("click", () => this .createNode (node .typeName, node .componentInfo .name));
+               .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name));
          }
       }
 
@@ -97,7 +97,7 @@ module .exports = class NodesLibrary extends LibraryPane
                .addClass ("node")
                .text (proto .name)
                .appendTo (this .#list)
-               .on ("click", () => this .createProto (proto));
+               .on ("dblclick", () => this .createProto (proto));
          }
       }
 
@@ -123,7 +123,7 @@ module .exports = class NodesLibrary extends LibraryPane
             .text (node .typeName)
             .attr ("componentName", node .componentInfo .name)
             .appendTo (this .#list)
-            .on ("click", () => this .createNode (node .typeName, node .componentInfo .name));
+            .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name));
       }
    }
 

package/src/Editors/OutlineEditor.js

@@ -24,9 +24,6 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       electron .ipcRenderer .on ("outline-editor", (event, key, ... args) => this [key] (... args));
 
-      electron .ipcRenderer .on ("transform-to-zero",   () => this .transformToZero ());
-      electron .ipcRenderer .on ("remove-empty-groups", () => this .removeEmptyGroups ());
-
       this .setup ();
    }
 
@@ -54,26 +51,6 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       ]);
    }
 
-   transformToZero ()
-   {
-      const
-         selection = this .sceneGraph .find (".node.primary, .node.manually"),
-         ids       = selection .map (function () { return this .id }) .get (),
-         nodes     = ids .length ? ids .map (id => this .getNode ($(`#${id}`))) : this .executionContext .rootNodes;
-
-      Editor .transformToZero (this .executionContext, nodes);
-   }
-
-   removeEmptyGroups ()
-   {
-      const
-         selection = this .sceneGraph .find (".node.primary, .node.manually"),
-         ids       = selection .map (function () { return this .id }) .get (),
-         nodes     = ids .length ? ids .map (id => this .getNode ($(`#${id}`))) : this .executionContext .rootNodes;
-
-      Editor .removeEmptyGroups (this .executionContext, nodes);
-   }
-
    showContextMenu (event)
    {
       const element = $(document .elementFromPoint (event .pageX, event .pageY))
@@ -433,6 +410,15 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
                      continue;
                   }
+                  case X3D .X3DConstants .X3DTransformNode:
+                  {
+                     menu .push ({
+                        label: _("Transform to Zero"),
+                        args: ["transformToZero", element .attr ("id"), executionContext .getId (), node .getId ()],
+                     });
+
+                     continue;
+                  }
                   case X3D .X3DConstants .X3DUrlObject:
                   {
                      if (node ._url .some (fileURL => !fileURL .match (/^\s*(?:data|ecmascript|javascript|vrmlscript):/s)))
@@ -1353,6 +1339,25 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
+   transformToZero (id, executionContextId, nodeId)
+   {
+      const
+         executionContext = this .objects .get (executionContextId),
+         transformNode    = this .objects .get (nodeId);
+
+      Editor .transformToZero (executionContext, [transformNode]);
+   }
+
+   removeEmptyGroups ()
+   {
+      const
+         selection = this .sceneGraph .find (".node.primary, .node.manually"),
+         ids       = selection .map (function () { return this .id }) .get (),
+         nodes     = ids .length ? ids .map (id => this .getNode ($(`#${id}`))) : this .executionContext .rootNodes;
+
+      Editor .removeEmptyGroups (this .executionContext, nodes);
+   }
+
    convertImageTextureToPixelTexture (id, executionContextId, nodeId)
    {
       const

package/src/Editors/Panel.js

@@ -29,10 +29,7 @@ module .exports = new class Panel extends Interface
          "top": "unset",
       });
 
-      this .container
-         .on ("mouseenter", event => this .onmouseenter (event))
-         .on ("mouseleave", event => this .onmouseleave (event))
-         .on ("mousedown",  event => this .onmousedown (event));
+      this .container .get (0) .addEventListener ("mousedown", event => this .onmousedown (event), true);
 
       this .browser .getBrowserOptions () ._ColorSpace .addFieldCallback ("Panel", () => this .updateNode ());
 
@@ -68,16 +65,6 @@ module .exports = new class Panel extends Interface
       this .container .hide (300, () => this .removeNode (this .node));
    }
 
-   onmouseenter ()
-   {
-      this .hovered = true;
-   }
-
-   onmouseleave ()
-   {
-      this .hovered = false;
-   }
-
    onmousedown (event)
    {
       $(document) .on ("mouseup.Panel", () => this .onmouseup ());
@@ -92,6 +79,17 @@ module .exports = new class Panel extends Interface
       $(document) .off (".Panel");
 
       this .mousedown = false;
+
+      if (!this .original)
+         return;
+
+      const { executionContext, node, field, previous } = this .original;
+      const value = field .copy ();
+
+      field .assign (previous);
+      this .assign (executionContext, node, field, value);
+
+      this .original = null;
    }
 
    onmousemove (event)
@@ -141,8 +139,26 @@ module .exports = new class Panel extends Interface
       const concreteNode = X3DUOM .find (`ConcreteNode[name="${node .getTypeName ()}"]`);
 
       this .browser .currentScene .units .addInterest ("updateNode", this);
-      node .getPredefinedFields ()       .addInterest ("updateNode", this);
-      node .getUserDefinedFields ()      .addInterest ("updateNode", this);
+
+      node .getPredefinedFields ()  .addInterest ("updateNode", this);
+      node .getUserDefinedFields () .addInterest ("updateNode", this);
+
+      for (const type of node .getType () .toReversed ())
+      {
+         switch (type)
+         {
+            case X3D .X3DConstants .X3DBoundedObject:
+            {
+               this .browser .currentScene .bbox_changed .addInterest ("refreshBBox", this);
+               break;
+            }
+            case X3D .X3DConstants .X3DGeometryNode:
+            {
+               node ._rebuild .addInterest ("refreshGeometry", this);
+               break;
+            }
+         }
+      }
 
       this .addBlades (node, concreteNode);
 
@@ -220,8 +236,26 @@ module .exports = new class Panel extends Interface
       // Disconnect interests.
 
       this .browser .currentScene .units .removeInterest ("updateNode", this);
-      node .getPredefinedFields ()       .removeInterest ("updateNode", this);
-      node .getUserDefinedFields ()      .removeInterest ("updateNode", this);
+
+      node .getPredefinedFields ()  .removeInterest ("updateNode", this);
+      node .getUserDefinedFields () .removeInterest ("updateNode", this);
+
+      for (const type of node .getType () .toReversed ())
+      {
+         switch (type)
+         {
+            case X3D .X3DConstants .X3DBoundedObject:
+            {
+               this .browser .currentScene .bbox_changed .removeInterest ("refreshBBox", this);
+               break;
+            }
+            case X3D .X3DConstants .X3DGeometryNode:
+            {
+               node ._rebuild .removeInterest ("refreshGeometry", this);
+               break;
+            }
+         }
+      }
 
       for (const field of node .getFields ())
          field .removeFieldCallback (this);
@@ -311,18 +345,60 @@ module .exports = new class Panel extends Interface
       const parameter = { };
 
       for (const name of fields)
+         this .addBinding (folder, parameter, node, node .getField (name), concreteNode);
+
+      switch (title)
       {
-         if (name .match (/^-+$/))
-            folder .addSeparator ();
-         else
-            this .addInput (folder, parameter, node, node .getField (name), concreteNode);
+         case "X3DBoundedObject":
+         {
+            folder .addBlade ({ view: "separator" });
+
+            const options = {
+               format: value => this .format (this .#vector, value),
+            };
+
+            for (const key in this .#vector)
+               options [key] = { format: options .format };
+
+            this .refreshBBox ();
+
+            this .bbox .bboxSizeInput   = folder .addBinding (this .bbox, "calculatedSize",   options);
+            this .bbox .bboxCenterInput = folder .addBinding (this .bbox, "calculatedCenter", options);
+
+            $(this .bbox .bboxSizeInput   .element) .find ("input") .attr ("readonly", "");
+            $(this .bbox .bboxCenterInput .element) .find ("input") .attr ("readonly", "");
+
+            $(this .bbox .bboxSizeInput   .element) .find (".tp-txtv_k") .detach ();
+            $(this .bbox .bboxCenterInput .element) .find (".tp-txtv_k") .detach ();
+            break;
+         }
+         case "X3DGeometryNode":
+         {
+            this .refreshGeometry ();
+
+            switch (node .getGeometryType ())
+            {
+               case 0:
+                  this .numPrimitives .monitor = folder .addBinding (this .numPrimitives, "numberOfPoints", { readonly: true });
+                  break
+               case 1:
+                  this .numPrimitives .monitor = folder .addBinding (this .numPrimitives, "numberOfLines", { readonly: true });
+                  break
+               case 2:
+               case 3:
+                  this .numPrimitives .monitor = folder .addBinding (this .numPrimitives, "numberOfTriangles", { readonly: true });
+                  break
+            }
+
+            break;
+         }
       }
 
       if (!folder .children .length)
          folder .dispose ();
    }
 
-   addInput (folder, parameter, node, field, concreteNode)
+   addBinding (folder, parameter, node, field, concreteNode)
    {
       if (!field .isInitializable ())
          return;
@@ -374,6 +450,10 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFDouble:
          case X3D .X3DConstants .SFFloat:
          case X3D .X3DConstants .SFInt32:
+         case X3D .X3DConstants .SFMatrix3d:
+         case X3D .X3DConstants .SFMatrix3f:
+         case X3D .X3DConstants .SFMatrix4d:
+         case X3D .X3DConstants .SFMatrix4f:
          case X3D .X3DConstants .SFRotation:
          case X3D .X3DConstants .SFString:
          case X3D .X3DConstants .SFTime:
@@ -414,7 +494,7 @@ module .exports = new class Panel extends Interface
 
             this .refresh (parameter, node, field);
 
-            const input = $.try (() => folder .addInput (parameter, field .getName (), options));
+            const input = $.try (() => folder .addBinding (parameter, field .getName (), options));
 
             if (!input)
                break;
@@ -438,10 +518,6 @@ module .exports = new class Panel extends Interface
             break;
          }
          case X3D .X3DConstants .SFImage:
-         case X3D .X3DConstants .SFMatrix3d:
-         case X3D .X3DConstants .SFMatrix3f:
-         case X3D .X3DConstants .SFMatrix4d:
-         case X3D .X3DConstants .SFMatrix4f:
          case X3D .X3DConstants .MFBool:
          case X3D .X3DConstants .MFColor:
          case X3D .X3DConstants .MFColorRGBA:
@@ -463,17 +539,18 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .MFVec4d:
          case X3D .X3DConstants .MFVec4f:
          {
-            const tooMuchValues = (field instanceof X3D .X3DArrayField) && field .length >= 10_000;
+            const tooMuchValues = (field instanceof X3D .X3DArrayField) && field .length >= 1_000;
 
             if (tooMuchValues)
                parameter [field .getName ()] = util .format (_("%s values"), field .length .toLocaleString (_.locale));
             else
                this .refresh (parameter, node, field);
 
-            const input = folder .addMonitor (parameter, field .getName (),
+            const input = folder .addBinding (parameter, field .getName (),
             {
-               multiline: true,
-               lineCount: tooMuchValues ? 1 : 2,
+               readonly: true,
+               multiline: !tooMuchValues,
+               rows: tooMuchValues ? 1 : 3,
             });
 
             $(input .element) .on ("mouseenter", () =>
@@ -484,9 +561,16 @@ module .exports = new class Panel extends Interface
             if (tooMuchValues)
                break;
 
-            const textarea = $(input .element) .find ("textarea") .removeAttr ("readonly");
+            const
+               original = $(input .element) .find ("textarea"),
+               textarea = $("<textarea></textarea>");
 
-            textarea .on ("focusout", () => this .onchange (node, field, textarea .val ()));
+            textarea
+               .attr ("class", original .attr ("class"))
+               .val (parameter [field .getName ()])
+               .on ("focusout", () => this .onchange (node, field, textarea .val ()));
+
+            original .replaceWith (textarea);
 
             field .addFieldCallback (this, () =>
             {
@@ -666,7 +750,7 @@ module .exports = new class Panel extends Interface
          executionContext = node .getExecutionContext (),
          category         = field .getUnit ();
 
-      if (!(this .hovered || this .container .find (":focus") .length))
+      if (!(this .mousedown || this .container .find (":focus") .is ("input, textarea, select")))
          return;
 
       this .changing = true;
@@ -799,7 +883,12 @@ module .exports = new class Panel extends Interface
    {
       if (this .mousedown)
       {
-         this .original ??= field .copy ();
+         this .original ??= {
+            executionContext,
+            node,
+            field: field,
+            previous: field .copy (),
+         };
 
          field .setValue (value);
 
@@ -807,13 +896,66 @@ module .exports = new class Panel extends Interface
       }
       else
       {
-         if (this .original)
-            field .assign (this .original);
+         Editor .setFieldValue (executionContext, node, field, value);
+      }
+   }
 
-         this .original = null;
+   #box = new X3D .Box3 ();
+   #vector = new X3D .SFVec3f ();
 
-         Editor .setFieldValue (executionContext, node, field, value);
+   bbox = {
+      calculatedSize: { },
+      calculatedCenter: { },
+      bboxSizeInput: null,
+      bboxCenterInput: null,
+   };
+
+   refreshBBox ()
+   {
+      const bbox = this .node .getBBox (this .#box);
+
+      this .#vector .setValue (bbox .size);
+      this .#vector .setName ("calculatedSize");
+      this .#vector .setUnit ("length");
+
+      this .refresh (this .bbox, this .node, this .#vector)
+
+      this .#vector .setValue (bbox .center);
+      this .#vector .setName ("calculatedCenter");
+      this .#vector .setUnit ("length");
+
+      this .refresh (this .bbox, this .node, this .#vector)
+
+      this .bbox .bboxSizeInput   ?.refresh ();
+      this .bbox .bboxCenterInput ?.refresh ();
+   }
+
+   numPrimitives = {
+      numberOfPoints: "0",
+      numberOfLines: "0",
+      numberOfTriangles: "0",
+      monitor: null,
+   }
+
+   refreshGeometry ()
+   {
+      const numVertices = this .node .getVertices () .length / 4;
+
+      switch (this .node .getGeometryType ())
+      {
+         case 0:
+            this .numPrimitives .numberOfPoints = (numVertices) .toLocaleString (_.locale);
+            break
+         case 1:
+            this .numPrimitives .numberOfLines = (numVertices / 2) .toLocaleString (_.locale);
+            break
+         case 2:
+         case 3:
+            this .numPrimitives .numberOfTriangles = (numVertices / 3) .toLocaleString (_.locale);
+            break
       }
+
+      this .numPrimitives .monitor ?.refresh ();
    }
 
    getNodeTitle (node, nodeElement)

package/src/Editors/PrimitivesLibrary.js

@@ -67,7 +67,7 @@ module .exports = class PrimitivesLibrary extends LibraryPane
                .addClass ("node")
                .text (typeName)
                .appendTo (this .#list)
-               .on ("click", () => this .createRecentNode (nodes, typeName));
+               .on ("dblclick", () => this .createRecentNode (nodes, typeName));
          }
       }
 
@@ -91,7 +91,7 @@ module .exports = class PrimitivesLibrary extends LibraryPane
             .addClass ("node")
             .text (node .typeName)
             .appendTo (this .#list)
-            .on ("click", () => this .createNode (node));
+            .on ("dblclick", () => this .createNode (node));
       }
    }
 

package/src/Editors/ScriptEditor.js

@@ -74,7 +74,7 @@ module .exports = class ScriptEditor extends Interface
          .attr ("title", _("Apply script source to node."))
          .text ("check_circle")
          .appendTo (this .toolbar)
-         .on ("click", () => this .apply ());
+         .on ("click", () => this .apply (true));
 
       $("<span></span>") .addClass ("separator") .appendTo (this .toolbar);
 
@@ -924,7 +924,7 @@ main ()
       this .nodeList .setNode (nodes [0] ._parts [0] .getValue ());
    }
 
-   apply ()
+   apply (force)
    {
       if (!this .node)
          return;
@@ -936,12 +936,21 @@ main ()
          string = this .editor .getModel () .getValue (),
          value  = this .node ._url .toSpliced (0, 1, Editor .encodeURI (string));
 
-      if (this .node ._url .equals (value))
+      if (!this .node ._url .equals (value))
+      {
+         this .node ._url .addFieldCallback (this, () => this .node ._url .addFieldCallback (this, this .set_url .bind (this)));
+
+         Editor .setFieldValue (this .node .getExecutionContext (), this .node, this .node ._url, value);
+      }
+
+      if (!force)
          return;
 
       this .node ._url .addFieldCallback (this, () => this .node ._url .addFieldCallback (this, this .set_url .bind (this)));
 
-      Editor .setFieldValue (this .node .getExecutionContext (), this .node, this .node ._url, value);
+      this .node ._url = value;
+
+      Editor .requestUpdateInstances (this .node);
    }
 
    set_url ()

package/src/Tools/Geometry2D/Arc2DTool.js

@@ -1,12 +1,12 @@
 "use strict";
 
 const
-   X3DLineGeometryNodeTool = require ("../Rendering/X3DLineGeometryNodeTool"),
-   ToolColors              = require ("../Core/ToolColors"),
-   X3D                     = require ("../../X3D"),
-   _                       = require ("../../Application/GetText");
+   X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool"),
+   ToolColors          = require ("../Core/ToolColors"),
+   X3D                 = require ("../../X3D"),
+   _                   = require ("../../Application/GetText");
 
-class Arc2DTool extends X3DLineGeometryNodeTool
+class Arc2DTool extends X3DGeometryNodeTool
 {
    #transformNode = null;
    #changing      = false;

package/src/Tools/Geometry2D/Circle2DTool.js

@@ -1,12 +1,12 @@
 "use strict";
 
 const
-   X3DLineGeometryNodeTool = require ("../Rendering/X3DLineGeometryNodeTool"),
-   ToolColors              = require ("../Core/ToolColors"),
-   X3D                     = require ("../../X3D"),
-   _                       = require ("../../Application/GetText");
+   X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool"),
+   ToolColors          = require ("../Core/ToolColors"),
+   X3D                 = require ("../../X3D"),
+   _                   = require ("../../Application/GetText");
 
-class Circle2DTool extends X3DLineGeometryNodeTool
+class Circle2DTool extends X3DGeometryNodeTool
 {
    #transformNode = null;
    #changing      = false;

package/src/Tools/Geometry2D/Polyline2DTool.js

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

package/src/Tools/Geometry2D/Polypoint2DTool.js

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

package/src/Tools/NURBS/NurbsCurveTool.js

@@ -2,9 +2,9 @@
 
 const
    X3DParametricGeometryNodeTool = require ("./X3DParametricGeometryNodeTool"),
-   X3DLineGeometryNodeTool       = require ("../Rendering/X3DLineGeometryNodeTool");
+   X3DGeometryNodeTool           = require ("../Rendering/X3DGeometryNodeTool");
 
-class NurbsCurveTool extends X3DParametricGeometryNodeTool (X3DLineGeometryNodeTool)
+class NurbsCurveTool extends X3DParametricGeometryNodeTool (X3DGeometryNodeTool)
 {
    async initializeTool ()
    {

package/src/Tools/Rendering/IndexedLineSetTool.js

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

package/src/Tools/Rendering/LineSetTool.js

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

package/src/Tools/Rendering/PointSetTool.js

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

package/src/Tools/Rendering/X3DGeometryNodeTool.js

@@ -10,14 +10,16 @@ class X3DGeometryNodeTool extends X3DNodeTool
    {
       await super .loadTool ("tool", __dirname, "X3DGeometryNodeTool.x3d");
 
-      this .tool .linesColor = ToolColors .BLUE;
+      this .tool .linesColor  = ToolColors .BLUE;
+      this .tool .pointsColor = ToolColors .BLUE;
 
       if (type === "CUSTOM")
          return;
 
       this .node ._rebuild .addInterest ("set_toolRebuildGeometry", this);
 
-      this .tool .linesCoord = this .getToolScene () .createNode ("CoordinateDouble");
+      this .tool .linesCoord  = this .getToolScene () .createNode ("CoordinateDouble");
+      this .tool .pointsCoord = this .getToolScene () .createNode ("CoordinateDouble");
 
       this .set_toolRebuildGeometry ();
    }
@@ -31,21 +33,43 @@ class X3DGeometryNodeTool extends X3DNodeTool
 
    set_toolRebuildGeometry ()
    {
-      const
-         points    = this .node .getVertices () .filter ((_, i) => i % 4 < 3),
-         numPoints = points .length / 3;
-
-      if (numPoints !== this .tool .linesCoord .point .length)
+      switch (this .getGeometryType ())
       {
-         const coordIndex = [ ];
-
-         for (let i = 0; i < numPoints; i += 3)
-            coordIndex .push (i, i + 1, i + 2, i, -1);
-
-         this .tool .set_linesCoordIndex = coordIndex;
+         case 0:
+         case 1:
+         {
+            this .tool .pointsDisplay = true;
+            this .tool .linesDisplay  = false;
+
+            const points = this .node .getVertices () .filter ((_, i) => i % 4 < 3);
+
+            this .tool .pointsCoord .point = points;
+            break;
+         }
+         case 2:
+         case 3:
+         {
+            this .tool .pointsDisplay = false;
+            this .tool .linesDisplay  = true;
+
+            const
+               points    = this .node .getVertices () .filter ((_, i) => i % 4 < 3),
+               numPoints = points .length / 3;
+
+            if (numPoints !== this .tool .linesCoord .point .length)
+            {
+               const coordIndex = [ ];
+
+               for (let i = 0; i < numPoints; i += 3)
+                  coordIndex .push (i, i + 1, i + 2, i, -1);
+
+               this .tool .set_linesCoordIndex = coordIndex;
+            }
+
+            this .tool .linesCoord .point = points;
+            break;
+         }
       }
-
-      this .tool .linesCoord .point = points;
    }
 
    traverseBefore (type, renderObject)

package/src/Tools/Rendering/X3DGeometryNodeTool.x3d

@@ -1,16 +1,20 @@
 <?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'>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 4.1//EN" "https://www.web3d.org/specifications/x3d-4.1.dtd">
+<X3D profile='Interchange' version='4.1' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-4.1.xsd'>
   <head>
+    <component name='Core' level='2'/>
+    <component name='Shaders' 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.1, https://create3000.github.io/sunrize/'/>
-    <meta name='modified' content='Sat, 29 Jun 2024 10:51:34 GMT'/>
+    <meta name='generator' content='Sunrize X3D Editor V2.0.7, https://create3000.github.io/sunrize/'/>
+    <meta name='modified' content='Sun, 08 Mar 2026 19:34:05 GMT'/>
   </head>
   <Scene>
-    <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'/>
+    <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
+      <field accessType='inputOutput' type='SFBool' name='instanced'/>
+    </ExternProtoDeclare>
     <ProtoDeclare name='X3DGeometryNodeTool'>
       <ProtoInterface>
         <field accessType='inputOutput' type='SFBool' name='selected'/>
@@ -22,6 +26,10 @@
         <field accessType='inputOutput' type='SFColor' name='linesColor' value='1 1 1'/>
         <field accessType='inputOnly' type='MFInt32' name='set_linesCoordIndex'/>
         <field accessType='inputOutput' type='SFNode' name='linesCoord'/>
+        <field accessType='inputOutput' type='SFBool' name='pointsDisplay'/>
+        <field accessType='inputOutput' type='SFFloat' name='pointSize' value='5'/>
+        <field accessType='inputOutput' type='SFColor' name='pointsColor' value='1 1 1'/>
+        <field accessType='inputOutput' type='SFNode' name='pointsCoord'/>
         <field accessType='inputOnly' type='MFNode' name='addChildren'/>
         <field accessType='inputOnly' type='MFNode' name='removeChildren'/>
       </ProtoInterface>
@@ -35,7 +43,7 @@
             <IS>
               <connect nodeField='scale' protoField='size'/>
             </IS>
-            <Shape>
+            <Shape DEF='Lines'>
               <IS>
                 <connect nodeField='visible' protoField='linesDisplay'/>
               </IS>
@@ -51,8 +59,8 @@
                     <connect nodeField='emissiveColor' protoField='linesColor'/>
                   </IS>
                 </Material>
-                <ProtoInstance name='ToolShader' DEF='_999' containerField='shaders'/>
-                <DepthMode
+                <ProtoInstance name='ToolShader' DEF='_1' containerField='shaders'/>
+                <DepthMode DEF='_2'
                     polygonOffset='-1 -1'/>
               </Appearance>
               <IndexedLineSet>
@@ -62,6 +70,33 @@
                 </IS>
               </IndexedLineSet>
             </Shape>
+            <Shape DEF='Points'>
+              <IS>
+                <connect nodeField='visible' protoField='pointsDisplay'/>
+              </IS>
+              <Appearance>
+                <PointProperties>
+                  <IS>
+                    <connect nodeField='pointSizeScaleFactor' protoField='pointSize'/>
+                    <connect nodeField='pointSizeMinValue' protoField='pointSize'/>
+                    <connect nodeField='pointSizeMaxValue' protoField='pointSize'/>
+                  </IS>
+                </PointProperties>
+                <Material
+                    diffuseColor='0 0 0'>
+                  <IS>
+                    <connect nodeField='emissiveColor' protoField='pointsColor'/>
+                  </IS>
+                </Material>
+                <ProtoInstance name='ToolShader' USE='_1' containerField='shaders'/>
+                <DepthMode USE='_2'/>
+              </Appearance>
+              <PointSet>
+                <IS>
+                  <connect nodeField='coord' protoField='pointsCoord'/>
+                </IS>
+              </PointSet>
+            </Shape>
           </Transform>
         </Group>
       </ProtoBody>

package/src/Tools/Rendering/X3DLineGeometryNodeTool.js

@@ -1,40 +0,0 @@
-"use strict";
-
-const
-   X3DGeometryNodeTool = require ("./X3DGeometryNodeTool"),
-   ToolColors          = require ("../Core/ToolColors");
-
-class X3DLineGeometryNodeTool extends X3DGeometryNodeTool
-{
-   async initializeTool (type)
-   {
-      await super .loadTool ("tool", __dirname, "X3DLineGeometryNodeTool.x3d");
-
-      this .tool .pointsColor = ToolColors .BLUE;
-
-      if (type === "CUSTOM")
-         return;
-
-      this .node ._rebuild .addInterest ("set_toolRebuildGeometry", this);
-
-      this .tool .pointsCoord = this .getToolScene () .createNode ("CoordinateDouble");
-
-      this .set_toolRebuildGeometry ();
-   }
-
-   disposeTool ()
-   {
-      this .node ._rebuild .removeInterest ("set_toolRebuildGeometry", this);
-
-      super .disposeTool ();
-   }
-
-   set_toolRebuildGeometry ()
-   {
-      const points = this .node .getVertices () .filter ((_, i) => i % 4 < 3);
-
-      this .tool .pointsCoord .point = points;
-   }
-}
-
-module .exports = X3DLineGeometryNodeTool;

package/src/Tools/Rendering/X3DLineGeometryNodeTool.x3d

@@ -1,64 +0,0 @@
-<?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='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.1, https://create3000.github.io/sunrize/'/>
-    <meta name='modified' content='Sat, 29 Jun 2024 10:52:22 GMT'/>
-  </head>
-  <Scene>
-    <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'/>
-    <ProtoDeclare name='X3DLineGeometryNodeTool'>
-      <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='SFBool' name='pointsDisplay' value='true'/>
-        <field accessType='inputOutput' type='SFFloat' name='pointSize' value='5'/>
-        <field accessType='inputOutput' type='SFColor' name='pointsColor' value='1 1 1'/>
-        <field accessType='inputOutput' type='SFNode' name='pointsCoord'/>
-        <field accessType='inputOnly' type='MFNode' name='addChildren'/>
-        <field accessType='inputOnly' type='MFNode' name='removeChildren'/>
-      </ProtoInterface>
-      <ProtoBody>
-        <Group>
-          <IS>
-            <connect nodeField='addChildren' protoField='addChildren'/>
-            <connect nodeField='removeChildren' protoField='removeChildren'/>
-          </IS>
-          <Shape DEF='Lines'>
-            <IS>
-              <connect nodeField='visible' protoField='pointsDisplay'/>
-            </IS>
-            <Appearance>
-              <PointProperties>
-                <IS>
-                  <connect nodeField='pointSizeScaleFactor' protoField='pointSize'/>
-                  <connect nodeField='pointSizeMinValue' protoField='pointSize'/>
-                  <connect nodeField='pointSizeMaxValue' protoField='pointSize'/>
-                </IS>
-              </PointProperties>
-              <Material
-                  diffuseColor='0 0 0'>
-                <IS>
-                  <connect nodeField='emissiveColor' protoField='pointsColor'/>
-                </IS>
-              </Material>
-              <ProtoInstance name='ToolShader' DEF='_999' containerField='shaders'/>
-              <DepthMode
-                  polygonOffset='-1 -1'/>
-            </Appearance>
-            <PointSet>
-              <IS>
-                <connect nodeField='coord' protoField='pointsCoord'/>
-              </IS>
-            </PointSet>
-          </Shape>
-        </Group>
-      </ProtoBody>
-    </ProtoDeclare>
-  </Scene>
-</X3D>

package/src/Tools/Rendering/X3DPointGeometryNodeTool.js

@@ -1,40 +0,0 @@
-"use strict";
-
-const
-   X3DGeometryNodeTool = require ("./X3DGeometryNodeTool"),
-   ToolColors          = require ("../Core/ToolColors");
-
-class X3DPointGeometryNodeTool extends X3DGeometryNodeTool
-{
-   async initializeTool (type)
-   {
-      await super .loadTool ("tool", __dirname, "X3DPointGeometryNodeTool.x3d");
-
-      this .tool .pointsColor = ToolColors .BLUE;
-
-      if (type === "CUSTOM")
-         return;
-
-      this .node ._rebuild .addInterest ("set_toolRebuildGeometry", this);
-
-      this .tool .pointsCoord = this .getToolScene () .createNode ("CoordinateDouble");
-
-      this .set_toolRebuildGeometry ();
-   }
-
-   disposeTool ()
-   {
-      this .node ._rebuild .removeInterest ("set_toolRebuildGeometry", this);
-
-      super .disposeTool ();
-   }
-
-   set_toolRebuildGeometry ()
-   {
-      const points = this .node .getVertices () .filter ((_, i) => i % 4 < 3);
-
-      this .tool .pointsCoord .point = points;
-   }
-}
-
-module .exports = X3DPointGeometryNodeTool;

package/src/Tools/Rendering/X3DPointGeometryNodeTool.x3d

@@ -1,54 +0,0 @@
-<?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='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.1, https://create3000.github.io/sunrize/'/>
-    <meta name='modified' content='Sat, 29 Jun 2024 10:52:33 GMT'/>
-  </head>
-  <Scene>
-    <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'/>
-    <ProtoDeclare name='X3DPointGeometryNodeTool'>
-      <ProtoInterface>
-        <field accessType='inputOutput' type='SFBool' name='selected'/>
-        <field accessType='inputOutput' type='SFBool' name='pointsDisplay' value='true'/>
-        <field accessType='inputOutput' type='SFFloat' name='pointSize' value='5'/>
-        <field accessType='inputOutput' type='SFColor' name='pointsColor' value='1 1 1'/>
-        <field accessType='inputOutput' type='SFNode' name='pointsCoord'/>
-      </ProtoInterface>
-      <ProtoBody>
-        <Shape DEF='Lines'>
-          <IS>
-            <connect nodeField='visible' protoField='pointsDisplay'/>
-          </IS>
-          <Appearance>
-            <PointProperties>
-              <IS>
-                <connect nodeField='pointSizeScaleFactor' protoField='pointSize'/>
-                <connect nodeField='pointSizeMinValue' protoField='pointSize'/>
-                <connect nodeField='pointSizeMaxValue' protoField='pointSize'/>
-              </IS>
-            </PointProperties>
-            <Material
-                diffuseColor='0 0 0'>
-              <IS>
-                <connect nodeField='emissiveColor' protoField='pointsColor'/>
-              </IS>
-            </Material>
-            <ProtoInstance name='ToolShader' DEF='_999' containerField='shaders'/>
-            <DepthMode
-                polygonOffset='-1 -1'/>
-          </Appearance>
-          <PointSet>
-            <IS>
-              <connect nodeField='coord' protoField='pointsCoord'/>
-            </IS>
-          </PointSet>
-        </Shape>
-      </ProtoBody>
-    </ProtoDeclare>
-  </Scene>
-</X3D>