sunrize 1.5.13 → 1.6.0

package/src/Undo/Editor.js

@@ -195,10 +195,8 @@ module .exports = class Editor
          externprotos   = new Map (Array .from (executionContext .externprotos, p => [p .getName (), p])),
          protos         = new Map (Array .from (executionContext .protos,       p => [p .getName (), p])),
          rootNodes      = executionContext .rootNodes .copy (),
-         tempScene      = browser .createScene (browser .getProfile ("Core")),
-         loadUrlObjects = browser .getBrowserOption ("LoadUrlObjects");
+         tempScene      = browser .createScene (browser .getProfile ("Core"));
 
-      browser .setBrowserOption ("LoadUrlObjects", false);
       scene .setProfile (browser .getProfile ("Full"));
       scene .updateComponent (browser .getComponent ("X_ITE"));
 
@@ -314,8 +312,6 @@ module .exports = class Editor
             this .rewriteURLs (executionContext, objects, oldWorldURL [0], executionContext .worldURL, new UndoManager ());
       }
 
-      browser .setBrowserOption ("LoadUrlObjects", loadUrlObjects);
-
       // Add exported nodes.
 
       if (executionContext instanceof X3D .X3DScene)
@@ -645,6 +641,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static #setLive (node, value, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const oldValue = node .isLive ();
 
       undoManager .beginUndo (_("Set live state to »%s«"), value);
