sunrize 1.7.30 → 1.7.31

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.30",
+  "version": "1.7.31",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -25,7 +25,7 @@
     "postgithub": "npm i -P electron",
     "predocs": "rm -f -r docs/_site/",
     "docs": "cd docs && bundle exec jekyll serve --ssl-key ssl/server.key --ssl-cert ssl/server.crt --incremental --host=`ipconfig getifaddr en0`",
-    "docs-install": "cd docs && bundle install",
+    "docs-install": "cd docs && gem install bundler && bundle install",
     "docs-update": "cd docs && bundle update",
     "merge-development": "sh build/merge-development.sh",
     "make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh"
@@ -90,7 +90,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^33.0.2",
+    "electron": "^33.2.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -99,7 +99,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.26.0",
+    "material-symbols": "^0.27.0",
     "md5": "^2.3.0",
     "mime-types": "^2.1.35",
     "monaco-editor": "^0.50.0",
@@ -109,6 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.5.10"
+    "x_ite": "^10.5.11",
+    "x3d-traverse": "^1.0.2"
   }
 }

package/src/Editors/Library.js

@@ -7,7 +7,7 @@ const
    Dialog           = require ("../Controls/Dialog"),
    Editor           = require ("../Undo/Editor"),
    UndoManager      = require ("../Undo/UndoManager"),
-   Traverse         = require ("../Application/Traverse"),
+   Traverse         = require ("x3d-traverse") (X3D),
    _                = require ("../Application/GetText");
 
 module .exports = new class Library extends Dialog
@@ -209,8 +209,10 @@ module .exports = new class Library extends Dialog
 
       if (this .browser .getBrowserOption ("ColorSpace") === "LINEAR")
       {
-         Traverse .traverse (node, Traverse .ROOT_NODES, node =>
+         for (const object of Traverse .traverse (node, Traverse .ROOT_NODES))
          {
+            const node = object .getValue ();
+
             for (const field of node .getFields ())
             {
                switch (field .getType ())
@@ -225,7 +227,7 @@ module .exports = new class Library extends Dialog
                      break;
                }
             }
-         });
+         }
       }
 
       switch (field ?.getType ())

package/src/Editors/NodeList.js

@@ -4,7 +4,7 @@ const
    $         = require ("jquery"),
    X3D       = require ("../X3D"),
    Interface = require ("../Application/Interface"),
-   Traverse  = require ("../Application/Traverse"),
+   Traverse  = require ("x3d-traverse") (X3D),
    _         = require ("../Application/GetText");
 
 module .exports = class NodeList extends Interface
@@ -92,11 +92,7 @@ module .exports = class NodeList extends Interface
 
    getNodes ()
    {
-      const nodes = [ ];
-
-      Traverse .traverse (this .executionContext, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node => nodes .push (node));
-
-      return nodes;
+      return Array .from (this .executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES), node => node instanceof X3D .SFNode ? node .getValue () : node);
    }
 
    getName (node)

package/src/Editors/OutlineView.js

@@ -8,7 +8,7 @@ const
    X3D        = require ("../X3D"),
    Interface  = require ("../Application/Interface"),
    ActionKeys = require ("../Application/ActionKeys"),
-   Traverse   = require ("../Application/Traverse"),
+   Traverse   = require ("x3d-traverse") (X3D),
    X3DUOM     = require ("../Bits/X3DUOM"),
    _          = require ("../Application/GetText");
 
