sunrize 1.3.5 → 1.4.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.3.5",
+  "version": "1.4.1",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -15,6 +15,7 @@
     "start": "electron .",
     "development": "SUNRISE_ENVIRONMENT=DEVELOPMENT electron .",
     "release": "node build/release.js",
+    "x3duom": "sh build/x3duom.sh",
     "download": "node build/download.js",
     "premake": "npm i -D electron",
     "make": "env PATH=\"$(pwd)/build/wine-proxy:$PATH\" electron-forge make",
@@ -80,16 +81,16 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^28.1.0",
+    "electron": "^28.1.4",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
-    "electron-tabs": "^1.0.2",
+    "electron-tabs": "^1.0.4",
     "fullname": "^5.0.0",
     "jquery": "^3.7.1",
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.16",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.14.2",
+    "material-symbols": "^0.14.5",
     "md5": "^2.3.0",
     "monaco-editor": "^0.45.0",
     "node-clipboardy": "^1.0.3",
@@ -98,7 +99,7 @@
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^9.1.11"
+    "x_ite": "^9.2.1"
   },
   "config": {
     "forge": {

package/src/Application/Application.js

@@ -40,6 +40,8 @@ module .exports = class Application
       if (process .platform === "win32")
          require ("update-electron-app") .updateElectronApp ();
 
+      electron .app .commandLine .appendSwitch ("--enable-features", "OverlayScrollbar");
+
       new Application ();
    }
 
@@ -92,7 +94,7 @@ module .exports = class Application
       electron .ipcMain .on ("change-menu",         (event, object)      => this .updateMenu (object));
       electron .ipcMain .on ("context-menu",        (event, id, menu)    => this .contextMenu (id, menu));
 
-      electron .ipcMain .handle ("file-path", async (event, basename) => await this .showSaveDialog (basename));
+      electron .ipcMain .handle ("file-path", async (event, options) => await this .showDialog (options));
       electron .ipcMain .handle ("fullname", async () => await (await import ("fullname")) .default ());
 
       await electron .app .whenReady ();
@@ -191,7 +193,7 @@ module .exports = class Application
                   },
                },
                {
-                  label: _ ("Open URL..."),
+                  label: _ ("Open Location..."),
                   accelerator: "Shift+CmdOrCtrl+O",
                   click: async () =>
                   {
@@ -260,7 +262,7 @@ module .exports = class Application
                   },
                },
                {
-                  label: _ ("Save Copy As..."),
+                  label: _ ("Save A Copy..."),
                   click: async () =>
                   {
                      const response = await this .showSaveDialog (this .currentFile);
@@ -758,6 +760,17 @@ module .exports = class Application
       return filtered;
    }
 
+   showDialog (options)
+   {
+      switch (options .type)
+      {
+         case "open":
+            return this .showOpenDialog (options .defaultPath, options .filters);
+         case "save":
+            return this .showSaveDialog (options .defaultPath);
+      }
+   }
+
    /**
     *
     * @param {[string]} urls
@@ -781,7 +794,7 @@ module .exports = class Application
       }
    }
 
-   async showOpenDialog (defaultPath)
+   async showOpenDialog (defaultPath, filters)
    {
       this .pushMenu (electron .Menu .buildFromTemplate ([
          {
@@ -791,12 +804,14 @@ module .exports = class Application
          { role: "editMenu" },
       ]));
 
+      console .log (filters)
+
       const response = await electron .dialog .showOpenDialog ({
          defaultPath: defaultPath,
          properties: ["openFile", "multiSelections"],
-         filters: [
+         filters: filters ?? [
             {
-               name: "X3D Document",
+               name: _ ("X3D Document"),
                extensions: ["x3d", "x3dz", "x3dj", "x3djz", "x3dv", "x3dvz", "wrl", "wrz", "wrl.gz", "vrml", "gltf", "glb", "obj", "stl", "ply", "svg"],
             },
          ],
@@ -826,12 +841,12 @@ module .exports = class Application
          defaultPath: defaultPath,
          properties: ["createDirectory", "showOverwriteConfirmation"],
          filters : [
-            { name: "X3D XML Document", extensions: ["x3d"] },
-            { name: "X3D XML Document GZipped", extensions: ["x3dz"] },
-            { name: "X3D JSON Document", extensions: ["x3dj"] },
-            { name: "X3D JSON Document GZipped", extensions: ["x3djz"] },
-            { name: "X3D VRML Classic Document", extensions: ["x3dv"] },
-            { name: "X3D VRML Classic Document GZipped", extensions: ["x3dvz"] },
+            { name: _ ("X3D XML Document"), extensions: ["x3d"] },
+            { name: _ ("X3D XML Document GZipped"), extensions: ["x3dz"] },
+            { name: _ ("X3D JSON Document"), extensions: ["x3dj"] },
+            { name: _ ("X3D JSON Document GZipped"), extensions: ["x3djz"] },
+            { name: _ ("X3D VRML Classic Document"), extensions: ["x3dv"] },
+            { name: _ ("X3D VRML Classic Document GZipped"), extensions: ["x3dvz"] },
          ],
       });
 

package/src/Application/Dashboard.js

@@ -45,7 +45,7 @@ module .exports = class Dashboard extends Interface
 
       this .viewAllButton = $("<span></span>")
          .addClass (["material-symbols-outlined"])
-         .attr ("title", _ ("View all objects in active layer."))
+         .attr ("title", _ ("Look at selected objects."))
          .text ("center_focus_strong")
          .appendTo (this .toolbar)
          .on ("click", () => this .viewAll ());

package/src/Application/Document.js

@@ -171,7 +171,7 @@ module .exports = class Document extends Interface
       }
       catch (error)
       {
-         console .log (error);
+         // console .error (error);
       }
    }
 

package/src/Editors/OutlineEditor.js

@@ -3,6 +3,8 @@
 const
    $                 = require ("jquery"),
    electron          = require ("electron"),
+   path              = require ("path"),
+   url               = require ("url"),
    X3D               = require ("../X3D"),
    OutlineRouteGraph = require ("./OutlineRouteGraph"),
    Editor            = require ("../Undo/Editor"),
@@ -1042,7 +1044,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       const
          executionContext = this .objects .get (executionContextId),
          proto            = this .objects .get (protoNodeId),
-         response         = await electron .ipcRenderer .invoke ("file-path", proto .getName ());
+         response         = await electron .ipcRenderer .invoke ("file-path", { type: "save", defaultPath: proto .getName () });
 
       if (response .canceled)
          return;
@@ -1073,36 +1075,39 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
-   addBooleanField (boolean)
+   addBooleanField (button)
    {
       const
-         element = boolean .closest (".field"),
+         element = button .closest (".field"),
          node    = this .getNode (element),
          field   = this .getField (element);
 
       if (field .getAccessType () === X3D .X3DConstants .outputOnly)
          return;
 
-      boolean .addClass ("pointer") .on ("click", () =>
+      button .addClass ("pointer") .on ("click", event =>
       {
+         event .preventDefault ();
+         event .stopImmediatePropagation ();
+
          Editor .setFieldValue (node .getExecutionContext (), node, field, !field .getValue ());
       });
    }
 
-   addColorField (color)
+   addColorField (button)
    {
       //https://seballot.github.io/spectrum/#skinning-nonInput
       require ("spectrum-colorpicker2");
 
       const
-         element = color .closest (".field"),
+         element = button .closest (".field"),
          node    = this .getNode (element),
          field   = this .getField (element);
 
       if (field .getAccessType () === X3D .X3DConstants .outputOnly)
          return;
 
-      color .addClass ("pointer") .spectrum ({
+      button .addClass ("pointer") .spectrum ({
          type: "color",
          showAlpha: field .getType () === X3D .X3DConstants .SFColorRGBA,
          showInitial: true,
@@ -1113,7 +1118,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       })
       .on ("beforeShow.spectrum", (event) =>
       {
-         color .spectrum ("set", color .css ("background-color"));
+         button .spectrum ("set", button .css ("background-color"));
       })
       .on("move.spectrum", (event, tinyColor) =>
       {
@@ -1143,27 +1148,89 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       });
    }
 
-	removeColorField (element)
+	removeColorField (button)
 	{
-		element .spectrum ?.("destroy");
+		button .spectrum ?.("destroy");
 	}
 
-   addTimeField (time)
+   addTimeField (button)
    {
       const
-         element  = time .closest (".field"),
+         element  = button .closest (".field"),
          node     = this .getNode (element),
          field    = this .getField (element);
 
       if (field .getAccessType () === X3D .X3DConstants .outputOnly)
          return;
 
-      time .addClass ("pointer") .on ("click", () =>
+      button .addClass ("pointer") .on ("click", event =>
       {
+         event .preventDefault ();
+         event .stopImmediatePropagation ();
+
          Editor .setFieldValue (node .getExecutionContext (), node, field, Date .now () / 1000);
       });
    }
 
+   addUrlField (button)
+   {
+      const
+         element  = button .closest (".field, .special"),
+         node     = this .getNode (element),
+         field    = this .getField (element);
+
+      button .addClass ("pointer") .on ("click", async event =>
+      {
+         event .preventDefault ();
+         event .stopImmediatePropagation ();
+
+         switch (node .getTypeName ())
+         {
+            case "X3DExternProtoDeclaration":
+            case "Inline":
+            {
+               var filters = undefined;
+               break;
+            }
+            default:
+            {
+               var filters = [
+                  { name: _ ("All Files"), extensions: ["*"] },
+               ];
+
+               break;
+            }
+         }
+
+         const response = await electron .ipcRenderer .invoke ("file-path",
+         {
+            type: "open",
+            filters: filters,
+         });
+
+         if (response .canceled)
+            return;
+
+         const
+            worldURL = node .getExecutionContext () .getWorldURL (),
+            value    = field .copy ();
+
+         for (const filePath of response .filePaths .reverse ())
+         {
+            try
+            {
+               value .unshift (path .relative (path .dirname (url .fileURLToPath (worldURL)), filePath));
+            }
+            catch
+            {
+               value .unshift (url .pathToFileURL (filePath));
+            }
+         }
+
+         Editor .setFieldValue (node .getExecutionContext (), node, field, value);
+      });
+   }
+
    /*
     * Change field value.
     */
@@ -1452,14 +1519,13 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       const
          element = $(event .currentTarget) .closest (".field", this .sceneGraph),
          node    = this .getNode (element),
-         field   = this .getField (element)
+         field   = this .getField (element);
 
-      // Block default href.
-      event .preventDefault ()
-      event .stopImmediatePropagation ()
+      event .preventDefault ();
+      event .stopImmediatePropagation ();
 
       if (!this .isEditable (element .parent ()))
-         return
+         return;
 
       if (event .ctrlKey || event .metaKey)
       {
@@ -1467,7 +1533,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          {
             case "input":
             {
-            	const routes = field .getInputRoutes ()
+            	const routes = field .getInputRoutes ();
 
             	switch (routes .size)
             	{
@@ -1481,16 +1547,16 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             			{
             				// Delete route.
 
-            				Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField)
+            				Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
             			}
 
-            			break
+            			break;
             		}
             		default:
             		{
-            			element .data ("full-expanded", true)
-            			element .jstree ("open_node", element)
-            			break
+            			element .data ("full-expanded", true);
+            			element .jstree ("open_node", element);
+            			break;
             		}
             	}
 
@@ -1498,7 +1564,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             }
             case "output":
             {
-            	const routes = field .getOutputRoutes ()
+            	const routes = field .getOutputRoutes ();
 
             	switch (routes .size)
             	{
@@ -1512,20 +1578,20 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             			{
             				// Delete route.
 
-            				Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField)
+            				Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
             			}
 
-            			break
+            			break;
             		}
             		default:
             		{
-            			element .data ("full-expanded", true)
-            			element .jstree ("open_node", element)
-            			break
+            			element .data ("full-expanded", true);
+            			element .jstree ("open_node", element);
+            			break;
             		}
             	}
 
