sunrize 1.0.13 → 1.0.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "A Multi Platform X3D Editor",
   "homepage": "https://create3000.github.io/sunrize/",
   "author": "Holger Seelig",
@@ -34,12 +34,12 @@
     }
   ],
   "devDependencies": {
-    "@electron-forge/cli": "^6.0.5",
+    "@electron-forge/cli": "^6.1.0",
     "@electron-forge/maker-deb": "^6.1.0",
     "@electron-forge/maker-rpm": "^6.1.0",
-    "@electron-forge/maker-squirrel": "^6.0.5",
-    "@electron-forge/maker-zip": "^6.0.5",
-    "electron": "^23.2.0"
+    "@electron-forge/maker-squirrel": "^6.1.0",
+    "@electron-forge/maker-zip": "^6.1.0",
+    "electron": "^23.2.1"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
@@ -50,15 +50,15 @@
     "jquery": "^3.6.4",
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.15",
-    "material-icons": "^1.13.3",
-    "material-symbols": "^0.5.3",
+    "material-icons": "^1.13.4",
+    "material-symbols": "^0.5.5",
     "md5": "^2.3.0",
     "monaco-editor": "^0.36.1",
     "node-localstorage": "^2.2.1",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^8.6.13"
+    "x_ite": "^8.6.14"
   },
   "main": "src/main.js",
   "bin": {

package/src/sunrize/Application/Application.js

@@ -22,7 +22,7 @@ module .exports = class Application
       if (electron .app .requestSingleInstanceLock ())
          new this ()
       else
-         electron .app .quit ();
+         electron .app .quit ()
    }
 
    constructor ()
@@ -431,7 +431,7 @@ module .exports = class Application
                   checked: this .config .rubberband,
                   click: () =>
                   {
-                     this .config .rubberband = !this .config .rubberband;
+                     this .config .rubberband = !this .config .rubberband
                      this .mainWindow .webContents .send ("display-rubberband", this .config .rubberband)
                   },
                },
@@ -441,7 +441,7 @@ module .exports = class Application
                   checked: this .config .timings,
                   click: () =>
                   {
-                     this .config .timings = !this .config .timings;
+                     this .config .timings = !this .config .timings
                      this .mainWindow .webContents .send ("display-timings", this .config .timings)
                   },
                },

package/src/sunrize/Application/{SecondaryToolbar.js → Dashboard.js}

@@ -7,11 +7,11 @@ const
    Box3      = X3D .require ("standard/Math/Geometry/Box3"),
    _         = require ("./GetText")
 
-module .exports = class SecondaryToolbar extends Interface
+module .exports = class Dashboard extends Interface
 {
    constructor (element)
    {
-      super ("Sunrize.SecondaryToolbar.")
+      super ("Sunrize.Dashboard.")
 
       this .toolbar = element
 
@@ -80,6 +80,8 @@ module .exports = class SecondaryToolbar extends Interface
 
       this .arrowButton .removeClass ("active")
       this .handButton .addClass ("active")
+
+      this .browser .setBrowserOption ("PrivateSensors", false)
    }
 
    arrow ()
@@ -91,6 +93,8 @@ module .exports = class SecondaryToolbar extends Interface
 
       this .handButton .removeClass ("active")
       this .arrowButton .addClass ("active")
+
+      this .browser .setBrowserOption ("PrivateSensors", true)
    }
 
    play (value)

package/src/sunrize/Application/DataStorage.js

@@ -65,7 +65,7 @@ const handler =
 				ownKeys .push (key .substring (namespace .length))
 		}
 
-		return ownKeys;
+		return ownKeys
 	},
 	getOwnPropertyDescriptor: function (target, key)
 	{
@@ -73,7 +73,7 @@ const handler =
 			storage   = target .getStorage (),
 			namespace = target .getNameSpace ()
 
-		return Object .getOwnPropertyDescriptor (storage, namespace + key);
+		return Object .getOwnPropertyDescriptor (storage, namespace + key)
 	},
 }
 

package/src/sunrize/Application/Document.js

@@ -10,7 +10,7 @@ const
    X3D                = require ("../X3D"),
    Interface          = require ("./Interface"),
    Splitter           = require ("../Controls/Splitter"),