@@ -3144,76 +3144,96 @@ module .exports = class OutlineView extends Interface
    {
       // Hide all X3DShapeNode nodes and show all other nodes.
 
-      Traverse .traverse (this .executionContext, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      for (const object of this .executionContext .traverse (Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
          if (!node .setHidden)
-            return
+            continue;
 
-         node .setHidden (node .getType () .includes (X3D .X3DConstants .X3DShapeNode))
+         node .setHidden (node .getType () .includes (X3D .X3DConstants .X3DShapeNode));
 
          this .sceneGraph .find (`.node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass (["on", "off"])
             .addClass (node .isHidden () ? "off" : "on")
-            .text (node .isHidden () ? "visibility_off" : "visibility")
-      })
+            .text (node .isHidden () ? "visibility_off" : "visibility");
+      }
 
       // Show all nodes in selection.
 
       const selection = require ("../Application/Selection");
 
-      Traverse .traverse (selection .nodes, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      for (const object of Traverse .traverse (selection .nodes, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
          if (!node .setHidden)
-            return
+            continue;
 
          if (!node .getType () .includes (X3D .X3DConstants .X3DShapeNode))
-            return
+            continue;
 
-         node .setHidden (false)
+         node .setHidden (false);
 
          this .sceneGraph .find (`.node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass ("off")
             .addClass ("on")
-            .text ("visibility")
-      })
+            .text ("visibility");
+      }
    }
 
    showSelectedObjects ()
    {
       const selection = require ("../Application/Selection")
 
-      Traverse .traverse (selection .nodes .length ? selection .nodes : this .executionContext, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      for (const object of Traverse .traverse (selection .nodes .length ? selection .nodes : this .executionContext, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
          if (!node .setHidden)
-            return
+            continue;
 
-         node .setHidden (false)
+         node .setHidden (false);
 
          this .sceneGraph .find (`.node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass ("off")
             .addClass ("on")
-            .text ("visibility")
-      })
+            .text ("visibility");
+      }
    }
 
    showAllObjects ()
    {
-      Traverse .traverse (this .executionContext, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      for (const object of this .executionContext .traverse (Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
          if (!node .setHidden)
-            return
+            continue;
 
-         node .setHidden (false)
+         node .setHidden (false);
 
          this .sceneGraph .find (`.node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass ("off")
             .addClass ("on")
-            .text ("visibility")
-      })
+            .text ("visibility");
+      }
    }
 
    selectNone (event)
@@ -3637,16 +3657,15 @@ module .exports = class OutlineView extends Interface
 
       flags |= Traverse .IMPORTED_NODES;
 
-      const hierarchies = Traverse .find (this .executionContext, object, flags);
-
-      for (const hierarchy of hierarchies)
+      for (const hierarchy of this .executionContext .find (object, flags))
       {
          hierarchy .shift (); // execution context
+         hierarchy .shift (); // rootNode | protos ...
 
          if (!expandObject)
             hierarchy .pop ();
 
-         this .expandHierarchy (hierarchy, this .sceneGraph);
+         this .expandHierarchy (hierarchy, this .sceneGraph, this .executionContext);
          break;
       }
    }
@@ -3658,46 +3677,67 @@ module .exports = class OutlineView extends Interface
       "X3DExecutionContext": "scene",
    };
 
-   expandHierarchy (hierarchy, parent)
+   expandHierarchy (hierarchy, parent, parentObject)
    {
-      const object = hierarchy .shift ();
+      let object = hierarchy .shift ();
 
-      if (!object)
+      if (object === undefined)
          return;
 
-      if (object instanceof X3D .X3DField)
+      switch (true)
       {
-         let element = parent .find (`.field[field-id=${object .getId ()}]`);
-
-         if (element .length === 0)
+         case typeof object === "string":
          {
-            parent .jstree ("close_node", parent);
-            parent .jstree ("open_node",  parent);
+            object = parentObject .getField (object);
 
-            element = parent .find (`.field[field-id=${object .getId ()}]`);
-         }
+            let element = parent .find (`.field[field-id=${object .getId ()}]`);
 
-         element .jstree ("open_node", element);
+            if (element .length === 0)
+            {
+               parent .jstree ("close_node", parent);
+               parent .jstree ("open_node",  parent);
 
-         this .expandHierarchy (hierarchy, element);
-      }
-      else if (object instanceof X3D .X3DImportedNode)
-      {
-         const element = parent .find (`.imported-node[imported-node-id=${object .getId ()}]`);
+               element = parent .find (`.field[field-id=${object .getId ()}]`);
+            }
 
-         element .jstree ("open_node", element);
+            element .jstree ("open_node", element);
 
-         this .expandHierarchy (hierarchy, element);
-      }
-      else
-      {
-         const
-            objectClass = OutlineView .objectClasses [object .getTypeName ()] || "node",
-            element     = parent .find (`.${objectClass}[node-id=${object .getId ()}]`);
+            this .expandHierarchy (hierarchy, element);
+            break;
+         }
+         case typeof object === "number":
+         {
+            this .expandHierarchy (hierarchy, parent);
+            break;
+         }
+         case object instanceof X3D .X3DImportedNode:
+         {
+            const element = parent .find (`.imported-node[imported-node-id=${object .getId ()}]`);
 
-         element .jstree ("open_node", element);
+            element .jstree ("open_node", element);
+
+            this .expandHierarchy (hierarchy, element);
+            break;
+         }
+         case object instanceof X3D .SFNode:
+         {
+            object = object .getValue ();
+            // Proceed with next case:
+         }
+         default: // X3DBaseNode
+         {
+            const
+               objectClass = OutlineView .objectClasses [object .getTypeName ()] || "node",
+               element     = parent .find (`.${objectClass}[node-id=${object .getId ()}]`);
+
+            element .jstree ("open_node", element);
+
+            if (object instanceof X3D .X3DExecutionContext)
+               hierarchy .shift (); // rootNode | protos ...
 
-         this .expandHierarchy (hierarchy, element);
+            this .expandHierarchy (hierarchy, element, object);
+            break;
+         }
       }
    }
 

