sunrize 1.3.5 → 1.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "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,7 +81,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^28.1.0",
+    "electron": "^28.1.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.2",
@@ -89,7 +90,7 @@
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.16",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.14.2",
+    "material-symbols": "^0.14.3",
     "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.0"
   },
   "config": {
     "forge": {

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

@@ -1083,8 +1083,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       if (field .getAccessType () === X3D .X3DConstants .outputOnly)
          return;
 
-      boolean .addClass ("pointer") .on ("click", () =>
+      boolean .addClass ("pointer") .on ("click", event =>
       {
+         event .preventDefault ();
+         event .stopImmediatePropagation ();
+
          Editor .setFieldValue (node .getExecutionContext (), node, field, !field .getValue ());
       });
    }
@@ -1158,8 +1161,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       if (field .getAccessType () === X3D .X3DConstants .outputOnly)
          return;
 
-      time .addClass ("pointer") .on ("click", () =>
+      time .addClass ("pointer") .on ("click", event =>
       {
+         event .preventDefault ();
+         event .stopImmediatePropagation ();
+
          Editor .setFieldValue (node .getExecutionContext (), node, field, Date .now () / 1000);
       });
    }
@@ -1452,14 +1458,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 +1472,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          {
             case "input":
             {
-            	const routes = field .getInputRoutes ()
+            	const routes = field .getInputRoutes ();
 
             	switch (routes .size)
             	{
@@ -1481,16 +1486,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 +1503,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             }
             case "output":
             {
-            	const routes = field .getOutputRoutes ()
+            	const routes = field .getOutputRoutes ();
 
             	switch (routes .size)
             	{
@@ -1512,20 +1517,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 +1538,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 +1547,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 +1582,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 +1622,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 +1641,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 +1664,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 +1677,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 +1690,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 +1943,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)