sunrize 1.7.29 → 1.7.31

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.29",
+  "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.25.1",
+    "material-symbols": "^0.27.0",
     "md5": "^2.3.0",
     "mime-types": "^2.1.35",
     "monaco-editor": "^0.50.0",
@@ -109,46 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.5.9"
-  },
-  "config": {
-    "forge": {
-      "packagerConfig": {
-        "icon": "./src/assets/images/icon.png",
-        "dir": "./src",
-        "ignore": "^/(?!src|package\\.json|node_modules)",
-        "certificateFile": "./build/certificate.pfx",
-        "certificatePassword": "CREATE3000",
-        "extendInfo": "./src/assets/Info.plist",
-        "osxSign": {}
-      },
-      "makers": [
-        {
-          "name": "@electron-forge/maker-squirrel"
-        },
-        {
-          "name": "@electron-forge/maker-dmg"
-        },
-        {
-          "name": "@electron-forge/maker-deb"
-        },
-        {
-          "name": "@electron-forge/maker-rpm"
-        }
-      ],
-      "publishers": [
-        {
-          "name": "@electron-forge/publisher-github",
-          "config": {
-            "repository": {
-              "owner": "create3000",
-              "name": "sunrize"
-            },
-            "prerelease": false,
-            "draft": false
-          }
-        }
-      ]
-    }
+    "x_ite": "^10.5.11",
+    "x3d-traverse": "^1.0.2"
   }
 }

package/src/Application/Document.js

@@ -161,8 +161,20 @@ module .exports = class Document extends Interface
       await this .browser .loadComponents (this .browser .getProfile ("Full"),
                                            this .browser .getComponent ("X_ITE"));
 
+      // Modify nodes.
+
       this .browser .updateConcreteNode (require ("../Components/Grouping/StaticGroup"));
 
+      X3D .NurbsSweptSurface .prototype .traverse = function (type, renderObject)
+      {
+         this .getTrajectoryCurve () ?.traverse (type, renderObject);
+      };
+
+      X3D .NurbsSwungSurface .prototype .traverse = function (type, renderObject)
+      {
+         this .getTrajectoryCurve () ?.traverse (type, renderObject);
+      };
+
       // Restore
 
       await this .restoreFile ();

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