package/src/Tools/Core/X3DNodeTool.js

@@ -5,7 +5,7 @@ const
    X3D         = require ("../../X3D"),
    Editor      = require ("../../Undo/Editor"),
    UndoManager = require ("../../Undo/UndoManager"),
-   Traverse    = require ("../../Application/Traverse"),
+   Traverse    = require ("x3d-traverse") (X3D),
    path        = require ("path"),
    url         = require ("url"),
    _           = require ("../../Application/GetText");
@@ -218,7 +218,10 @@ class X3DNodeTool extends X3DBaseTool
 
       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 Traverse .traverse (this [tool], Traverse .ROOT_NODES | Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES))
+         {
+            nodesToDispose .push (node instanceof X3D .SFNode ? node .getValue () : node);
+         }
       }
 
       for (const node of nodesToDispose .filter (node => !this .#externalNodes .has (node)))

package/src/Undo/Editor.js

@@ -7,7 +7,7 @@ const
    fs          = require ("fs"),
    zlib        = require ("zlib"),
    X3D         = require ("../X3D"),
-   Traverse    = require ("../Application/Traverse"),
+   Traverse    = require ("x3d-traverse") (X3D),
    UndoManager = require ("./UndoManager"),
    _           = require ("../Application/GetText")
 
@@ -90,13 +90,20 @@ module .exports = class Editor
 
       const protoNodes = new Set ()
 
-      Traverse .traverse (objects, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES, (node) =>
+      for (const object of Traverse .traverse (objects, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES))
       {
-         if (node instanceof X3D .X3DProtoDeclarationNode)
-            protoNodes .add (node);
-         else if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
-            protoNodes .add (node .getProtoNode ());
-      });
+         if (object instanceof X3D .X3DProtoDeclarationNode)
+         {
+            protoNodes .add (object);
+         }
+         else if (object instanceof X3D .SFNode)
+         {
+            const node = object .getValue ();
+
+            if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+               protoNodes .add (node .getProtoNode ());
+         }
+      }
 
       for (const protoNode of protoNodes)
       {
@@ -125,8 +132,10 @@ module .exports = class Editor
          childRoutes    = new Set (),
          inlineNodes    = new Set ();
 
-      Traverse .traverse (nodes, Traverse .ROOT_NODES, node =>
+      for (const object of nodes .traverse (Traverse .ROOT_NODES))
       {
+         const node = object .getValue ();
+
          componentNames .add (node .getComponentInfo () .name);
          children .add (node .valueOf ());
 
@@ -141,7 +150,7 @@ module .exports = class Editor
 
          if (node .getType () .includes (X3D .X3DConstants .Inline))
             inlineNodes .add (node .valueOf ());
-      });
+      }
 
       // Add exported nodes.
 
@@ -295,13 +304,18 @@ module .exports = class Editor
          updatedProtos       = new Map (),
          removedProtoNodes   = new Set ();
 
-      Traverse .traverse ([... newProtos, ... nodes], Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+      for (const object of Traverse .traverse ([... newProtos, ... nodes], Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
          if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
-            return;
+            continue;
 
          if (node .getProtoNode () .getExecutionContext () !== executionContext)
-            return;
+            continue;
 
          const proto = protos .get (node .getTypeName ());
 
@@ -309,7 +323,7 @@ module .exports = class Editor
          {
             updatedProtos .set (node .getTypeName (), proto);
             this .setProtoNode (executionContext, node, proto, undoManager);
-            return;
+            continue;
          }
 
          const externproto = externprotos .get (node .getTypeName ());
@@ -318,7 +332,7 @@ module .exports = class Editor
          {
             updatedExternProtos .set (node .getTypeName (), externproto);
             this .setProtoNode (executionContext, node, externproto, undoManager);
-            return;
+            continue;
          }
 
          const available = this .getNextAvailableProtoNode (executionContext, node .getTypeName ());
@@ -327,9 +341,9 @@ module .exports = class Editor
          {
             removedProtoNodes .add (node .getProtoNode ());
             this .setProtoNode (executionContext, node, available, undoManager);
-            return;
+            continue;
          }
-      });
+      }
 
       for (const [name, externproto] of updatedExternProtos)
          this .updateExternProtoDeclaration (executionContext, name, externproto, undoManager);
@@ -398,9 +412,8 @@ module .exports = class Editor
 
       fs .writeFileSync (filePath, this .getContents (scene, path .extname (filePath)));
 
-      Traverse .traverse (scene, Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES, node => node .dispose ());
-
-      scene .dispose ();
+      for (const object of scene .traverse (Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES))
+         object .dispose ();
 
       browser .setBrowserOption ("LoadUrlObjects", loadUrlObjects);
    }