-   SecondaryToolbar   = require ("./SecondaryToolbar"),
+   Dashboard          = require ("./Dashboard"),
    Footer             = require ("./Footer"),
    Sidebar            = require ("./Sidebar"),
    Editor             = require ("../Undo/Editor"),
@@ -27,7 +27,7 @@ module .exports = new class Document extends Interface
 
       this .verticalSplitter   = new Splitter ($("#vertical-splitter"), "vertical")
       this .horizontalSplitter = new Splitter ($("#horizontal-splitter"), "horizontal")
-      this .secondaryToolbar   = new SecondaryToolbar ($("#secondary-toolbar"))
+      this .secondaryToolbar   = new Dashboard ($("#secondary-toolbar"))
       this .footer             = new Footer ($("#footer"))
       this .sidebar            = new Sidebar ($("#sidebar"))
 
@@ -263,7 +263,7 @@ module .exports = new class Document extends Interface
 
       this .saveFile (true)
 
-      undoManager .undo ();
+      undoManager .undo ()
 
       this .filePath = oldFilePath
    }

package/src/sunrize/Application/Selection.js

@@ -7,23 +7,20 @@ module .exports = new class Selection
       this .nodes = new Map ()
    }
 
-   clear (exception)
+   clear ()
    {
       for (const node of this .nodes .values ())
-      {
-         if (node !== exception)
-            node .removeTool ()
-      }
+         node .removeTool ()
 
       this .nodes .clear ()
    }
 
    set (node)
    {
-      const tool = this .tool (node)
+      this .nodes .delete (this .node (node))
 
-      this .clear (tool)
-      this .add (tool ?? node)
+      this .clear ()
+      this .add (node)
    }
 
    add (node)
@@ -33,13 +30,13 @@ module .exports = new class Selection
 
    remove (node)
    {
-      this .tool (node) .removeTool ()
+      this .tool (node) ?.removeTool ()
       this .nodes .delete (this .node (node))
    }
 
    node (node)
    {
-      return node .node ?? node
+      return node .valueOf ()
    }
 
    tool (node)

package/src/sunrize/Application/Traverse.js

@@ -106,12 +106,27 @@ module .exports = class Traverse
          }
       }
 
