sunrize 1.11.4 → 1.11.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.11.4",
+  "version": "1.11.6",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -91,7 +91,7 @@
     "@vscode/codicons": "^0.0.41",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^39.0.0",
+    "electron": "^39.1.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -100,7 +100,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.38.0",
+    "material-symbols": "^0.39.1",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
     "monaco-editor": "^0.54.0",
@@ -110,7 +110,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.1.4",
+    "x_ite": "^12.1.6",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Document.js

@@ -55,8 +55,9 @@ module .exports = class Document extends Interface
     */
    async initialize ()
    {
-      $("html") .attr ("platform", process .platform);
-      $("body") .addClass ("modal");
+      $("html")
+         .attr ("platform", process .platform)
+         .addClass ("read-only");
 
       // Actions
 
@@ -192,7 +193,7 @@ module .exports = class Document extends Interface
       await this .restoreFile ();
 
       if (!this .isInitialScene)
-         $("body") .removeClass ("modal");
+         $("html") .removeClass ("read-only");
    }
 
    configure ()

package/src/Controls/ExportNodePopover.js

@@ -23,7 +23,7 @@ $.fn.exportNodePopover = function (node, oldExportedName)
 
    const nameInput = $("<input></input>")
       .attr ("placeholder", _("Enter exported name"))
-      .val (oldExportedName ?? scene .getUniqueExportName (node .getName ()))
+      .val (oldExportedName || scene .getUniqueExportName (node .getName ()))
       .appendTo (content);
 
    // Create tooltip.

package/src/Controls/ImportNodePopover.js

@@ -23,7 +23,7 @@ $.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
 
    const nameInput = $("<input></input>")
       .attr ("placeholder", _("Enter imported name"))
-      .val (oldImportedName ?? executionContext .getUniqueImportName (exportedName))
+      .val (oldImportedName || executionContext .getUniqueImportName (exportedName))
       .appendTo (content);
 
    // Create tooltip.

package/src/Editors/Console.js

