sunrize 1.11.18 → 2.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.11.18",
+  "version": "2.0.0",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -110,7 +110,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.2",
-    "x_ite": "^12.2.6",
+    "x_ite": "^14.0.0",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Controls/ExportNodePopover.js

@@ -9,7 +9,7 @@ const
 require ("./Popover");
 require ("../Bits/Validate");
 
-$.fn.exportNodePopover = function (node, oldExportedName)
+$.fn.exportNodePopover = function (node, oldExportedName, oldDescription = "")
 {
    // Create content.
 
@@ -18,7 +18,7 @@ $.fn.exportNodePopover = function (node, oldExportedName)
    const content = $("<div></div>");
 
    $("<span></span>")
-      .text (_("Name"))
+      .text ("Exported Name")
       .appendTo (content);
 
    const nameInput = $("<input></input>")
@@ -26,19 +26,35 @@ $.fn.exportNodePopover = function (node, oldExportedName)
       .val (oldExportedName || scene .getUniqueExportName (node .getName ()))
       .appendTo (content);
 
+   $("<span></span>")
+      .text ("Description")
+      .appendTo (content);
+
+   const descriptionInput = $("<input></input>")
+      .attr ("placeholder", _("Enter description"))
+      .val (oldDescription)
+      .appendTo (content);
+
    // Create tooltip.
 
    const tooltip = this .popover ({
       content: content,
+      extension:
+      {
+         wide: true,
+      },
       events: {
          show: (event, api) =>
          {
-            nameInput .off () .validate (Editor .Id, () =>
+            $(nameInput) .add (descriptionInput) .off ();
+
+            nameInput .validate (Editor .Id, () =>
             {
                electron .shell .beep ();
                nameInput .highlight ();
-            })
-            .on ("keydown.exportNodePopover", event =>
+            });
+
+            $(nameInput) .add (descriptionInput) .on ("keydown.exportNodePopover", event =>
             {
                if (event .key !== "Enter")
                   return;
@@ -50,12 +66,13 @@ $.fn.exportNodePopover = function (node, oldExportedName)
                if (!nameInput .val ())
                   return;
 
-               if (oldExportedName && oldExportedName === nameInput .val ())
-                  return;
-
-               const exportedName = scene .getUniqueExportName (nameInput .val ());
+               const
+                  exportedName = nameInput .val () !== oldExportedName
+                     ? scene .getUniqueExportName (nameInput .val ())
+                     : oldExportedName,
+                  description  = descriptionInput .val ();
 
-               Editor .updateExportedNode (scene, exportedName, oldExportedName, node);
+               Editor .updateExportedNode (scene, exportedName, oldExportedName, node, description);
             });
 
             setTimeout (() => nameInput .trigger ("select"), 1);

package/src/Controls/ImportNodePopover.js

@@ -9,7 +9,7 @@ const
 require ("./Popover");
 require ("../Bits/Validate");
 
-$.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
+$.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName, oldDescription = "")
 {
    // Create content.
 
@@ -18,7 +18,7 @@ $.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
    const content = $("<div></div>");
 
    $("<span></span>")
-      .text (_("Name"))
+      .text ("Imported Name")
       .appendTo (content);
 
    const nameInput = $("<input></input>")
@@ -26,19 +26,35 @@ $.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
       .val (oldImportedName || executionContext .getUniqueImportName (exportedName))
       .appendTo (content);
 
+   $("<span></span>")
+      .text ("Description")
+      .appendTo (content);
+
+   const descriptionInput = $("<input></input>")
+      .attr ("placeholder", _("Enter description"))
+      .val (oldDescription)
+      .appendTo (content);
+
    // Create tooltip.
 
    const tooltip = this .popover ({
       content: content,
+      extension:
+      {
+         wide: true,
+      },
       events: {
          show: (event, api) =>
          {
+            $(nameInput) .add (descriptionInput) .off ();
+
             nameInput .off () .validate (Editor .Id, () =>
             {
                electron .shell .beep ();
                nameInput .highlight ();
-            })
-            .on ("keydown.importNodePopover", event =>
+            });
+
+            $(nameInput) .add (descriptionInput) .on ("keydown.importNodePopover", event =>
             {
                if (event .key !== "Enter")
                   return;
@@ -50,12 +66,13 @@ $.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
                if (!nameInput .val ())
                   return;
 
-               if (oldImportedName && oldImportedName === nameInput .val ())
-                  return;
-
-               const importedName = executionContext .getUniqueImportName (nameInput .val ());
+               const
+                  importedName = nameInput .val () !== oldImportedName
+                     ? executionContext .getUniqueImportName (nameInput .val ())
+                     : oldImportedName,
+                  description  = descriptionInput .val ();
 
-               Editor .updateImportedNode (executionContext, inlineNode, exportedName, importedName, oldImportedName);
+               Editor .updateImportedNode (executionContext, inlineNode, exportedName, importedName, oldImportedName, description);
             });
 
             setTimeout (() => nameInput .trigger ("select"), 1);

package/src/Controls/MaterialPreviewPopover.js

@@ -18,10 +18,10 @@ $.fn.materialPreviewPopover = async function (node)
 
    const canvas = $("<x3d-canvas></x3d-canvas>")
       .css ({ width: "30vh", height: "30vh" })
-      .attr ("cache", false)
-      .attr ("splashScreen", false)
-      .attr ("contextMenu", false)
-      .attr ("notifications", false)
+      .attr ("cache", "false")
+      .attr ("splashScreen", "false")
+      .attr ("contextMenu", "false")
+      .attr ("notifications", "false")
       .attr ("colorSpace", node .getBrowser () .getBrowserOption ("ColorSpace"))
       .attr ("xrSessionMode", "NONE")
       .appendTo (preview);

package/src/Controls/TexturePreviewPopover.js

@@ -42,10 +42,10 @@ $.fn.texturePreviewPopover = async function (node)
    const canvas = $("<x3d-canvas></x3d-canvas>")
       .css ("width","30vh")
       .css ("height", "30vh")
-      .attr ("cache", false)
-      .attr ("splashScreen", false)
-      .attr ("contextMenu", false)
-      .attr ("notifications", false)
+      .attr ("cache", "false")
+      .attr ("splashScreen", "false")
+      .attr ("contextMenu", "false")
+      .attr ("notifications", "false")
       .attr ("colorSpace", node .getBrowser () .getBrowserOption ("ColorSpace"))
       .attr ("xrSessionMode", "NONE")
       .appendTo (preview);

package/src/Editors/OutlineEditor.js

@@ -849,7 +849,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          element      = $(`#${id}`),
          exportedNode = this .objects .get (parseInt (element .attr ("exported-node-id")));
 
-      element .find ("> .item") .exportNodePopover (exportedNode .getLocalNode (), exportedNode .getExportedName ());
+      element .find ("> .item") .exportNodePopover (exportedNode .getLocalNode (), exportedNode .getExportedName (), exportedNode .getDescription ());
    }
 
    removeExportedNode (id)
@@ -870,7 +870,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          exportedNode = this .objects .get (parseInt (element .attr ("exported-node-id"))),
          inlineNode   = this .getNode (element .closest (".node", this .sceneGraph));
 
-      element .find ("> .item") .importNodePopover (inlineNode, exportedNode .getExportedName ());
+      element .find ("> .item") .importNodePopover (inlineNode, exportedNode .getExportedName (), "", exportedNode .getDescription ());
    }
 
    editImportedNode (id)
@@ -881,7 +881,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          element      = $(`#${id}`),
          importedNode = this .objects .get (parseInt (element .attr ("imported-node-id")));
 
-      element .find ("> .item") .importNodePopover (importedNode .getInlineNode (), importedNode .getExportedName (), importedNode .getImportedName ());
+      element .find ("> .item") .importNodePopover (importedNode .getInlineNode (), importedNode .getExportedName (), importedNode .getImportedName (), importedNode .getDescription ());
    }
 
    removeImportedNode (id)

package/src/Editors/OutlineView.js

@@ -1438,7 +1438,8 @@ module .exports = class OutlineView extends Interface
          .addClass (classes)
          .attr ("node-id", node .getId ())
          .attr ("imported-node-id", importedNode .getId ())
-         .attr ("index", index);
+         .attr ("index", index)
+         .attr ("title", importedNode .getDescription ());
 
       // Icon
 
@@ -1529,7 +1530,8 @@ module .exports = class OutlineView extends Interface
       const child = $("<li></li>")
          .addClass (type)
          .attr ("exported-node-id", exportedNode .getId ())
-         .attr ("node-id", node .getId ());
+         .attr ("node-id", node .getId ())
+         .attr ("title", exportedNode .getDescription ());
 
       // Icon
 
@@ -1577,7 +1579,7 @@ module .exports = class OutlineView extends Interface
    }
 
    static connectorId = 0;
-   static urlFields   = new Set (["url", "frontUrl", "backUrl", "leftUrl", "rightUrl", "topUrl", "bottomUrl", "family"]);
+   static urlFields   = new Set (["url", "frontUrl", "backUrl", "leftUrl", "rightUrl", "topUrl", "bottomUrl"]);
 
    #fieldSymbol       = Symbol ();
    #fieldButtonSymbol = Symbol ();

package/src/Parser/AudioParser.js

@@ -45,7 +45,7 @@ class AudioParser extends X3D .X3DParser
 
       scene .setEncoding ("AUDIO");
       scene .setProfile (browser .getProfile ("Interchange"));
-      scene .addComponent (browser .getComponent ("Sound", 1));
+      scene .updateComponent (browser .getComponent ("Sound", 1));
 
       await this .loadComponents ();
 

package/src/Parser/ImageParser.js

@@ -45,7 +45,7 @@ class ImageParser extends X3D .X3DParser
 
       scene .setEncoding ("IMAGE");
       scene .setProfile (browser .getProfile ("Interchange"));
-      scene .addComponent (browser .getComponent ("Geometry2D", 1));
+      scene .updateComponent (browser .getComponent ("Geometry2D", 1));
 
       await this .loadComponents ();
 

package/src/Parser/VideoParser.js

@@ -45,8 +45,8 @@ class VideoParser extends X3D .X3DParser
 
       scene .setEncoding ("VIDEO");
       scene .setProfile (browser .getProfile ("Interchange"));
-      scene .addComponent (browser .getComponent ("Geometry2D", 1));
-      scene .addComponent (browser .getComponent ("Sound", 1));
+      scene .updateComponent (browser .getComponent ("Geometry2D", 1));
+      scene .updateComponent (browser .getComponent ("Sound", 1));
 
       await this .loadComponents ();
 

package/src/Undo/Editor.js

@@ -196,7 +196,7 @@ module .exports = class Editor
       scene .setProfile (browser .getProfile ("Core"));
 
       for (const name of componentNames)
-         scene .addComponent (browser .getComponent (name));
+         scene .updateComponent (browser .getComponent (name));
 
       // Add nodes.
 
@@ -378,7 +378,7 @@ module .exports = class Editor
       {
          for (const exportedNode of tempScene .exportedNodes)
          {
-            this .updateExportedNode (executionContext, executionContext .getUniqueExportName (exportedNode .getExportedName ()), "", exportedNode .getLocalNode (), undoManager);
+            this .updateExportedNode (executionContext, executionContext .getUniqueExportName (exportedNode .getExportedName ()), "", exportedNode .getLocalNode (), exportedNode .getDescription (), undoManager);
          }
       }
 
@@ -538,7 +538,6 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    }
 
    static absoluteURL = new RegExp ("^(?:[a-z]+:|//)", "i");
-   static fontFamilies = new Set (["SERIF", "SANS", "TYPEWRITER"]);
 
    /**
     *
@@ -555,23 +554,17 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       for (const object of Traverse .traverse (objects, Traverse .EXTERNPROTO_DECLARATIONS | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
       {
          const
-            node          = object instanceof X3D .SFNode ? object .getValue () : object,
-            urlObject     = node .getType () .includes (X3D .X3DConstants .X3DUrlObject),
-            fontStyleNode = node .getType () .includes (X3D .X3DConstants .X3DFontStyleNode);
+            node      = object instanceof X3D .SFNode ? object .getValue () : object,
+            urlObject = node .getType () .includes (X3D .X3DConstants .X3DUrlObject);
 
-         if (!(urlObject || fontStyleNode))
+         if (!urlObject)
             continue;
 
          const newURL = new X3D .MFString ();
 
          for (const fileURL of node ._url)
          {
-            if (fontStyleNode && this .fontFamilies .has (fileURL))
-            {
-               newURL .push (fileURL);
-               continue;
-            }
-            else if (this .absoluteURL .test (fileURL))
+            if (this .absoluteURL .test (fileURL))
             {
                try
                {
@@ -762,9 +755,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setComponents (scene, components, undoManager = UndoManager .shared)
    {
-      const
-         browser       = scene .getBrowser (),
-         oldComponents = Array .from (scene .getComponents ());
+      const oldComponents = Array .from (scene .getComponents ());
 
       undoManager .beginUndo (_("Set Components of Scene"));
 
@@ -800,7 +791,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Add Component %s"), name);
 
-      scene .addComponent (browser .getComponent (name));
+      scene .updateComponent (browser .getComponent (name));
 
       undoManager .registerUndo (() =>
       {
@@ -959,21 +950,30 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     * @param {string} importedName
     * @param {UndoManager} undoManager
     */
-   static updateImportedNode (executionContext, inlineNode, exportedName, importedName, oldImportedName, undoManager = UndoManager .shared)
+   static updateImportedNode (executionContext, inlineNode, exportedName, importedName, oldImportedName, description, undoManager = UndoManager .shared)
    {
       inlineNode = inlineNode .valueOf ();
 
+      const oldDescription = executionContext .getImportedNodes () .get (oldImportedName) ?.getDescription ();
+
       undoManager .beginUndo (_("Update Imported Node »%s«"), importedName);
 
       if (oldImportedName)
-         executionContext .renameImportedNode (oldImportedName, importedName);
+      {
+         if (importedName !== oldImportedName)
+            executionContext .renameImportedNode (oldImportedName, importedName);
+
+         executionContext .getImportedNodes () .get (importedName) .setDescription (description);
+      }
       else
-         executionContext .updateImportedNode (inlineNode .valueOf (), exportedName, importedName);
+      {
+         executionContext .updateImportedNode (inlineNode .valueOf (), exportedName, importedName, description);
+      }
 
       undoManager .registerUndo (() =>
       {
          if (oldImportedName)
-            this .updateImportedNode (executionContext, inlineNode, exportedName, oldImportedName, importedName, undoManager);
+            this .updateImportedNode (executionContext, inlineNode, exportedName, oldImportedName, importedName, oldDescription, undoManager);
          else
             this .removeImportedNode (executionContext, importedName, undoManager);
       });
@@ -995,6 +995,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          importedNode = executionContext .getImportedNodes () .get (importedName),
          inlineNode   = importedNode .getInlineNode (),
          exportedName = importedNode .getExportedName (),
+         description  = importedNode .getDescription (),
          exportedNode = importedNode .getExportedNode ();
 
       const routes = executionContext .getRoutes () .filter (route =>
@@ -1059,7 +1060,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .registerUndo (() =>
       {
-         this .updateImportedNode (executionContext, inlineNode, exportedName, importedName, "", undoManager);
+         this .updateImportedNode (executionContext, inlineNode, exportedName, importedName, "", description, undoManager);
 
          const newImportedNode = executionContext .getImportedNodes () .get (importedName);
 
@@ -1087,21 +1088,30 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     * @param {X3DNode} node
     * @param {UndoManager} undoManager
     */
-   static updateExportedNode (scene, exportedName, oldExportedName, node, undoManager = UndoManager .shared)
+   static updateExportedNode (scene, exportedName, oldExportedName, node, description, undoManager = UndoManager .shared)
    {
       node = node .valueOf ();
 
       undoManager .beginUndo (_("Update Exported Node »%s«"), exportedName);
 
-      if (oldExportedName)
-         scene .removeExportedNode (oldExportedName);
+      const oldDescription = scene .getExportedNodes () .get (oldExportedName) ?.getDescription () ?? "";
 
-      scene .updateExportedNode (exportedName, node);
+      if (exportedName === oldExportedName)
+      {
+         scene .getExportedNodes () .get (exportedName) ?.setDescription (description);
+      }
+      else
+      {
+         if (oldExportedName)
+            scene .removeExportedNode (oldExportedName);
+
+         scene .updateExportedNode (exportedName, node, description);
+      }
 
       undoManager .registerUndo (() =>
       {
          if (oldExportedName)
-            this .updateExportedNode (scene, oldExportedName, exportedName, node, undoManager);
+            this .updateExportedNode (scene, oldExportedName, exportedName, node, oldDescription, undoManager);
          else
             this .removeExportedNode (scene, exportedName, undoManager);
       });
@@ -1121,7 +1131,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       const
          exportedNode = scene .getExportedNodes () .get (exportedName),
-         node         = exportedNode .getLocalNode ();
+         node         = exportedNode .getLocalNode (),
+         description  = exportedNode .getDescription ();
 
       undoManager .beginUndo (_("Remove Exported Node »%s«"), exportedName);
 
@@ -1129,7 +1140,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .registerUndo (() =>
       {
-         this .updateExportedNode (scene, exportedName, "", node, undoManager);
+         this .updateExportedNode (scene, exportedName, "", node, description, undoManager);
       });
 
       this .requestUpdateInstances (scene, undoManager);