-      const type = node .getType ();
+      const type = node .getType ()
 
       for (let t = type .length - 1; t >= 0; -- t)
       {
          switch (type [t])
          {
+            case X3D .X3DConstants .X3DExternProtoDeclaration:
+            {
+               if (flags & this .EXTERNPROTO_DECLARATION_SCENE)
+               {
+                  try
+                  {
+                     if (this .traverseScene (node .getInternalScene (), flags, callback, seen) === false)
+                        return false
+                  }
+                  catch
+                  { }
+               }
+
+               break
+            }
             case X3D .X3DConstants .X3DProtoDeclaration:
             {
                if (flags & Traverse .PROTO_DECLARATION_BODY)
@@ -132,6 +147,16 @@ module .exports = class Traverse
 
                break
             }
+            case X3D .X3DConstants .Inline:
+            {
+               if (flags & this .INLINE_SCENE)
+               {
+                  if (this .traverseScene (node .getInternalScene (), flags, callback, seen) === false)
+                     return false
+               }
+
+               break
+            }
             default:
             {
                continue
@@ -288,7 +313,7 @@ module .exports = class Traverse
             }
          }
 
-         const type = node .getType ();
+         const type = node .getType ()
 
          for (let t = type .length - 1; t >= 0; -- t)
          {
@@ -300,7 +325,7 @@ module .exports = class Traverse
                   {
                      try
                      {
-                        this .findInScene (X3D, node .getInternalScene (), object, flags, hierarchies, hierarchy, seen)
+                        this .findInScene (node .getInternalScene (), object, flags, hierarchies, hierarchy, seen)
                      }
                      catch
                      { }

package/src/sunrize/Controls/EditUserDefinedFieldPopover.js

@@ -99,12 +99,12 @@ $.fn.editUserDefinedFieldPopover = function (executionContext, node, field)
       typeNameMenu
          .find ("option")
          .filter ((i, e) => $(e) .text () === field .getTypeName ())
-         .prop ("selected", true);
+         .prop ("selected", true)
 
       accessTypeMenu
          .find ("option")
          .filter ((i, e) => $(e) .text () === accessTypes .get (field .getAccessType ()))
-         .prop ("selected", true);
+         .prop ("selected", true)
 
       nameInput .val (field .getName ())
    }

package/src/sunrize/Controls/RenameNodeInput.js

@@ -35,7 +35,7 @@ $.fn.renameNodeInput = function (node)
       if (name === node .getName ())
          return
 
-      const executionContext = node .getExecutionContext ();
+      const executionContext = node .getExecutionContext ()
 
       if (node instanceof X3D .X3DProtoDeclarationNode)
       {

package/src/sunrize/Controls/Splitter.js

@@ -73,7 +73,7 @@ module .exports = class Splitter extends Interface
    {
       position = Algorithm .clamp (position, 0, 1)
 
-      this .config .file .position = position;
+      this .config .file .position = position
 
       switch (this .orientation)
       {

package/src/sunrize/Controls/Tabs.js

@@ -20,8 +20,8 @@ module .exports = class Tabs extends Interface
       this .addTabs ()
 
       this .element .tabs ()
-      this .element .tabs ("option", "classes.ui-tabs", this .orientation);
-      this .element .on ("tabsactivate", () => this .tabActivated ());
+      this .element .tabs ("option", "classes.ui-tabs", this .orientation)
+      this .element .on ("tabsactivate", () => this .tabActivated ())
    }
 
    addTabs () { }

package/src/sunrize/Editors/Console.js

@@ -23,7 +23,7 @@ module .exports = class Console extends Interface
    {
       super (`Sunrize.Console.${element .attr ("id")}.`)
 
-      this .suspendConsole     = false;
+      this .suspendConsole     = false
       this .messageTime        = 0
       this .historyIndex       = 0
       this .history            = [ ]
@@ -88,8 +88,8 @@ module .exports = class Console extends Interface
          if (event !== X3D .X3DConstants .INITIALIZED_EVENT)
             return
 
-         this .scriptNode      = this .browser .currentScene .createNode ("Script")
-         this .scriptNode .url = new X3D .MFString ("ecmascript:");
+         this .scriptNode      = this .browser .currentScene .createNode ("Script", { warn: false })
+         this .scriptNode .url = new X3D .MFString ("ecmascript:")
       }
       catch (error)
       { }

package/src/sunrize/Editors/Library.js

@@ -191,7 +191,7 @@ module .exports = new class Library extends Dialog
 
    createNode (typeName)
    {
-      const node = this .executionContext .createNode (typeName)
+      const node = this .executionContext .createNode (typeName, { warn: false })
 
       UndoManager .shared .beginUndo (_ ("Create Node %s"), typeName)
 

package/src/sunrize/Editors/OutlineEditor.js

@@ -640,7 +640,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          parentNodeElement  = parentFieldElement .closest (".node, .proto, .scene", this .sceneGraph),
          parentNode         = this .getNode (parentNodeElement),
          parentField        = parentFieldElement .hasClass ("scene") ? parentNode .rootNodes : this .getField (parentFieldElement),
-         node               = executionContext .createNode (typeName) .getValue (),
+         node               = executionContext .createNode (typeName, { warn: false }) .getValue (),
          field              = node .getField (fieldName)
 
       UndoManager .shared .beginUndo (_ ("Add Parent Group %s to Node %s"), typeName, childNode .getTypeName ())
@@ -1129,7 +1129,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
             		// Add route.
 
-            		Editor .addRoute (executionContext, new X3D .SFNode (this .connector .node), this .connector .field .getName (), new X3D .SFNode (node), field .getName ())
+            		Editor .addRoute (executionContext, this .connector .node, this .connector .field .getName (), node, field .getName ())
 
             		if (event .shiftKey)
             			break
@@ -1161,7 +1161,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
             		// Add route.
 
-            		Editor .addRoute (executionContext, new X3D .SFNode (node), field .getName (), new X3D .SFNode (this .connector .node), this .connector .field .getName ())
+            		Editor .addRoute (executionContext, node, field .getName (), this .connector .node, this .connector .field .getName ())
 
             		if (event .shiftKey)
             			break
@@ -1807,7 +1807,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
             if (sourceIndexOffsets .has (sourceParentField))
             {
-               if (sourceParentField !== destinationParentField || destinationIndex > sourceIndex)
+               if (sourceParentField !== destinationParentField || destinationIndex > sourceIndex || isNaN (destinationIndex))
                   sourceIndexOffsets .set (sourceParentField, sourceIndexOffsets .get (sourceParentField) - 1)
             }
             else

package/src/sunrize/Editors/OutlineView.js

@@ -2288,7 +2288,7 @@ module .exports = class OutlineView extends Interface
       this .beforeOpen (element)
       this .expandNode (element, node, full, this .expandTime)
 
-      node .setUserData (_expanded,     field?.getId () ?? true)
+      node .setUserData (_expanded,     field ?.getId () ?? true)
       node .setUserData (_fullExpanded, full)
    }
 

package/src/sunrize/Editors/ScriptEditor.js

@@ -473,7 +473,7 @@ main ()
          return
 
       if (!this .monaco)
-         return;
+         return
 
       const value = new X3D .MFString (this .monaco .getModel () .getValue ())
 

package/src/sunrize/Tools/CADGeometry/CADAssemblyTool.js

@@ -13,7 +13,7 @@ class CADAssemblyTool extends X3DBoundedObjectTool
 
 Object .assign (CADAssembly .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new CADAssemblyTool (this)
    },

package/src/sunrize/Tools/CADGeometry/CADFaceTool.js

@@ -13,7 +13,7 @@ class CADFaceTool extends X3DBoundedObjectTool
 
 Object .assign (CADFace .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new CADFaceTool (this)
    },

package/src/sunrize/Tools/CADGeometry/CADLayerTool.js

@@ -13,7 +13,7 @@ class CADLayerTool extends X3DBoundedObjectTool
 
 Object .assign (CADLayer .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new CADLayerTool (this)
    },

package/src/sunrize/Tools/CADGeometry/CADPartTool.js

@@ -13,7 +13,7 @@ class CADPartTool extends X3DTransformNodeTool
 
 Object .assign (CADPart .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new CADPartTool (this)
    },

package/src/sunrize/Tools/Core/X3DNodeTool.js

@@ -1,11 +1,12 @@
 "use strict"
 
 const
-   path    = require ("path"),
-   url     = require ("url"),
-   X3D     = require ("../../X3D"),
-   Fields  = X3D .require ("x_ite/Fields"),
-   X3DNode = X3D .require ("x_ite/Components/Core/X3DNode")
+   path     = require ("path"),
+   url      = require ("url"),
+   Traverse = require("../../Application/Traverse"),
+   X3D      = require ("../../X3D"),
+   Fields   = X3D .require ("x_ite/Fields"),
+   X3DNode  = X3D .require ("x_ite/Components/Core/X3DNode")
 
 const handler =
 {
@@ -14,32 +15,38 @@ const handler =
       if (key in target)
          return target [key]
 
-      return target .node [key];
+      const property = target .toolNode [key]
+
+      if (typeof property === "function")
+         return property .bind (target .toolNode)
+
+      else
+         return property
    },
    set: function (target, key, value)
    {
       if (key in target)
       {
-         target [key] = value;
-         return true;
+         target [key] = value
+         return true
       }
 
-      target .node [key] = value;
-      return true;
+      target .toolNode [key] = value
+      return true
    },
    has: function (target, key)
    {
-      return key in target .node;
+      return key in target .toolNode
    },
    ownKeys: function (target)
    {
-      return Object .keys (target .node);
+      return Object .keys (target .toolNode)
    },
    getOwnPropertyDescriptor: function (target, key)
    {
-      return Object .getOwnPropertyDescriptor (target .node, key);
+      return Object .getOwnPropertyDescriptor (target .toolNode, key)
    },
-};
+}
 
 class X3DNodeTool
 {
@@ -47,24 +54,40 @@ class X3DNodeTool
    {
       const proxy = new Proxy (this, handler)
 
-      this .node = node
+      this .toolTarget = this
+      this .toolProxy  = proxy
+      this .toolNode   = node
 
       this .replaceNode (node, proxy)
       this .setup ()
 
-      return proxy;
+      return proxy
    }
 
    setup ()
    {
-      this .initialize ();
+      this .initialize ()
    }
 
    initialize () { }
 
+   addTool ()
+   {
+      return this .toolProxy
+   }
+
+   removeTool ()
+   {
+      Traverse .traverse (this .tool, Traverse .ROOT_NODES | Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES, node => node .dispose ())
+
+      this .replaceNode (this, this .toolNode)
+
+      return this .toolNode
+   }
+
    static scenes = new Map ()
 
-   async load (... args)
+   async loadTool (... args)
    {
       const
          URL   = url .pathToFileURL (path .resolve (... args)),
@@ -80,12 +103,13 @@ class X3DNodeTool
 
          X3DNodeTool .scenes .set (URL .href, scene)
 
-         scene .beginUpdate ()
+         scene .setPrivate (true)
+         scene .setLive (true)
 
          this .tool = scene .createProto ("Tool")
       }
 
-      this .innerNode = this .tool .getValue () .getInnerNode ()
+      this .toolInnerNode = this .tool .getValue () .getInnerNode ()
    }
 
    replaceNode (node, replacement)
@@ -93,26 +117,24 @@ class X3DNodeTool
       for (const parent of new Set (node .getParents ()))
       {
          if (parent instanceof Fields .SFNode)
-            parent .setValue (replacement);
+            parent .setValue (replacement)
       }
    }
 
-   addTool ()
+   getInnerNode ()
    {
-      return this;
+      return this .toolProxy
    }
 
-   removeTool ()
+   valueOf ()
    {
-      this .replaceNode (this, this .node)
-
-      return this .node
+      return this .toolNode .valueOf ()
    }
 
    dispose ()
    {
-      this .removeTool ();
-      this .node .dispose ();
+      this .removeTool ()
+      this .toolNode .dispose ()
    }
 }
 