@@ -11,23 +11,12 @@ const
 module .exports = class Console extends Interface
 {
    HISTORY_MAX = 100;
-   CONSOLE_MAX = 1000;
-
-   logLevels = [
-      "debug",
-      "log",
-      "warn",
-      "error",
-   ];
-
-   logClasses = ["", "", "filled", "filled"];
 
    constructor (element)
    {
       super (`Sunrize.Console.${element .attr ("id")}.`);
 
       this .suspendConsole     = false;
-      this .messageTime        = 0;
       this .historyIndex       = 0;
       this .history            = [ ];
       this .addMessageCallback = this .addMessage .bind (this);
@@ -175,6 +164,8 @@ module .exports = class Console extends Interface
       this .scriptNode .setup ();
    }
 
+   CONSOLE_MAX = 1000;
+
    // Add strings to exclude here:
    excludes = [
       "The vm module of Node.js is unsupported",
@@ -184,41 +175,31 @@ module .exports = class Console extends Interface
       // "Invalid asm.js: Invalid member of stdlib",
    ];
 
+   messageTime = 0;
+
+   logLevels = [
+      "debug",
+      "log",
+      "warn",
+      "error",
+   ];
+
    addMessage (event, level, sourceId, line, message)
    {
       if (this .excludes .some (exclude => message .includes (exclude)))
          return;
 
-      const
-         classes = [this .logLevels [level] ?? "log", this .logClasses [level]],
-         title   = sourceId ? `${sourceId}:${line}`: "";
-
-      const text = $(message .split ("\n")
-         .map (line => $("<p></p>")
-            .addClass (classes)
-            .attr ("title", title)
-            .text (line)
-            .get (0)));
+      const text = $("<p></p>")
+         .addClass (this .logLevels [level] ?? "log")
+         .attr ("title", sourceId ? `${sourceId}:${line}`: "")
+         .text (message);
 
-      if (this .messageTime && performance .now () - this .messageTime > 1000)
+      if (performance .now () - this .messageTime > 1000)
          this .output .append ($("<p></p>") .addClass ("splitter"));
 
       this .messageTime = performance .now ();
 
-      const
-         children = this .output .children (),
-         last     = children .last ();
-
-      if (last .hasClass (this .logLevels [level]))
-      {
-         last .css ("margin-bottom", "0");
-         text .css ("margin-top",    "0");
-         last .css ("border-bottom", "none");
-         text .css ("border-top",    "none");
-      }
-
-      children .slice (0, Math .max (children .length - this .CONSOLE_MAX, 0)) .remove ();
-
+      this .output .children (`:not(:nth-last-child(-n+${this .CONSOLE_MAX}))`) .remove ();
       this .output .append (text);
       this .output .scrollTop (this .output .prop ("scrollHeight"));
 

package/src/Editors/OutlineView.js

@@ -2154,7 +2154,7 @@ module .exports = class OutlineView extends Interface
       let index = 0;
 
       for (const node of field)
-         ul .append (this .createNodeElement ("node", parent, node .getValue (), index ++));
+         ul .append (this .createNodeElement ("node", parent, node ?.getValue (), index ++));
 
       // Make jsTree.
 
@@ -2787,15 +2787,37 @@ module .exports = class OutlineView extends Interface
 
    nodeCloseClones (element)
    {
-      const opened = this .sceneGraph .find (`.node[node-id=${element .attr ("node-id")}],
-         .imported-node[node-id=${element .attr ("node-id")}],
-         .exported-node[node-id=${element .attr ("node-id")}]`);
+      const ids = [parseInt (element .attr ("node-id"))];
 
-      opened .each (function (key, value)
+      if (this .getNode (element) instanceof X3D .X3DImportedNodeProxy)
       {
-         if (value !== element .get (0))
-            $(value) .jstree ("close_node", value);
-      })
+         // Close nodes.
+
+         ids .push ($.try (() => this .getNode (element) .getInnerNode () .getId ()));
+      }
+      else
+      {
+         // Close imported nodes.
+
+         const executionContext = this .getNode (element) .getScene () ?.getScene ()
+            ?? this .executionContext;
+
+         const importedNode = executionContext .importedNodes
+            .find (importedNode => $.try (() => importedNode .getExportedNode () .getInnerNode () .getId ()) === ids [0]);
+
+         ids .push (importedNode ?.getExportedNode () .getId ());
+      }
+
+      for (const id of ids)
+      {
+         const opened = this .sceneGraph .find (`:is(.node, .imported-node, .exported-node)[node-id="${id}"]`);
+
+         opened .each (function (key, value)
+         {
+            if (value !== element .get (0))
+               $(value) .jstree ("close_node", value);
+         });
+      }
    }
 
    fieldBeforeOpen (event, leaf)

package/src/Editors/SceneProperties.js

@@ -2,6 +2,7 @@
 
 const
    $           = require ("jquery"),
+   electron    = require ("electron"),
    capitalize  = require ("capitalize"),
    Dialog      = require ("../Controls/Dialog"),
    Tabs        = require ("../Controls/Tabs"),
@@ -10,7 +11,6 @@ const
    Editor      = require ("../Undo/Editor"),
    UndoManager = require ("../Undo/UndoManager"),
    _           = require ("../Application/GetText");
-const { height } = require("../Bits/X3DUOM");
 
 require ("../Fields");
 
@@ -472,6 +472,7 @@ module .exports = new class SceneProperties extends Dialog
                   .attr ("placeholder", _("Insert meta key here."))
                   .val (key) .on ("change", (event) => this .changeMetaData (event, key))))
             .append ($("<td></td>")
+               .addClass ("meta-value")
                .append ($("<input></input>")
                   .attr ("index", 1)
                   .attr ("placeholder", _("Insert meta value here."))
@@ -485,6 +486,27 @@ module .exports = new class SceneProperties extends Dialog
                   .text ("delete_forever")
                   .on ("click", (event) => this .removeMetaData (event, key))));
 