@@ -486,14 +499,18 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       undoManager .beginUndo (_("Rewrite URLs"))
 
-      Traverse .traverse (objects, Traverse .EXTERNPROTO_DECLARATIONS | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+      for (const object of Traverse .traverse (objects, Traverse .EXTERNPROTO_DECLARATIONS | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
          const
+            node          = object .getValue (),
             urlObject     = node .getType () .includes (X3D .X3DConstants .X3DUrlObject),
             fontStyleNode = node .getType () .includes (X3D .X3DConstants .X3DFontStyleNode);
 
          if (!(urlObject || fontStyleNode))
-            return;
+            continue;
 
          const newURL = new X3D .MFString ();
 
@@ -557,7 +574,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          const uniqueURL = new X3D .MFString (... new Set (newURL));
 
          this .setFieldValue (executionContext, node, node ._url, uniqueURL, undoManager);
-      });
+      }
 
       undoManager .endUndo ();
    }
@@ -616,13 +633,17 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          {
             // Add nodes and child nodes.
 
-            const children = new Set ()
+            const children = new Set ();
 
-            Traverse .traverse (nodesToRemove, Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY, node => { children .add (node .valueOf ()) });
+            Array .from (Traverse .traverse (nodesToRemove, Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY))
+            .filter (object => object instanceof X3D .SFNode)
+            .forEach (node => children .add (node .getValue () .valueOf ()));
 
             // Remove nodes still in scene graph.
 
-            Traverse .traverse (executionContext, Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY, node => { children .delete (node .valueOf ()) });
+            Array .from (Traverse .traverse (executionContext, Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY))
+            .filter (object => object instanceof X3D .SFNode)
+            .forEach (node => children .delete (node .getValue () .valueOf ()));
 
             if (children .size === 0)
                continue;
@@ -755,16 +776,18 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       const components = new Set ();
 
-      Traverse .traverse (scene, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES, (node) =>
+      for (const object of scene .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES))
       {
-         if (!node .getType () .includes (X3D .X3DConstants .X3DNode))
-            return;
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
 
          if (node .getScene () !== scene)
-            return;
+            continue;
 
          components .add (node .getComponentInfo () .name);
-      });
+      }
 
       return components;
    }