@@ -120,13 +142,12 @@ Object .assign (X3DNode .prototype,
 {
    addTool: function ()
    {
-      return this .createTool () ?? this;
+      return this
    },
-   createTool: function ()
+   removeTool: function ()
    {
-      return null;
+      return this
    },
-   removeTool: function () { return this },
 })
 
 module .exports = X3DNodeTool

package/src/sunrize/Tools/Core/X3DPrototypeInstanceTool.js

@@ -11,20 +11,25 @@ class X3DPrototypeInstanceTool extends X3DNodeTool
    {
       super (node)
 
-      this .node .getInnerNode () .addTool ()
+      this .toolNode .getInnerNode () .addTool ()
    }
 
    removeTool ()
    {
-      this .node .getInnerNode () .removeTool ()
+      this .toolNode .getInnerNode () .removeTool ()
 
-      super .removeTool ()
+      return super .removeTool ()
+   }
+
+   getInnerNode ()
+   {
+      return this .toolNode .getInnerNode ()
    }
 }
 
 Object .assign (X3DPrototypeInstance .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new X3DPrototypeInstanceTool (this)
    },

package/src/sunrize/Tools/Geospatial/GeoLODTool.js

@@ -24,16 +24,16 @@ class GeoLODTool extends X3DBoundedObjectTool
    {
       super .reshape ()
 
-      const center = this .node .getCoord (this .node ._center, GeoLODTool .center)
+      const center = this .toolNode .getCoord (this .toolNode ._center, GeoLODTool .center)
 
       if (!this .tool .center .getValue () .equals (center))
-         this .tool .center = center;
+         this .tool .center = center
    }
 }
 
 Object .assign (GeoLOD .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new GeoLODTool (this)
    },

package/src/sunrize/Tools/Geospatial/GeoLocationTool.js

@@ -13,7 +13,7 @@ class GeoLocationTool extends X3DBoundedObjectTool
 
 Object .assign (GeoLocation .prototype,
 {
-   createTool: function ()
+   addTool: function ()
    {
       return new GeoLocationTool (this)
    },