@@ -880,25 +878,25 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setMetaData (scene, entries, undoManager = UndoManager .shared)
    {
-      const oldEntries = [ ]
+      const oldEntries = [ ];
 
       for (const [key, values] of scene .getMetaDatas ())
       {
          for (const value of values)
-            oldEntries .push (key, value)
+            oldEntries .push ([key, value]);
       }
 
-      undoManager .beginUndo (_("Change Meta Data"))
+      undoManager .beginUndo (_("Change Meta Data"));
 
-      for (const key of [... scene .getMetaDatas () .keys ()])
-         scene .removeMetaData (key)
+      for (const key of Array .from (scene .getMetaDatas () .keys ()))
+         scene .removeMetaData (key);
 
       for (const [key, value] of entries)
-         scene .addMetaData (key, value)
+         scene .addMetaData (key, value);
 
       undoManager .registerUndo (() =>
       {
-         this .setMetaData (scene, oldEntries, undoManager)
+         this .setMetaData (scene, oldEntries, undoManager);
       });
 
       undoManager .endUndo ();
@@ -913,13 +911,15 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static updateNamedNode (executionContext, name, node, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const
          oldNode = $.try (() => executionContext .getNamedNode (name)),
          oldName = node .getName ();
 
       undoManager .beginUndo (_("Rename Node to »%s«"), name);
 
-      executionContext .updateNamedNode (name, node .valueOf ());
+      executionContext .updateNamedNode (name, node);
 
       undoManager .registerUndo (() =>
       {
@@ -945,6 +945,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static removeNamedNode (executionContext, node, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const oldName = node .getName ();
 
       undoManager .beginUndo (_("Remove Node Name »%s«"), oldName);
@@ -972,6 +974,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static updateImportedNode (executionContext, inlineNode, exportedName, importedName, oldImportedName, undoManager = UndoManager .shared)
    {
+      inlineNode = inlineNode .valueOf ();
+
       undoManager .beginUndo (_("Update Imported Node »%s«"), importedName);
 
       executionContext .updateImportedNode (inlineNode .valueOf (), exportedName, importedName);
@@ -1080,12 +1084,14 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static updateExportedNode (scene, exportedName, oldExportedName, node, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       undoManager .beginUndo (_("Update Exported Node »%s«"), exportedName);
 
       if (oldExportedName)
          scene .removeExportedNode (oldExportedName);
 
-      scene .updateExportedNode (exportedName, node .valueOf ());
+      scene .updateExportedNode (exportedName, node);
 
       undoManager .registerUndo (() =>
       {
@@ -1516,6 +1522,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setProtoNode (executionContext, instance, protoNode, undoManager = UndoManager .shared)
    {
+      instance = instance .valueOf ();
+
       const oldProtoNode = instance .getProtoNode ();
 
       undoManager .beginUndo (_("Set Proto Node of Instance to %s"), protoNode .getName ());
@@ -1712,6 +1720,9 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static addRoute (executionContext, sourceNode, sourceField, destinationNode, destinationField, undoManager = UndoManager .shared)
    {
+      sourceNode      = sourceNode .valueOf ();
+      destinationNode = destinationNode .valueOf ();
+
       undoManager .beginUndo (_("Add Route From %s »%s« TO %s »%s«"), sourceNode .getTypeName (), sourceField, destinationNode .getTypeName (), destinationField);
 
       try
@@ -1771,6 +1782,9 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static deleteRoute (executionContext, sourceNode, sourceField, destinationNode, destinationField, undoManager = UndoManager .shared)
    {
+      sourceNode      = sourceNode .valueOf ();
+      destinationNode = destinationNode .valueOf ();
+
       undoManager .beginUndo (_("Delete Route From %s »%s« TO %s »%s«"), sourceNode .getTypeName (), sourceField, destinationNode .getTypeName (), destinationField);
 
       executionContext .deleteRoute (sourceNode .valueOf (), sourceField, destinationNode .valueOf (), destinationField);
@@ -1796,42 +1810,54 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
    /**
     *
-    * @param {X3DExecutionContext} executionContext
-    * @param {WorldInfo} worldInfo
-    * @param {UndoManger} undoManager
+    * @param {X3DBrowser} browser
+    * @param {UndoManager} undoManager
     */
-   static #addWorldInfo (executionContext, worldInfo, undoManager = UndoManager .shared)
+   static getConfigNode (browser, create = false, undoManager = UndoManager .shared)
    {
-      undoManager .beginUndo (_("Add World Info"));
+      return browser .getActiveLayer () === browser .getWorld () .getLayerSet () .getLayer0 ()
+         ? Editor .getWorldInfo (browser .currentScene, create, undoManager)
+         : browser .getActiveLayer ();
+   }
 
-      executionContext .addWorldInfo (worldInfo);
+   /**
+    *
+    * @param {X3DExecutionContext} executionContext
+    * @param {UndoManager} undoManager
+    */
+   static getWorldInfo (executionContext, create = false, undoManager = UndoManager .shared)
+   {
+      if (executionContext .getWorldInfos () .length)
+         return executionContext .getWorldInfos () .at (-1) .getValue ();
 
-      undoManager .registerUndo (() =>
-      {
-         this .#removeWorldInfo (executionContext, worldInfo, undoManager);
-      });
+      if (create)
+         return this .addWorldInfo (executionContext, undoManager);
 
-      undoManager .endUndo ();
+      return null;
    }
 
    /**
     *
     * @param {X3DExecutionContext} executionContext
-    * @param {WorldInfo} worldInfo
-    * @param {UndoManger} undoManager
+    * @param {UndoManager} undoManager
+    * @returns {WorldInfo}
     */
-    static #removeWorldInfo (executionContext, worldInfo, undoManager = UndoManager .shared)
+   static addWorldInfo (executionContext, undoManager = UndoManager .shared)
    {
-      undoManager .beginUndo (_("Remove World Info"));
+      const
+         worldInfoNode = executionContext .createNode ("WorldInfo"),
+         fileURL       = new URL (executionContext .getWorldURL ());
 
-      executionContext .removeWorldInfo (worldInfo);
+      if (fileURL .protocol === "file:")
+         worldInfoNode .title = path .parse (url .fileURLToPath (fileURL)) .name;
 
-      undoManager .registerUndo (() =>
-      {
-         this .#addWorldInfo (executionContext, worldInfo, undoManager);
-      });
+      undoManager .beginUndo (_("Add WorldInfo Node"));
+
+      this .insertValueIntoArray (executionContext, executionContext, executionContext .rootNodes, 0, worldInfoNode, undoManager);
 
       undoManager .endUndo ();
+
+      return worldInfoNode .getValue ();
    }
 
    /**
@@ -1840,12 +1866,11 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     * @param {WorldInfo} worldInfo
     * @param {UndoManager} undoManager
     */
-   static removeWorldInfo (executionContext, worldInfo, undoManager = UndoManager .shared)
+   static removeWorldInfo (executionContext, worldInfoNode, undoManager = UndoManager .shared)
    {
-      undoManager .beginUndo (_("Remove World Info"));
+      undoManager .beginUndo (_("Remove WorldInfo Node"));
 
-      this .removeNode (executionContext, worldInfo, undoManager);
-      this .#removeWorldInfo (executionContext, worldInfo, undoManager);
+      this .removeNode (executionContext, worldInfoNode, undoManager);
 
       undoManager .endUndo ();
    }
@@ -1858,6 +1883,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static removeNode (executionContext, remove, undoManager = UndoManager .shared)
    {
+      remove = remove .valueOf ();
+
       undoManager .beginUndo (_("Remove Node"));
 
       Traverse .traverse (executionContext, Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, (node) =>
@@ -1866,7 +1893,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          {
             for (let i = node .rootNodes .length - 1; i >= 0; -- i)
             {
-               if (node .rootNodes [i] ?.getValue () .valueOf () === remove .valueOf ())
+               if (node .rootNodes [i] ?.getValue () .valueOf () === remove)
                   this .removeValueFromArray (node, node, node .rootNodes, i, undoManager);
             }
          }
@@ -1878,7 +1905,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                {
                   case X3D .X3DConstants .SFNode:
                   {
-                     if (field .getValue () .valueOf () === remove .valueOf ())
+                     if (field .getValue () ?.valueOf () === remove)
                         this .setFieldValue (node .getExecutionContext (), node, field, null, undoManager);
 
                      break;
@@ -1887,7 +1914,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                   {
                      for (let i = field .length - 1; i >= 0; -- i)
                      {
-                        if (field [i] ?.getValue () .valueOf () === remove .valueOf ())
+                        if (field [i] ?.getValue () .valueOf () === remove)
                            this .removeValueFromArray (node .getExecutionContext (), node, field, i, undoManager);
                      }
 
@@ -1909,6 +1936,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static addUserDefinedField (executionContext, node, field, index, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const fields = Array .from (node .getUserDefinedFields ());
 
       index = Math .min (index < 0 ? fields .length : index, fields .length);
@@ -1930,6 +1959,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static updateUserDefinedField (executionContext, node, field, accessType, name, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const
          oldAccessType = field .getAccessType (),
          oldName       = field .getName (),
@@ -2044,6 +2075,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static removeUserDefinedField (executionContext, node, field, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const fields = [... node .getUserDefinedFields ()] .filter (f => f !== field);
 
       undoManager .beginUndo (_("Remove Field »%s«"), field .getName ());
@@ -2061,6 +2094,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setUserDefinedFields (executionContext, node, fields, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       const
          oldFields     = Array .from (node .getUserDefinedFields ()),
          removedFields = oldFields .filter (f => !fields .includes (f));
@@ -2193,6 +2228,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static addReference (proto, protoField, node, field, undoManager = UndoManager .shared)
    {
+      node  = node .valueOf ();
       field = typeof field === "string" ? node .getField (field) : field
 
       const
@@ -2222,6 +2258,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static removeReference (proto, protoField, node, field, undoManager = UndoManager .shared)
    {
+      node  = node .valueOf ();
       field = typeof field === "string" ? node .getField (field) : field
 
       const
@@ -2251,6 +2288,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setMatrixWithCenter (node, matrix, center = node ._center .getValue (), undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       undoManager .beginUndo (_("Set Transformation Matrix of %s"), node .getTypeName ());
 
       const
@@ -2319,6 +2358,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
    static moveViewpoint (viewpointNode, position, orientation, centerOfRotation, fieldOfView, undoManager = UndoManager .shared)
    {
+      viewpointNode = viewpointNode .valueOf ();
+
       UndoManager .shared .beginUndo (_("Move Viewpoint to Camera"));
 
       const
@@ -2629,6 +2670,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static getModelMatrices (executionContext, layerNode, node, addSelf = false)
    {
+      node = node .valueOf ();
+
       const
          hierarchies   = Traverse .find (executionContext, node, Traverse .ROOT_NODES),
          modelMatrices = [ ];
@@ -2651,7 +2694,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             if (!object .getType () .includes (X3D .X3DConstants .X3DTransformMatrix3DNode))
                continue;
 
-            if (object .valueOf () === node .valueOf () && !addSelf)
+            if (object .valueOf () === node && !addSelf)
                continue;
 
             modelMatrix .multRight (object .getMatrix ());
@@ -2663,6 +2706,72 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       return modelMatrices;
    }
 
+   /**
+    *
+    * @param {X3DExecutionContext} executionContext
+    * @param {X3DNode} node
+    * @param {string} path
+    * @param {X3DField} value
+    * @param {UndoManager} undoManager
+    */
+   static setNodeMetaData (node, path, value, undoManager = UndoManager .shared)
+   {
+      node = node .valueOf ();
+
+      const
+         hasValue = node .hasMetaData (path),
+         oldValue = node .getMetaData (path, value .create ());
+
+      undoManager .beginUndo (_("Change Metadata of Node %s"), node .getTypeName ());
+
+      node .setMetaData (path, value);
+
+      undoManager .registerUndo (() =>
+      {
+         if (hasValue)
+            this .setNodeMetaData (node, path, oldValue, undoManager);
+         else
+            this .removeNodeMetaData (node, path, oldValue, undoManager);
+      });
+
+      this .requestUpdateInstances (node, undoManager);
+
+      undoManager .endUndo ();
+   }
+
+   /**
+    *
+    * @param {X3DExecutionContext} executionContext
+    * @param {X3DNode} node
+    * @param {string} path
+    * @param {X3DField} type
+    * @param {UndoManager} undoManager
+    */
+   static removeNodeMetaData (node, path, type, undoManager = UndoManager .shared)
+   {
+      node = node .valueOf ();
+
+      const hasValue = node .hasMetaData (path);
+
+      if (!hasValue)
+         return;
+
+      const oldValue = node .getMetaData (path, type .create ());
+
+      undoManager .beginUndo (_("Change Metadata of Node %s"), node .getTypeName ());
+
+      node .removeMetaData (path);
+
+      undoManager .registerUndo (() =>
+      {
+         this .setNodeMetaData (node, path, oldValue, undoManager);
+      });
+
+      this .requestUpdateInstances (node, undoManager);
+
+      undoManager .endUndo ();
+   }
+
    /**
     *
     * @param {X3DExecutionContext} executionContext
@@ -2673,7 +2782,9 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setFieldFromString (executionContext, node, field, string, undoManager = UndoManager .shared)
    {
-		const
+      node = node .valueOf ();
+
+      const
          instance  = node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance),
          name      = field .getName (),
          auxillary = field .create ();
@@ -2681,7 +2792,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       auxillary .setUnit (field .getUnit ());
       auxillary .fromString (string, executionContext);
 
-		if (auxillary .equals (field))
+      if (auxillary .equals (field))
       {
          field .addEvent ();
          return;
@@ -2719,6 +2830,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setFieldValue (executionContext, node, field, value, undoManager = UndoManager .shared)
    {
+      node  = node .valueOf ();
       field = typeof field === "string" ? node .getField (field) : field;
 
       const
@@ -2728,7 +2840,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       auxillary .setValue (value);
 
-		if (auxillary .equals (field))
+      if (auxillary .equals (field))
       {
          field .addEvent ();
          return;
@@ -2777,6 +2889,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static insertValueIntoArray (executionContext, node, field, index, value, undoManager = UndoManager .shared)
    {
+      node  = node .valueOf ();
       field = typeof field === "string" ? node .getField (field) : field;
 
       const
@@ -2811,6 +2924,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static appendValueToArray (executionContext, node, field, value, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       undoManager .beginUndo (_("Append Value to %s »%s«"), node .getTypeName (), field .getName ());
 
       this .insertValueIntoArray (executionContext, node, field, field .length, value, undoManager);
@@ -2828,6 +2943,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static removeValueFromArray (executionContext, node, field, index, undoManager = UndoManager .shared)
    {
+      node  = node .valueOf ();
       field = typeof field === "string" ? node .getField (field) : field;
 
       const
@@ -2877,6 +2993,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
    static #removeEmptyGroupsFromArray (node, field, undoManager = UndoManager .shared)
    {
+      node = node .valueOf ();
+
       for (let index = field .length - 1; index >= 0; -- index)
       {
          const value = field [index];
@@ -2895,6 +3013,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       if (!node)
          return true;
 
+      node = node .valueOf ();
+
       return node .getFields () .every (field =>
       {
          switch (field .getType ())
@@ -2912,4 +3032,23 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          }
       });
    }
-}
+
+   /**
+    *
+    * @param {function} callback
+    * @param {UndoManager} undoManager
+    */
+   static deferFunction (callback, undoManager = UndoManager .shared)
+   {
+      undoManager .beginUndo (_("Defer Function"));
+
+      undoManager .defer (callback, callback);
+
+      undoManager .registerUndo (() =>
+      {
+         this .deferFunction (callback, undoManager);
+      });
+
+      undoManager .endUndo ();
+   }
+};