+         // Add Open Link in Browser button if it matches a link somewhere in value.
+         {
+            const
+               http  = /(https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*))/,
+               match = value .match (http);
+
+            if (match)
+            {
+               const column = row .find ("input[index=1]") .parent ();
+
+               $("<span></span>")
+                  .addClass ("open-link")
+                  .attr ("title", _("Open link in web browser."))
+                  .css ("font-size", "120%")
+                  .addClass (["material-icons", "button"])
+                  .text ("open_in_new")
+                  .appendTo (column)
+                  .on ("click", () => electron .shell .openExternal (match [1]));
+            }
+         }
+
          rows .push (row);
       }
 

package/src/Undo/Editor.js

@@ -1986,98 +1986,126 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       node = node .valueOf ();
 
+      undoManager .beginUndo (_("Update Field %s of Node %s"), field .getName (), node .getTypeName ());
+
+      if (name !== field .getName ())
+         this .#renameField (executionContext, node, field, name, undoManager);
+
+      if (accessType !== field .getAccessType ())
+         this .#changeAccessType (executionContext, node, field, accessType, undoManager);
+
+      undoManager .endUndo ();
+   }
+
+   static #renameField (executionContext, node, field, name, undoManager = UndoManager .shared)
+   {
+      node = node .valueOf ();
+
       const
-         oldAccessType = field .getAccessType (),
-         oldName       = field .getName (),
-         fields        = Array .from (node .getUserDefinedFields ());
+         oldName      = field .getName (),
+         fields       = Array .from (node .getUserDefinedFields ()),
+         inputRoutes  = Array .from (field .getInputRoutes ()),
+         outputRoutes = Array .from (field .getOutputRoutes ());
 
-      undoManager .beginUndo (_("Update Fields of Node %s"), node .getTypeName ());
+      undoManager .beginUndo (_("Rename Field"));
+
+      for (const route of inputRoutes)
+         route .getExecutionContext () .deleteRoute (route);
+
+      for (const route of outputRoutes)
+         route .getExecutionContext () .deleteRoute (route);
 
       for (const field of fields)
          node .removeUserDefinedField (field .getName ());
 
-      field .setAccessType (accessType);
       field .setName (name);
 
       for (const field of fields)
          node .addUserDefinedField (field .getAccessType (), field .getName (), field);
 
-      if (accessType !== oldAccessType)
+      if (field .isInput ())
       {
-         if (node instanceof X3D .X3DProtoDeclaration)
-         {
-            const
-               proto        = node,
-               updatedField = field;
+         for (const route of inputRoutes)
+            route .getExecutionContext () .addRoute (route .sourceNode, route .sourceField, route .destinationNode, name);
+      }
 
-            for (const object of proto .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
-            {
-               if (!(object instanceof X3D .SFNode))
-                  continue;
+      if (field .isOutput ())
+      {
+         for (const route of outputRoutes)
+            route .getExecutionContext () .addRoute (route .sourceNode, name, route .destinationNode, route .destinationField);
+      }
 
-               const node = object .getValue ();
+      undoManager .registerUndo (() =>
+      {
+         this .#renameField (executionContext, node, field, oldName, undoManager);
+      });
 
-               for (const field of node .getFields ())
-               {
-                  // Remove references.
+      this .requestUpdateInstances (node, undoManager);
 
-                  if (field .getReferences () .has (updatedField))
-                  {
-                     if (!updatedField .isReference (field .getAccessType ()))
-                        this .removeReference (proto, updatedField, node, field, undoManager);
-                  }
-               }
-            }
+      undoManager .endUndo ();
+   }
 
-            // Remove routes.
+   static #changeAccessType (executionContext, node, field, accessType, undoManager = UndoManager .shared)
+   {
+      node = node .valueOf ();
 
-            for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
-            {
-               if (!(object instanceof X3D .SFNode))
-                  continue;
+      const
+         oldAccessType = field .getAccessType (),
+         fields        = Array .from (node .getUserDefinedFields ());
 
-               const node = object .getValue ();
+      undoManager .beginUndo (_("Change AccessType"));
 
-               if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
-                  continue;
+      for (const field of fields)
+         node .removeUserDefinedField (field .getName ());
 
-               if (node .getProtoNode () !== proto)
-                  continue;
+      field .setAccessType (accessType);
 
-               const field = node .getField (oldName);
+      for (const field of fields)
+         node .addUserDefinedField (field .getAccessType (), field .getName (), field);
 
-               if (!updatedField .isInput ())
-               {
-                  for (const route of field .getInputRoutes ())
-                  {
-                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                  }
-               }
+      if (node instanceof X3D .X3DProtoDeclaration)
+      {
+         const
+            proto        = node,
+            updatedField = field;
 
-               if (!updatedField .isOutput ())
+         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.
+
+               if (field .getReferences () .has (updatedField))
                {
-                  for (const route of field .getOutputRoutes ())
-                  {
-                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                  }
+                  if (!updatedField .isReference (field .getAccessType ()))
+                     this .removeReference (proto, updatedField, node, field, undoManager);
                }
             }
-
-            this .updateInstances (proto, undoManager);
          }
-         else
+
+         // Remove routes.
+
+         for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
          {
-            // Remove References.
+            if (!(object instanceof X3D .SFNode))
+               continue;
 
-            for (const reference of field .getReferences ())
-            {
-               if (!reference .isReference (field .getAccessType ()))
-                  this .removeReference (proto, reference, node, field, undoManager);
-            }
+            const node = object .getValue ();
 
-            // Remove routes.
+            if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+               continue;
+
+            if (node .getProtoNode () !== proto)
+               continue;
+
+            const field = node .getField (oldName);
 
-            if (!field .isInput ())
+            if (!updatedField .isInput ())
             {
                for (const route of field .getInputRoutes ())
                {
@@ -2085,7 +2113,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                }
             }
 
-            if (!field .isOutput ())
+            if (!updatedField .isOutput ())
             {
                for (const route of field .getOutputRoutes ())
                {
@@ -2093,11 +2121,46 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                }
             }
          }
+
+         this .updateInstances (proto, undoManager);
+      }
+      else
+      {
+         const
+            references   = Array .from (field .getReferences ()),
+            inputRoutes  = Array .from (field .getInputRoutes ()),
+            outputRoutes = Array .from (field .getOutputRoutes ());
+
+         // Remove References.
+
+         for (const reference of references)
+         {
+            if (!reference .isReference (field .getAccessType ()))
+               this .removeReference (proto, reference, node, field, undoManager);
+         }
+
+         // Remove routes.
+
+         if (!field .isInput ())
+         {
+            for (const route of inputRoutes)
+            {
+               this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
+            }
+         }
+
+         if (!field .isOutput ())
+         {
+            for (const route of outputRoutes)
+            {
+               this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
+            }
+         }
       }
 
       undoManager .registerUndo (() =>
       {
-         this .updateUserDefinedField (executionContext, node, field, oldAccessType, oldName, undoManager);
+         this .#changeAccessType (executionContext, node, field, oldAccessType, undoManager);
       });
 
       this .requestUpdateInstances (node, undoManager);

package/src/assets/themes/default.css

@@ -93,7 +93,7 @@ input[type=checkbox] {
   color: var(--system-yellow);
 }
 
-.modal {
+ .read-only :is(x3d-canvas, .toolbar, .dialog, .outline-editor) {
   pointer-events: none;
 }
 
@@ -150,6 +150,7 @@ tbody th th {
 thead tr,
 tfoot tr {
   background: var(--tint-color2);
+  backdrop-filter: var(--tool-backdrop-filter);
 }
 
 tbody tr:nth-child(odd) {
@@ -786,6 +787,14 @@ body.dark .dialog ::placeholder {
   color: var(--system-gray2);
 }
 
+.scene-properties td.meta-value {
+  display: flex;
+}
+
+.scene-properties .open-link {
+  padding-left: 4px;
+}
+
 /* Library */
 
 .ui-widget .library-input {
@@ -1023,7 +1032,7 @@ body.dark .ui-widget .library-list .component {
   overflow: hidden;
   position: absolute;
   box-sizing: border-box;
-  left: 0;
+  left: 0px;
   right: var(--toolbar-width);
   height: 100%;
 }
@@ -1032,7 +1041,7 @@ body.dark .ui-widget .library-list .component {
   position: absolute;
   box-sizing: border-box;
   overflow-y: scroll;
-  top: 0;
+  top: 0px;
   border-right: 1px solid var(--border-color);
   border-bottom: 1px solid var(--border-color);
   padding: 5px;
@@ -1046,13 +1055,27 @@ body.dark .ui-widget .library-list .component {
 }
 
 .console-output p {
+  box-sizing: border-box;
+  position: relative;
+  z-index: 0;
   margin: 0;
+  padding: 1px 2px;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  font-family: monospace;
+  font-size: 8pt;
 }
 
-.console-output p.splitter {
-  margin-top: 5px;
-  border-top: 1px solid var(--system-gray3);
-  margin-bottom: 5px;
+.console-output p:where(.warn, .error):before {
+  content: "";
+  box-sizing: border-box;
+  position: absolute;
+  display: block;
+  z-index: -1;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
 }
 
 .console-output p.debug {
@@ -1075,40 +1098,49 @@ body.dark .ui-widget .library-list .component {
   color: var(--system-red);
 }
 
-.console-output p.filled {
-  position: relative;
-  z-index: 0;
-  margin-top: 5px;
-  margin-bottom: 5px;
+.console-output p.warn {
+  border-top: 1px solid var(--system-yellow);
+  border-bottom: 1px solid var(--system-yellow);
   color: black;
 }
 
-.console-output p.filled:before {
-  content: "";
-  position: absolute;
-  display: block;
-  z-index: -1;
-  width: 100%;
-  height: 100%;
-  filter: brightness(2) opacity(60%);
+.console-output p.warn:before {
+  background-color: color-mix(in srgb, color-mix(in srgb, var(--system-yellow), white 50%), transparent 30%);
 }
 
-.console-output p.warn.filled {
-  border-top: 1px solid var(--system-yellow);
-  border-bottom: 1px solid var(--system-yellow);
+.console-output p.error {
+  border-top: 1px solid var(--system-red);
+  border-bottom: 1px solid var(--system-red);
+  color: black;
 }
 
-.console-output p.warn.filled:before {
-  background-color: var(--system-yellow);
+.console-output p.error:before {
+  background-color: color-mix(in srgb, color-mix(in srgb, var(--system-red), white 50%), transparent 30%);
 }
 
-.console-output p.error.filled {
-  border-top: 1px solid var(--system-red);
-  border-bottom: 1px solid var(--system-red);
+.console-output p.warn:has(+ p.warn),
+.console-output p.error:has(+ p.error) {
+  border-bottom: none;
+}
+
+.console-output p.warn + p.warn,
+.console-output p.error + p.error {
+  border-top: none;
+}
+
+.console-output p.warn:not(:has(+ p.warn)),
+.console-output p.error:not(:has(+ p.error)) {
+  margin-bottom: 2px;
 }
 
-.console-output p.error.filled:before {
-  background-color: var(--system-red);
+.console-output p.splitter {
+  margin: 5px 0px;
+  border-top: 1px solid var(--system-gray3);
+  padding: 0px;
+}
+
+.console-output p.splitter:first-child {
+  display: none;
 }
 
 .console-input {