sunrize 1.11.0 → 1.11.2

package/src/Undo/Editor.js

@@ -238,9 +238,11 @@ module .exports = class Editor
          scene          = executionContext .getLocalScene (),
          profile        = scene .getProfile (),
          x_ite          = scene .hasComponent ("X_ITE"),
-         externprotos   = new Map (Array .from (executionContext .externprotos, p => [p .getName (), p])),
-         protos         = new Map (Array .from (executionContext .protos,       p => [p .getName (), p])),
+         externprotos   = executionContext .externprotos .copy (),
+         protos         = executionContext .protos .copy (),
          rootNodes      = executionContext .rootNodes .copy (),
+         namedNodes     = executionContext .namedNodes .copy (),
+         importedNodes  = executionContext .importedNodes .copy (),
          tempScene      = await browser .createScene (browser .getProfile ("Core"));
 
       scene .setProfile (browser .getProfile ("Full"));
@@ -257,6 +259,13 @@ module .exports = class Editor
       catch (error)
       {
          console .error (error);
+
+         executionContext .externprotos  .assign (externprotos);
+         executionContext .protos        .assign (protos);
+         executionContext .rootNodes     .splice (rootNodes .length);
+         executionContext .namedNodes    .assign (namedNodes);
+         executionContext .importedNodes .assign (importedNodes);
+
          return [ ];
       }
       finally