@@ -1361,11 +1384,21 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static protoIsUsedInProto (proto, parent)
    {
-      return ! Traverse .traverse (parent, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+      for (const object of parent .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODE))
       {
-         if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
-            return node .getProtoNode () !== proto
-      });
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
+         if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+            continue;
+
+         if (node .getProtoNode () === proto)
+            return true;
+      }
+
+      return false;
    }
 
    /**
@@ -1529,11 +1562,21 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
     static isProtoNodeUsed (executionContext, protoNode)
     {
-       return ! Traverse .traverse (executionContext, Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY, (node) =>
-       {
-          if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
-             return node .getProtoNode () !== protoNode
-       });
+      for (const object of executionContext .traverse (Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY))
+      {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
+         if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+            continue;
+
+         if (node .getProtoNode () === protoNode)
+            return true;
+      }
+
+      return false;
     }
 
    /**
@@ -1707,14 +1750,19 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       undoManager .beginUndo (_("Replace Proto Node %s"), protoNode .getName ());
 
-      Traverse .traverse (executionContext, Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY, (node) =>
+      for (const object of executionContext .traverse (Traverse .ROOT_NODES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY))
       {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
          if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
          {
             if (node .getProtoNode () === protoNode)
                this .setProtoNode (node .getExecutionContext (), node, by, undoManager);
          }
-      });
+      }
 
       this .requestUpdateInstances (executionContext, undoManager);
 
@@ -1953,8 +2001,10 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Remove Node"));
 
-      Traverse .traverse (executionContext, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+      for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
+         const node = object instanceof X3D .SFNode ? object .getValue () : object;
+
          if (node instanceof X3D .X3DExecutionContext)
          {
             for (let i = node .rootNodes .length - 1; i >= 0; -- i)
@@ -1989,7 +2039,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                }
             }
          }
-      });
+      }
 
       undoManager .endUndo ();
    }
@@ -2051,8 +2101,13 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                proto        = node,
                updatedField = field;
 
-            Traverse .traverse (proto, Traverse .PROTO_DECLARATION | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+            for (const object of proto .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
             {
+               if (!(object instanceof X3D .SFNode))
+                  continue;
+
+               const node = object .getValue ();
+
                for (const field of node .getFields ())
                {
                   // Remove references.
@@ -2063,33 +2118,41 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                         this .removeReference (proto, updatedField, node, field, undoManager);
                   }
                }
-            });
+            }
 
             // Remove routes.
 
-            Traverse .traverse (executionContext, Traverse .PROTO_DECLARATION | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+            for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
             {
-               if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance) && node .getProtoNode () === proto)
-               {
-                  const field = node .getField (oldName);
+               if (!(object instanceof X3D .SFNode))
+                  continue;
+
+               const node = object .getValue ();
+
+               if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+                  continue;
+
+               if (node .getProtoNode () !== proto)
+                  continue;
+
+               const field = node .getField (oldName);
 
-                  if (! updatedField .isInput ())
+               if (!updatedField .isInput ())
+               {
+                  for (const route of field .getInputRoutes ())
                   {
-                     for (const route of field .getInputRoutes ())
-                     {
-                        this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                     }
+                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
                   }
+               }
 
-                  if (! updatedField .isOutput ())
+               if (!updatedField .isOutput ())
+               {
+                  for (const route of field .getOutputRoutes ())
                   {
-                     for (const route of field .getOutputRoutes ())
-                     {
-                        this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                     }
+                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
                   }
                }
-            });
+            }
 
             this .updateInstances (proto, undoManager);
          }
@@ -2176,8 +2239,13 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
             // Remove references.
 
-            Traverse .traverse (proto, Traverse .PROTO_DECLARATION | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+            for (const object of proto .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
             {
+               if (!(object instanceof X3D .SFNode))
+                  continue;
+
+               const node = object .getValue ();
+
                for (const field of node .getFields ())
                {
                   for (const removedField of removedFields)
@@ -2192,42 +2260,50 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                         this .removeReference (proto, reference, node, field, undoManager);
                   }
                }
-            });
+            }
 
             // Remove routes, and undo set value.
 
-            Traverse .traverse (executionContext, Traverse .PROTO_DECLARATION | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
+            for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
             {
-               if (node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance) && node .getProtoNode () === proto)
+               if (!(object instanceof X3D .SFNode))
+                  continue;
+
+               const node = object .getValue ();
+
+               if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+                  continue;
+
+               if (node .getProtoNode () !== proto)
+                  continue;
+
+               for (const removedField of removedFields)
                {
-                  for (const removedField of removedFields)
+                  const field = node .getField (removedField .getName ());
+
+                  if (field .isInitializable ())
                   {
-                     const field = node .getField (removedField .getName ());
+                     const
+                        name     = field .getName (),
+                        oldValue = field .copy ();
 
-                     if (field .isInitializable ())
+                     undoManager .registerUndo (() =>
                      {
-                        const
-                           name     = field .getName (),
-                           oldValue = field .copy ();
-
-                        undoManager .registerUndo (() =>
-                        {
-                           this .setFieldValue (node .getExecutionContext (), node, name, oldValue, undoManager);
-                        });
-                     }
+                        this .setFieldValue (node .getExecutionContext (), node, name, oldValue, undoManager);
+                     });
+                  }
 
-                     for (const route of field .getInputRoutes ())
-                     {
-                        this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                     }
+                  for (const route of field .getInputRoutes ())
+                  {
+                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
+                  }
 
-                     for (const route of field .getOutputRoutes ())
-                     {
-                        this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                     }
+                  for (const route of field .getOutputRoutes ())
+                  {
+                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
                   }
                }
-            });
+            }
 
             this .updateInstances (proto, undoManager);
          }
@@ -2843,9 +2919,11 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Replace All Occurrences of %s by %s"), original .getTypeName (), replacement .getTypeName ());
 
-      Traverse .traverse (executionContext, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
-         const fields = node instanceof X3D .X3DExecutionContext ? [node .getRootNodes ()] : node .getFields ()
+         const
+            node   = object instanceof X3D .SFNode ? object .getValue () : object,
+            fields = node instanceof X3D .X3DExecutionContext ? [node .getRootNodes ()] : node .getFields ()
 
          for (const field of fields)
          {
@@ -2870,7 +2948,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                }
             }
          }
-      });
+      }
 
       undoManager .endUndo ();
    }

package/src/assets/Info.plist

@@ -24,7 +24,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.x3d</string>
         <string>io.castleengine.view3dscene.x3d</string>
@@ -54,7 +54,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.x3d</string>
         <string>io.castleengine.view3dscene.x3d</string>
@@ -81,7 +81,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.x3dv</string>
         <string>io.castleengine.view3dscene.x3dv</string>
@@ -111,7 +111,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.x3dv</string>
         <string>io.castleengine.view3dscene.x3dv</string>
@@ -138,7 +138,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.x3dj</string>
         <string>io.castleengine.view3dscene.x3dj</string>
@@ -168,7 +168,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.x3dj</string>
         <string>io.castleengine.view3dscene.x3dj</string>
@@ -198,7 +198,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.vrml</string>
         <string>io.castleengine.view3dscene.vrml</string>
@@ -229,7 +229,7 @@
       <string>Owner</string>
       <key>LSIsAppleDefaultForType</key>
       <true/>
-      <key>LSItemContentTypes</key>
+      <key>UTTypeConformsTo</key>
       <array>
         <string>io.github.create3000.vrml</string>
         <string>io.castleengine.view3dscene.vrml</string>

package/src/assets/themes/default-template.css

@@ -1057,7 +1057,7 @@ body.dark .ui-widget .library-list .component {
   display: none;
 }
 
-.scene-graph .description {
+.scene-graph .description .jstree-anchor {
   padding: 2px 0;
   font-size: smaller;
 }
@@ -1078,11 +1078,12 @@ body.dark .ui-widget .library-list .component {
   color: var(--system-red);
 }
 
+/* make drag & drop work */
 .scene-graph .last {
-  height: 1px;
+  height: 2px;
 }
 