-            	break
+            	break;
             }
          }
       }
@@ -1533,7 +1599,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       {
          const
             sceneElement     = element .closest (".scene", this .sceneGraph),
-            executionContext = this .getNode (sceneElement)
+            executionContext = this .getNode (sceneElement);
 
          switch (type)
          {
@@ -1542,29 +1608,32 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             	if (this .connector)
             	{
             		if (this .connector .type === type)
-            			break
+            			break;
 
             		if (this .connector .executionContext !== executionContext)
-            			break
+            			break;
 
             		if (this .connector .field .getType () !== field .getType ())
-            			break
+            			break;
+
+                  if (this .connector .node .getField (this .connector .field .getName ()) .getFieldInterests () .has (node .getField (field .getName ())))
+                     break;
 
             		// Add route.
 
-            		Editor .addRoute (executionContext, this .connector .node, this .connector .field .getName (), node, field .getName ())
+            		Editor .addRoute (executionContext, this .connector .node, this .connector .field .getName (), node, field .getName ());
 
             		if (event .shiftKey)
-            			break
+            			break;
 
             		this .connector .element .find (".access-type img.active.output.activated")
-            			.removeClass ("activated")
+            			.removeClass ("activated");
 
-            		delete this .connector
+            		delete this .connector;
             	}
             	else
             	{
-            		this .connector = { type: type, executionContext: executionContext, node: node, field: field, element: element }
+            		this .connector = { type, executionContext, node, field, element };
             	}
 
             	break
@@ -1574,32 +1643,35 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             	if (this .connector)
             	{
             		if (this .connector .type === type)
-            			break
+            			break;
 
             		if (this .connector .executionContext !== executionContext)
-            			break
+            			break;
 
             		if (this .connector .field .getType () !== field .getType ())
-            			break
+            			break;
+
+                  if (node .getField (field .getName ()) .getFieldInterests () .has (this .connector .node .getField (this .connector .field .getName ())))
+                     break;
 
             		// Add route.
 
-            		Editor .addRoute (executionContext, node, field .getName (), this .connector .node, this .connector .field .getName ())
+            		Editor .addRoute (executionContext, node, field .getName (), this .connector .node, this .connector .field .getName ());
 
             		if (event .shiftKey)
-            			break
+            			break;
 
             		this .connector .element .find (".access-type img.active.input.activated")
-            			.removeClass ("activated")
+            			.removeClass ("activated");
 
-            		delete this .connector
+            		delete this .connector;
             	}
             	else
             	{
-            		this .connector = { type: type, executionContext: executionContext, node: node, field: field, element: element }
+            		this .connector = { type, executionContext, node, field, element };
             	}
 
-            	break
+            	break;
             }
          }
       }