@@ -815,17 +824,11 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setMetaData (scene, entries, undoManager = UndoManager .shared)
    {
-      const oldEntries = [ ];
-
-      for (const [key, values] of scene .getMetaDatas ())
-      {
-         for (const value of values)
-            oldEntries .push ([key, value]);
-      }
+      const oldEntries = scene .getMetaDatas ();
 
       undoManager .beginUndo (_("Change Meta Data"));
 
-      for (const key of Array .from (scene .getMetaDatas () .keys ()))
+      for (const [key] of scene .getMetaDatas ())
          scene .removeMetaData (key);
 
       for (const [key, value] of entries)
@@ -915,38 +918,10 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Update Imported Node »%s«"), importedName);
 
-      executionContext .updateImportedNode (inlineNode .valueOf (), exportedName, importedName);
-
-      if (oldImportedName && oldImportedName !== importedName)
-      {
-         const
-            oldImportedNode = executionContext .getImportedNodes () .get (oldImportedName),
-            newImportedNode = executionContext .getImportedNodes () .get (importedName);
-
-         const routes = executionContext .getRoutes () .filter (route =>
-         {
-            if (route .sourceNode === oldImportedNode)
-               return true;
-
-            if (route .destinationNode === oldImportedNode)
-               return true;
-
-            return false;
-         });
-
-         executionContext .removeImportedNode (oldImportedName);
-
-         for (let { sourceNode, sourceField, destinationNode, destinationField } of routes)
-         {
-            if (sourceNode === oldImportedNode)
-               sourceNode = newImportedNode;
-
-            if (destinationNode === oldImportedNode)
-               destinationNode = newImportedNode;
-
-            executionContext .addRoute (sourceNode, sourceField, destinationNode, destinationField);
-         }
-      }
+      if (oldImportedName)
+         executionContext .renameImportedNode (oldImportedName, importedName);
+      else
+         executionContext .updateImportedNode (inlineNode .valueOf (), exportedName, importedName);
 
       undoManager .registerUndo (() =>
       {
@@ -972,7 +947,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       const
          importedNode = executionContext .getImportedNodes () .get (importedName),
          inlineNode   = importedNode .getInlineNode (),
-         exportedName = importedNode .getExportedName ();
+         exportedName = importedNode .getExportedName (),
+         exportedNode = importedNode .getExportedNode ();
 
       const routes = executionContext .getRoutes () .filter (route =>
       {
@@ -987,6 +963,51 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Remove Imported Node »%s«"), importedName);
 
+      // RootNodes:
+      {
+         const
+            node  = executionContext,
+            field = executionContext .rootNodes;
+
+         for (const index of Array .from (field .keys ()) .reverse ())
+         {
+            if (field [index] .getValue () === exportedNode)
+               this .removeValueFromArray (executionContext, node, field, index, undoManager);
+         }
+      }
+
+      for (const object of executionContext .traverse (Traverse .ROOT_NODES))
+      {
+         if (!(object instanceof X3D .SFNode))
+            continue;
+
+         const node = object .getValue ();
+
+         for (const field of node .getFields ())
+         {
+            switch (field .getType ())
+            {
+               case X3D .X3DConstants .SFNode:
+               {
+                  if (field .getValue () === exportedNode)
+                     this .setFieldValue (executionContext, node, field, null, undoManager);
+
+                  break;
+               }
+               case X3D .X3DConstants .MFNode:
+               {
+                  for (const index of Array .from (field .keys ()) .reverse ())
+                  {
+                     if (field [index] .getValue () === exportedNode)
+                        this .removeValueFromArray (executionContext, node, field, index, undoManager);
+                  }
+
+                  break;
+               }
+            }
+         }
+      }
+
       executionContext .removeImportedNode (importedName);
 
       undoManager .registerUndo (() =>
@@ -1159,30 +1180,30 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static setProtoDeclarations (executionContext, protos, undoManager = UndoManager .shared)
    {
-      const oldProtos = new Map (Array .from (executionContext .protos, p => [p .getName (), p]))
+      const oldProtos = new Map (Array .from (executionContext .protos, p => [p .getName (), p]));
 
-      undoManager .beginUndo (_("Update Proto Declarations"))
+      undoManager .beginUndo (_("Update Proto Declarations"));
 
       for (const name of oldProtos .keys ())
-         executionContext .removeProtoDeclaration (name)
+         executionContext .removeProtoDeclaration (name);
 
-      if (Array .isArray (protos))
+      if (Array .isArray (protos) || protos instanceof X3D .X3DInfoArray)
       {
          for (const proto of protos)
-            executionContext .updateProtoDeclaration (proto .getName (), proto)
+            executionContext .updateProtoDeclaration (proto .getName (), proto);
       }
       else
       {
          for (const [name, proto] of protos)
-            executionContext .updateProtoDeclaration (name, proto)
+            executionContext .updateProtoDeclaration (name, proto);
       }
 
       undoManager .registerUndo (() =>
       {
-         this .setProtoDeclarations (executionContext, oldProtos, undoManager)
+         this .setProtoDeclarations (executionContext, oldProtos, undoManager);
       });
 
-      this .requestUpdateInstances (executionContext, undoManager)
+      this .requestUpdateInstances (executionContext, undoManager);
 
       undoManager .endUndo ();
    }
@@ -1352,7 +1373,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       for (const name of oldExternProtos .keys ())
          executionContext .removeExternProtoDeclaration (name);
 
-      if (Array .isArray (externprotos))
+      if (Array .isArray (externprotos) || externprotos instanceof X3D .X3DInfoArray)
       {
          for (const externproto of externprotos)
             executionContext .updateExternProtoDeclaration (externproto .getName (), externproto);
@@ -1802,15 +1823,6 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .registerUndo (() =>
       {
-         if (sourceNode instanceof X3D .X3DImportedNode)
-            sourceNode = executionContext .importedNodes .get (sourceNode .getImportedName ());
-
-         if (destinationNode instanceof X3D .X3DImportedNode)
-            destinationNode = executionContext .importedNodes .get (destinationNode .getImportedName ());
-
-         if (!(sourceNode && destinationNode))
-            return; // Imported nodes were manually removed.
-
          this .addRoute (executionContext, sourceNode, sourceField, destinationNode, destinationField, undoManager);
       });
 
@@ -2889,6 +2901,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       const
          instance  = node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance),
          name      = field .getName (),
+         oldValue  = field .copy (),
          auxiliary = field .create ();
 
       auxiliary .setUnit (field .getUnit ());
@@ -2900,8 +2913,6 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          return;
       }
 
-      const oldValue = field .copy ()
-
       if (node .getDisplayName ())
          undoManager .beginUndo (_("Change Field »%s« of Node %s »%s«"), field .getName (), node .getTypeName (), node .getDisplayName ());
       else
@@ -2938,24 +2949,29 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       const
          instance  = node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance),
          name      = field .getName (),
-         auxiliary = field .create ();
+         oldValue  = field .copy ();
 
-      auxiliary .setValue (value);
+      if (!(value instanceof X3D .X3DField))
+      {
+         const auxiliary = field .create ();
 
-      if (auxiliary .equals (field))
+         auxiliary .setValue (value);
+
+         value = auxiliary;
+      }
+
+      if (value .equals (field))
       {
          field .addEvent ();
          return;
       }
 
-      const oldValue = field .copy ();
-
       if (node .getDisplayName ())
          undoManager .beginUndo (_("Change Field »%s« of Node %s »%s«"), field .getName (), node .getTypeName (), node .getDisplayName ());
       else
          undoManager .beginUndo (_("Change Field »%s« of Node %s"), field .getName (), node .getTypeName ());
 
-      field .assign (auxiliary);
+      field .assign (value);
 
       if (node .isDefaultValue (field))
          field .setModificationTime (0);
@@ -2963,7 +2979,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       switch (field .getType ())
       {
          case X3D .X3DConstants .SFNode:
-            this .removeNodesFromExecutionContextIfNecessary (executionContext, [oldValue], undoManager);
+            this .removeNodesFromExecutionContextIfNecessary (executionContext, new X3D .MFNode (oldValue), undoManager);
             break;
          case X3D .X3DConstants .MFNode:
             this .removeNodesFromExecutionContextIfNecessary (executionContext, oldValue, undoManager);
@@ -3043,7 +3059,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     * @param {number} index
     * @param {UndoManager} undoManager
     */
-   static removeValueFromArray (executionContext, node, field, index, undoManager = UndoManager .shared)
+   static removeValueFromArray (executionContext, node, field, index, undoManager = UndoManager .shared, xxx)
    {
       node  = node .valueOf ();
       field = typeof field === "string" ? node .getField (field) : field;
@@ -3453,8 +3469,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       const nodesToRemove = this .#nodesToRemove .get (executionContext);
 
-      for (const node of nodes .filter (node => node))
-         nodesToRemove .push (node .valueOf ());
+      for (const node of nodes .getValue () .filter (node => node))
+         nodesToRemove .push (node);
 
       if (undoManager .defer ("removeNodesFromExecutionContextIfNecessary"))
          return;
@@ -3484,6 +3500,9 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
             for (const node of children)
             {
+               if (executionContext .getLocalizedNode (node) instanceof X3D .X3DImportedNode)
+                  continue;
+
                // Rebind X3DBindableNode nodes.
 
                if (node .getType () .includes (X3D .X3DConstants .X3DBindableNode))
@@ -3499,7 +3518,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
                // Remove named nodes.
 
-               if (node .getName ())
+               if (node .getName () && node .getExecutionContext () === executionContext)
                   this .removeNamedNode (executionContext, node, undoManager);
 
                // Remove routes.

package/src/assets/X3DUOM.xml

@@ -2,7 +2,7 @@
 <!-- X3D Unified Object Model (X3DUOM) X3dUnifiedObjectModel-4.0.xml -->
 <!-- Online at https://www.web3d.org/specifications/X3dUnifiedObjectModel-4.0.xml -->
 <!-- This file contains a listing of all abstract and concrete nodes in version 4.0 of X3D -->
-<!-- Generated 2025-08-23-07:00 09:15:12.7342832-07:00 -->
+<!-- Generated 2025-10-07-07:00 11:59:45.8550027-07:00 -->
 <X3dUnifiedObjectModel xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
                        version="4.0"
                        xsd:noNamespaceSchemaLocation="X3dUnifiedObjectModel.xsd">
@@ -30823,6 +30823,12 @@
                    description="When time now &gt;= pauseTime, isPaused becomes true and AudioClip becomes paused.">
                <componentInfo name="Time" level="2"/>
             </field>
+            <field name="periodicWave"
+                   type="SFNode"
+                   accessType="inputOutput"
+                   default="NULL"
+                   acceptableNodeTypes="PeriodicWave"
+                   description="The periodicWave field is an optional PeriodicWave node providing a regular or arbitrary periodic waveform."/>
             <field name="resumeTime"
                    type="SFTime"
                    accessType="inputOutput"
@@ -38941,7 +38947,7 @@
          <InterfaceDefinition specificationUrl="https://www.web3d.org/specifications/X3Dv4/ISO-IEC19775-1v4-IS/Part01/components/texturing.html#TextureTransform"
                               appinfo="TextureTransform shifts 2D texture coordinates for positioning, orienting and scaling image textures on geometry.">
             <componentInfo name="Texturing" level="1"/>
-            <Inheritance baseType="X3DTextureTransformNode"/>
+            <Inheritance baseType="X3DSingleTextureTransformNode"/>
             <field name="center"
                    type="SFVec2f"
                    accessType="inputOutput"
@@ -38956,6 +38962,7 @@
             <field name="mapping"
                    type="SFString"
                    accessType="inputOutput"
+                   inheritedFrom="X3DSingleTextureTransformNode"
                    baseType="xs:NMTOKEN"
                    description="The mapping label identifies which texture coordinates and transformations are used to compute texture effects from corresponding geometry on a given material."/>
             <field name="metadata"
@@ -39019,7 +39026,7 @@
          <InterfaceDefinition specificationUrl="https://www.web3d.org/specifications/X3Dv4/ISO-IEC19775-1v4-IS/Part01/components/texture3D.html#TextureTransform3D"
                               appinfo="TextureTransform3D applies a 3D transformation to texture coordinates.">
             <componentInfo name="Texturing3D" level="1"/>
-            <Inheritance baseType="X3DTextureTransformNode"/>
+            <Inheritance baseType="X3DSingleTextureTransformNode"/>
             <field name="center"
                    type="SFVec3f"
                    accessType="inputOutput"
@@ -39034,6 +39041,7 @@
             <field name="mapping"
                    type="SFString"
                    accessType="inputOutput"
+                   inheritedFrom="X3DSingleTextureTransformNode"
                    baseType="xs:NMTOKEN"
                    description="The mapping label identifies which texture coordinates and transformations are used to compute texture effects from corresponding geometry on a given material."/>
             <field name="metadata"
@@ -39097,7 +39105,7 @@
          <InterfaceDefinition specificationUrl="https://www.web3d.org/specifications/X3Dv4/ISO-IEC19775-1v4-IS/Part01/components/texture3D.html#TextureTransformMatrix3D"
                               appinfo="TextureTransformMatrix3D applies a 3D transformation to texture coordinates.">
             <componentInfo name="Texturing3D" level="1"/>
-            <Inheritance baseType="X3DTextureTransformNode"/>
+            <Inheritance baseType="X3DSingleTextureTransformNode"/>
             <field name="IS"
                    type="SFNode"
                    accessType="inputOutput"
@@ -39107,6 +39115,7 @@
             <field name="mapping"
                    type="SFString"
                    accessType="inputOutput"
+                   inheritedFrom="X3DSingleTextureTransformNode"
                    baseType="xs:NMTOKEN"
                    description="The mapping label identifies which texture coordinates and transformations are used to compute texture effects from corresponding geometry on a given material."/>
             <field name="matrix"