-.scene-graph .last * {
+.scene-graph .last .item *:not(.route-curves-wrapper, .route-curves) {
   visibility: hidden;
 }
 

package/src/assets/themes/default.css

@@ -1057,7 +1057,7 @@ body.dark .ui-widget .library-list .component {
   display: none;
 }
 
-.scene-graph .description {
+.scene-graph .description .jstree-anchor {
   padding: 2px 0;
   font-size: smaller;
 }
@@ -1079,10 +1079,11 @@ body.dark .ui-widget .library-list .component {
 }
 
 .scene-graph .last {
-  height: 1px;
+  /* make drag & drop work */
+  height: 2px;
 }
 
-.scene-graph .last * {
+.scene-graph .last .item *:not(.route-curves-wrapper, .route-curves) {
   visibility: hidden;
 }
 

package/src/Application/Traverse.js

@@ -1,368 +0,0 @@
-"use strict";
-
-const X3D = require ("../X3D");
-
-let flags = 1;
-
-module .exports = class Traverse
-{
-   static NONE                          = 0;
-   static EXTERNPROTO_DECLARATIONS      = flags;
-   static PROTO_DECLARATIONS            = flags <<= 1;
-   static ROOT_NODES                    = flags <<= 1;
-   static IMPORTED_NODES                = flags <<= 1;
-   static EXTERNPROTO_DECLARATION_SCENE = flags <<= 1;
-   static PROTO_DECLARATION_BODY        = flags <<= 1;
-   static PROTOTYPE_INSTANCES           = flags <<= 1;
-   static INLINE_SCENE                  = flags <<= 1;
-   static ALL                           = (flags << 1) - 1;
-
-   /**
-    *
-    * @param {X3DScene|X3DExecutionContext|MFNode|Array<SFNode>|SFNode} object
-    * @param {number} flags
-    * @param {Function} callback
-    * @returns boolean
-    */
-   static traverse (object, flags, callback)
-   {
-      const seen = new Set ()
-
-      if (object instanceof X3D .X3DExecutionContext)
-         return this .traverseScene (object, flags, callback, seen);
-
-      if (object instanceof X3D .MFNode || Array .isArray (object))
-         return this .traverseNodes (object, flags, callback, seen);
-
-      if (object instanceof X3D .SFNode)
-         return this .traverseNode (object .getValue (), flags, callback, seen);
-
-      if (object instanceof X3D .X3DBaseNode)
-         return this .traverseNode (object, flags, callback, seen);
-
-      return false;
-   }
-
-   static traverseScene (executionContext, flags, callback, seen)
-   {
-      if (!executionContext)
-         return true;
-
-      if (flags & Traverse .PROTO_DECLARATIONS)
-      {
-         for (const proto of executionContext .protos)
-         {
-            if (this .traverseNode (proto, flags, callback, seen) === false)
-               return false;
-         }
-      }
-
-      if (flags & Traverse .ROOT_NODES)
-      {
-         if (this .traverseNodes (executionContext .rootNodes, flags, callback, seen) === false)
-            return false;
-      }
-
-      return callback (executionContext) !== false;
-   }
-
-   static traverseNodes (nodes, flags, callback, seen)
-   {
-      for (const node of nodes)
-      {
-         if (this .traverseNode (node instanceof X3D .SFNode ? node .getValue () : node, flags, callback, seen) === false)
-            return false;
-      }
-
-      return true;
-   }
-
-   static traverseNode (node, flags, callback, seen)
-   {
-      if (!node)
-         return true;
-
-      if (seen .has (node))
-         return true;
-
-      seen .add (node);
-
-      if (this .traverseFields (node .getUserDefinedFields (), flags, callback, seen) === false)
-         return false;
-
-      if (this .traverseFields (node .getPredefinedFields (), flags, callback, seen) === false)
-         return false;
-
-      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)
-               {
-                  if (this .traverseScene (node .getInternalScene (), flags, callback, seen) === false)
-                     return false;
-               }
-
-               break;
-            }
-            case X3D .X3DConstants .X3DProtoDeclaration:
-            {
-               if (flags & Traverse .PROTO_DECLARATION_BODY)
-               {
-                  if (this .traverseScene (node .getBody (), flags, callback, seen) === false)
-                     return false;
-               }
-
-               break;
-            }
-            case X3D .X3DConstants .X3DPrototypeInstance:
-            {
-               if (flags & Traverse .PROTOTYPE_INSTANCES)
-               {
-                  if (this .traverseScene (node .getBody (), flags, callback, seen) === false)
-                     return false;
-               }
-
-               break;
-            }
-            case X3D .X3DConstants .Inline:
-            {
-               if (flags & this .INLINE_SCENE)
-               {
-                  if (this .traverseScene (node .getInternalScene (), flags, callback, seen) === false)
-                     return false;
-               }
-
-               break;
-            }
-            default:
-            {
-               continue;
-            }
-         }
-
-         break;
-      }
-
-      return callback (node) !== false;
-   }
-
-   static traverseFields (fields, flags, callback, seen)
-   {
-      for (const field of fields)
-      {
-         switch (field .getType ())
-         {
-            case X3D .X3DConstants .SFNode:
-            {
-               if (this .traverseNode (field .getValue (), flags, callback, seen) === false)
-                  return false;
-
-               break;
-            }
-            case X3D .X3DConstants .MFNode:
-            {
-               if (this .traverseNodes (field, flags, callback, seen) === false)
-                  return false;
-
-               break;
-            }
-         }
-      }
-
-      return true;
-   }
-
-   static find (scene, object, flags)
-   {
-      const
-         hierarchies = [ ],
-         hierarchy   = [ ],
-         seen        = new Set ();
-
-      this .findInScene (scene, object, flags, hierarchies, hierarchy, seen);
-
-      return hierarchies;
-   }
-
-   static findInScene (executionContext, object, flags, hierarchies, hierarchy, seen)
-   {
-      if (!executionContext)
-         return;
-
-      hierarchy .push (executionContext);
-
-      if (executionContext === object)
-      {
-         hierarchies .push (hierarchy .slice ());
-      }
-      else
-      {
-         if (flags & this .EXTERNPROTO_DECLARATIONS)
-         {
-            const externprotos = executionContext .getExternProtoDeclarations ();
-
-            for (const externproto of externprotos)
-            {
-               this .findInNode (externproto, object, flags, hierarchies, hierarchy, seen);
-            }
-         }
-
-         if (flags & this .PROTO_DECLARATIONS)
-         {
-            const prototypes = executionContext .getProtoDeclarations ();
-
-            for (const prototype of prototypes)
-            {
-               this .findInNode (prototype, object, flags, hierarchies, hierarchy, seen);
-            }
-         }
-
-         if (flags & this .ROOT_NODES)
-         {
-            const rootNodes = executionContext .getRootNodes ();
-
-            for (const rootNode of rootNodes)
-            {
-               this .findInNode (rootNode .getValue (), object, flags, hierarchies, hierarchy, seen);
-            }
-         }
-
-         if (flags & this .IMPORTED_NODES)
-         {
-            for (const importedNode of executionContext .getImportedNodes ())
-            {
-               hierarchy .push (importedNode);
-
-               if (importedNode === object)
-               {
-                  hierarchies .push (hierarchy .slice ());
-               }
-               else
-               {
-                  try
-                  {
-                     const exportedNode = importedNode .getExportedNode ();
-
-                     this .findInNode (exportedNode, object, flags, hierarchies, hierarchy, seen);
-                  }
-                  catch (error)
-                  {
-                     //console .log (error .message)
-                  }
-               }
-
-               hierarchy .pop ();
-            }
-         }
-      }
-
-      hierarchy .pop ();
-   }
-
-   static findInNode (node, object, flags, hierarchies, hierarchy, seen)
-   {
-      if (!node)
-         return;
-
-      if (seen .has (node))
-         return;
-
-      seen .add (node);
-      hierarchy .push (node);
-
-      if (node .valueOf () === object .valueOf ())
-      {
-         hierarchies .push (hierarchy .slice ());
-      }
-      else
-      {
-         if (!node .getType () .includes (X3D .X3DConstants .X3DExternProtoDeclaration))
-         {
-            this .findInFields (node .getUserDefinedFields (), object, flags, hierarchies, hierarchy, seen);
-            this .findInFields (node .getPredefinedFields (),  object, flags, hierarchies, hierarchy, seen);
-         }
-
-         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)
-                     this .findInScene (node .getInternalScene (), object, flags, hierarchies, hierarchy, seen);
-
-                  break;
-               }
-               case X3D .X3DConstants .X3DProtoDeclaration:
-               {
-                  if (flags & this .PROTO_DECLARATION_BODY)
-                     this .findInScene (node .getBody (), object, flags, hierarchies, hierarchy, seen);
-
-                  break;
-               }
-               case X3D .X3DConstants .X3DPrototypeInstance:
-               {
-                  if (flags & this .PROTOTYPE_INSTANCES)
-                     this .findInScene (node .getBody (), object, flags, hierarchies, hierarchy, seen);
-
-                  break;
-               }
-               case X3D .X3DConstants .Inline:
-               {
-                  if (flags & this .INLINE_SCENE)
-                     this .findInScene (node .getInternalScene (), object, flags, hierarchies, hierarchy, seen);
-
-                  break
-               }
-               default:
-                  break;
-            }
-         }
-      }
-
-      hierarchy .pop ();
-      seen .delete (node);
-   }
-
-   static findInFields (fields, object, flags, hierarchies, hierarchy, seen)
-   {
-      for (const field of fields)
-      {
-         hierarchy .push (field);
-
-         if (field === object)
-         {
-            hierarchies .push (hierarchy .slice ());
-         }
-         else
-         {
-            switch (field .getType ())
-            {
-               case X3D .X3DConstants .SFNode:
-               {
-                  this .findInNode (field .getValue (), object, flags, hierarchies, hierarchy, seen);
-                  break;
-               }
-               case X3D .X3DConstants .MFNode:
-               {
-                  for (const node of field)
-                     this .findInNode (node ?.getValue (), object, flags, hierarchies, hierarchy, seen);
-
-                  break;
-               }
-               default:
-                  break;
-            }
-         }
-
-         hierarchy .pop ();
-      }
-   }
-};