@@ -1611,19 +1683,18 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       const
          element = $(event .currentTarget) .closest (".route", this .sceneGraph),
-         field   = this .getField (element)
+         field   = this .getField (element);
 
-      // Block default href.
-      event .preventDefault ()
-      event .stopImmediatePropagation ()
+      event .preventDefault ();
+      event .stopImmediatePropagation ();
 
       if (!this .isEditable (element .parent ()))
-         return
+         return;
 
       if (!(event .ctrlKey || event .metaKey))
-         return
+         return;
 
-      element .hide ()
+      element .hide ();
 
       switch (type)
       {
@@ -1631,15 +1702,15 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          {
             const route = this .getRoute (element, field .getInputRoutes ())
 
-            Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField)
-            break
+            Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
+            break;
          }
          case "output":
          {
-            const route = this .getRoute (element, field .getOutputRoutes ())
+            const route = this .getRoute (element, field .getOutputRoutes ());
 
-            Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField)
-            break
+            Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
+            break;
          }
       }
    }
@@ -1654,11 +1725,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          element   = $(event .target) .closest (".externproto", this .sceneGraph),
          selected  = this .sceneGraph .find (".externproto.selected"),
          selection = selected .filter (element) .length ? selected : element,
-         ids       = selection .map (function () { return this .id }) .get ()
+         ids       = selection .map (function () { return this .id }) .get ();
 
-      this .selectPrimaryElement (element)
+      this .selectPrimaryElement (element);
 
-      event .originalEvent .dataTransfer .setData ("sunrize/externproto", ids .join (","))
+      event .originalEvent .dataTransfer .setData ("sunrize/externproto", ids .join (","));
    }
 
    onDragStartProto (event)
@@ -1667,11 +1738,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          element   = $(event .target) .closest (".proto", this .sceneGraph),
          selected  = this .sceneGraph .find (".proto.selected"),
          selection = selected .filter (element) .length ? selected : element,
-         ids       = selection .map (function () { return this .id }) .get ()
+         ids       = selection .map (function () { return this .id }) .get ();
 
-      this .selectPrimaryElement (element)
+      this .selectPrimaryElement (element);
 
-      event .originalEvent .dataTransfer .setData ("sunrize/proto", ids .join (","))
+      event .originalEvent .dataTransfer .setData ("sunrize/proto", ids .join (","));
    }
 
    onDragStartNode (event)
@@ -1680,11 +1751,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          element   = $(event .target) .closest (".node", this .sceneGraph),
          selected  = this .sceneGraph .find (".node.manually.selected"),
          selection = selected .filter (element) .length ? selected : element,
-         ids       = selection .map (function () { return this .id }) .get ()
+         ids       = selection .map (function () { return this .id }) .get ();
 
-      this .selectPrimaryElement (element)
+      this .selectPrimaryElement (element);
 
-      event .originalEvent .dataTransfer .setData ("sunrize/nodes", ids .join (","))
+      event .originalEvent .dataTransfer .setData ("sunrize/nodes", ids .join (","));
    }
 
    onDragStartField (event)
@@ -1933,16 +2004,16 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
    onDragLeave (event)
    {
-      event .preventDefault ()
-      event .stopPropagation ()
+      event .preventDefault ();
+      event .stopPropagation ();
 
       // Hide drop indicator.
 
       const element = $(event .target)
-         .closest ("li, .scene-graph", this .sceneGraph)
+         .closest ("li, .scene-graph", this .sceneGraph);
 
       element .find ("> .item") .addBack ()
-         .removeClass (["drag-before", "drag-into", "drag-after"])
+         .removeClass (["drag-before", "drag-into", "drag-after"]);
    }
 
    async onDrop (event)