sunrize 1.2.0 → 1.2.2

package/src/Editors/ScriptEditor.js

@@ -152,7 +152,8 @@ module .exports = class ScriptEditor extends Interface
 
       if (this .node)
       {
-         this .node ._url .removeFieldCallback (this);
+         this .node ._url       .removeFieldCallback (this);
+         this .node ._loadState .removeFieldCallback (this);
 
          switch (this .node .getTypeName ())
          {
@@ -190,7 +191,10 @@ module .exports = class ScriptEditor extends Interface
 
          this .monaco .restoreViewState (this .monaco .viewState);
 
-         this .node ._url .addFieldCallback (this, this .set_url .bind (this));
+         this .node ._url       .addFieldCallback (this, this .set_url       .bind (this));
+         this .node ._loadState .addFieldCallback (this, this .set_loadState .bind (this));
+
+         this .set_loadState ();
 
          switch (this .node .getTypeName ())
          {
@@ -438,7 +442,7 @@ function set_field (value, time)
 
       UndoManager .shared .endUndo ();
 
-      this .setNode (nodes [0]);
+      this .nodeList .setNode (nodes [0]);
    }
 
    async createShader ()
@@ -492,7 +496,7 @@ main ()
 
       UndoManager .shared .endUndo ();
 
-      this .setNode (nodes [0] ._parts [0] .getValue ());
+      this .nodeList .setNode (nodes [0] ._parts [0] .getValue ());
    }
 
    apply ()
@@ -518,6 +522,26 @@ main ()
       this .monaco .getModel () .setValue (this .node ._url [0]);
    }
 
+   set_loadState ()
+   {
+      this .applyButton .removeClass (["red", "green", "yellow"]);
+
+      switch (this .node .checkLoadState ())
+      {
+         case X3D .X3DConstants .NOT_STATED_STATE:
+            break;
+         case X3D .X3DConstants .IN_PROGRESS_STATE:
+            this .applyButton .addClass ("yellow");
+            break;
+         case X3D .X3DConstants .COMPLETE_STATE:
+            this .applyButton .addClass ("green");
+            break;
+         case X3D .X3DConstants .FAILED_STATE:
+            this .applyButton .addClass ("red");
+            break;
+      }
+   }
+
    debugFindActions (editor)
    {
       for (const action of editor .getSupportedActions ())

package/src/Tools/Core/X3DChildNodeTool.js

@@ -3,6 +3,7 @@
 const
    X3DNodeTool = require ("./X3DNodeTool"),
    X3D         = require ("../../X3D"),
+   Editor      = require ("../../Undo/Editor"),
    UndoManager = require ("../../Undo/UndoManager"),
    _           = require ("../../Application/GetText");
 
@@ -10,6 +11,9 @@ class X3DChildNodeTool extends X3DNodeTool
 {
    static #tools = new Set ();
 
+   #groupedTools  = new Set ();
+   #initialValues = new Map ();
+
    getMustDisplay ()
    {
       return true;
@@ -40,71 +44,86 @@ class X3DChildNodeTool extends X3DNodeTool
          this .finishUndo ()
    }
 
-   prepareUndo (center = false)
+   prepareUndo ()
    {
       // Begin undo.
 
       const
-         tool     = center ? 3 : this .tool .activeTool,
-         typeName = this .getTypeName (),
-         name     = this .getDisplayName ();
+         typeName    = this .getTypeName (),
+         name        = this .getDisplayName (),
+         description = this .getUndoDescription (this .tool .activeTool, name);
+
+      UndoManager .shared .beginUndo (description, typeName, name);
+
+      // Prepare undo.
+
+      if (this .beginUndo () === false)
+         return;
+
+      this .#groupedTools .add (this);
+
+      if (this .tool .group === "NONE")
+         return;
+
+      // Prepare grouping.
+
+      for (const other of X3DChildNodeTool .#tools)
+      {
+         if (other .tool .group === `${this .tool .activeTool}_TOOL`)
+            other .tool .grouping = true;
+      }
+
+      for (const other of X3DChildNodeTool .#tools)
+      {
+         if (other === this)
+            continue;
+
+         if (other .tool .group !== this .tool .group)
+            continue;
+
+         if (other .beginUndo () === false)
+            continue;
+
+         this .#groupedTools .add (other);
+      }
+   }
 
-      switch (tool)
+   getUndoDescription (activeTool, name)
+   {
+      switch (activeTool)
       {
-         case 0: // "TRANSLATE"
+         case "TRANSLATE":
          {
             if (name)
-               UndoManager .shared .beginUndo (_ ("Translate %s »%s«"), typeName, name);
-            else
-               UndoManager .shared .beginUndo (_ ("Translate %s"), typeName);
-            break;
+               return _ ("Translate %s »%s«");
+
+            return _ ("Translate %s");
          }
-         case 1: // "ROTATE"
+         case "ROTATE":
          {
             if (name)
-               UndoManager .shared .beginUndo (_ ("Rotate %s »%s«"), typeName, name);
-            else
-               UndoManager .shared .beginUndo (_ ("Rotate %s"), typeName);
-            break;
+               return _ ("Rotate %s »%s«");
+
+            return _ ("Rotate %s");
          }
-         case 2: // "SCALE"
+         case "SCALE":
          {
             if (name)
-               UndoManager .shared .beginUndo (_ ("Scale %s »%s«"), typeName, name);
-            else
-               UndoManager .shared .beginUndo (_ ("Scale %s"), typeName);
-            break;
+               return _ ("Scale %s »%s«");
+
+            return _ ("Scale %s");
          }
-         case 3: // "CENTER"
+         case "CENTER":
          {
             if (name)
-               UndoManager .shared .beginUndo (_ ("Translate Center Of %s »%s«"), typeName, name);
-            else
-               UndoManager .shared .beginUndo (_ ("Translate Center Of %s"), typeName);
-            break;
-         }
-      }
-
-      // Prepare grouping.
+               return _ ("Translate Center of Node %s »%s«");
 
-      for (const other of X3DChildNodeTool .#tools)
-      {
-         if (other !== this)
-         {
-            if (other .tool .group === "NONE")
-               continue;
+            return _ ("Translate Center of Node %s");
          }
-
-         if (!center)
+         default:
          {
-            if (other .tool .group !== this .tool .group)
-               continue;
+            return `No Undo Description Available For '${activeTool}'`;
          }
-
-         if (other .beginUndo (this) === false)
-            continue;
-
-         other .tool .grouped = true;
       }
    }
 
@@ -112,20 +131,44 @@ class X3DChildNodeTool extends X3DNodeTool
    {
       for (const other of X3DChildNodeTool .#tools)
       {
-         if (!other .tool .grouped)
-            continue;
-
-         other .tool .grouped = false;
+         if (other .tool .grouping)
+            other .tool .grouping = false;
+      }
 
+      for (const other of this .#groupedTools)
          other .endUndo ();
-      }
+
+      this .#groupedTools .clear ();
 
       UndoManager .shared .endUndo ();
    }
 
    beginUndo () { }
 
-   endUndo () { }
+   endUndo ()
+   {
+      this .undoSetValues ();
+   }
+
+   undoSaveInitialValues (fields)
+   {
+      for (const name of fields)
+         this .#initialValues .set (name, this .getField (name) .copy ());
+   }
+
+   undoSetValues ()
+   {
+      for (const [name, initialValue] of this .#initialValues)
+      {
+         const value = this .getField (name) .copy ();
+
+         this .getField (name) .assign (initialValue);
+
+         Editor .setFieldValue (this .getExecutionContext (), this .node, this .getField (name), value);
+      }
+
+      this .#initialValues .clear ();
+   }
 
    traverse (type, renderObject)
    {

package/src/Tools/Core/X3DNodeTool.js

@@ -4,8 +4,7 @@ const
    path     = require ("path"),
    url      = require ("url"),
    X3D      = require ("../../X3D"),
-   Traverse = require ("../../Application/Traverse"),
-   DEBUG    = false && process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT";
+   Traverse = require ("../../Application/Traverse");
 
 const
    _tool     = Symbol .for ("Sunrize.tool"),
@@ -56,6 +55,10 @@ const handler =
    },
 }
 
+const
+   _proxy         = Symbol (),
+   _externalNodes = Symbol ();
+
 class X3DNodeTool
 {
    static createOnSelection = true;
@@ -68,9 +71,11 @@ class X3DNodeTool
       node .setUserData (_tool, proxy);
       node .setUserData (_changing, true);
 
-      this .proxy         = proxy;
-      this .node          = node;
-      this .externalNodes = new Map ();
+      X3D .SFNodeCache .add (proxy, X3D .SFNodeCache .get (node));
+
+      this .node            = node;
+      this [_proxy]         = proxy;
+      this [_externalNodes] = new Map ();
 
       this .replaceNode (node, proxy);
       proxy .setupTool ();
@@ -80,7 +85,7 @@ class X3DNodeTool
 
    getInnerNode ()
    {
-      return this .proxy;
+      return this [_proxy];
    }
 
    replaceNode (node, replacement)
@@ -124,7 +129,7 @@ class X3DNodeTool
 
    addTool ()
    {
-      return this .proxy;
+      return this [_proxy];
    }
 
    static #scenes = new Map ();
@@ -135,7 +140,7 @@ class X3DNodeTool
          protoURL = url .pathToFileURL (path .resolve (... args)),
          promise  = X3DNodeTool .#scenes .get (protoURL .href);
 
-      if (promise && !DEBUG)
+      if (promise)
       {
          return this .toolPromise = promise .then (scene => this .tool = this .createTool (scene));
       }
@@ -181,7 +186,7 @@ class X3DNodeTool
    {
       field .addInterest ("addExternalNode", this);
 
-      this .externalNodes .set (field .getValue (), field);
+      this [_externalNodes] .set (field .getValue (), field);
    }
 
    removeTool (action = "createOnDemand")
@@ -196,14 +201,16 @@ class X3DNodeTool
       this .node .removeUserData (_tool);
       this .node .setUserData (_changing, true);
 
+      X3D .SFNodeCache .delete (this [_proxy]);
+
       const nodesToDispose = [ ]
 
       Traverse .traverse (this .tool, Traverse .ROOT_NODES | Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES, node => nodesToDispose .push (node));
 
-      for (const node of nodesToDispose .filter (node => !this .externalNodes .has (node)))
+      for (const node of nodesToDispose .filter (node => !this [_externalNodes] .has (node)))
          node .dispose ();
 
-      for (const field of this .externalNodes .values ())
+      for (const field of this [_externalNodes] .values ())
          field .removeInterest ("addExternalNode", this);
 
       this .replaceNode (this, this .node);

package/src/Tools/EnvironmentalSensor/X3DEnvironmentalSensorNodeTool.js

@@ -20,26 +20,9 @@ class X3DEnvironmentalSensorNodeTool extends X3DChildNodeTool
       this .tool .boxColor = this .toolBoxColor;
    }
 
-   #initialSize;
-   #initialCenter;
-
    beginUndo ()
    {
-      this .#initialSize   = this ._size   .copy ();
-      this .#initialCenter = this ._center .copy ();
-   }
-
-   endUndo ()
-   {
-      const
-         size   = this ._size   .copy (),
-         center = this ._center .copy ();
-
-      this ._size   = this .#initialSize;
-      this ._center = this .#initialCenter;
-
-      Editor .setFieldValue (this .getExecutionContext (), this .node, this ._size,   size);
-      Editor .setFieldValue (this .getExecutionContext (), this .node, this ._center, center);
+      this .undoSaveInitialValues (["size", "center"]);
    }
 }
 

package/src/Tools/EnvironmentalSensor/X3DEnvironmentalSensorNodeTool.x3d

@@ -17,13 +17,13 @@
       <ProtoInterface>
         <field accessType='inputOutput' type='SFBool' name='selected'/>
         <field accessType='inputOutput' type='SFString' name='group' value='TRANSFORM_TOOL'/>
-        <field accessType='inputOutput' type='SFBool' name='grouped'/>
+        <field accessType='inputOutput' type='SFBool' name='grouping'/>
         <field accessType='inputOutput' type='SFBool' name='undo' value='true'/>
         <field accessType='inputOutput' type='SFColor' name='boxColor' value='0.35 1 0.7'/>
         <field accessType='inputOutput' type='SFVec3f' name='size' value='1 1 1'/>
         <field accessType='inputOutput' type='SFVec3f' name='center'/>
         <field accessType='outputOnly' type='SFNode' name='transformTool'/>
-        <field accessType='outputOnly' type='SFInt32' name='activeTool'/>
+        <field accessType='outputOnly' type='SFString' name='activeTool'/>
         <field accessType='outputOnly' type='SFBool' name='isActive'/>
       </ProtoInterface>
       <ProtoBody>
@@ -63,7 +63,7 @@
             directOutput='true'>
           <field accessType='inputOutput' type='SFBool' name='selected'/>
           <field accessType='inputOutput' type='SFColor' name='color'/>
-          <field accessType='inputOutput' type='SFInt32' name='activeTool'/>
+          <field accessType='inputOutput' type='SFString' name='activeTool'/>
           <field accessType='inputOutput' type='SFBool' name='active'/>
           <field accessType='initializeOnly' type='SFNode' name='material'>
             <Material USE='BoxMaterial'/>
@@ -82,8 +82,6 @@
 
 async function initialize ()
 {
-   set_color ();
-
    const tool = await transform .getValue () .addTool () .getToolInstance ();
 
    Browser .addRoute (tool, "activeTool", this, "activeTool");

package/src/Tools/Grouping/X3DTransformNodeTool.js

@@ -30,8 +30,7 @@ class X3DTransformNodeTool extends X3DChildNodeTool
       this .tool .getField ("scaleOrientation") .addReference (this .node ._scaleOrientation);
       this .tool .getField ("center")           .addReference (this .node ._center);
 
-      this .tool .getField ("isCenterActive") .addInterest ("handleUndo", this);
-      this .tool .getField ("isActive")       .addInterest ("handleUndo", this);
+      this .tool .getField ("isActive") .addInterest ("handleUndo", this);
 
       this .tool .bboxColor = this .toolBBoxColor;
    }
@@ -79,7 +78,7 @@ class X3DTransformNodeTool extends X3DChildNodeTool
 
    prepareUndo ()
    {
-      super .prepareUndo (this .tool .isCenterActive);
+      super .prepareUndo ();
    }
 
    beginUndo ()
@@ -114,6 +113,14 @@ class X3DTransformNodeTool extends X3DChildNodeTool
       this ._scaleOrientation = this .#initialScaleOrientation;
       this ._center           = this .#initialCenter;
 
+      Editor .roundToIntegerIfAlmostEqual (translation);
+      Editor .roundToIntegerIfAlmostEqual (rotation);
+      Editor .roundToIntegerIfAlmostEqual (scale);
+      Editor .roundToIntegerIfAlmostEqual (scaleOrientation);
+
+      if (Editor .almostEqual (scale .x, scale .y) && Editor .almostEqual (scale .x, scale .z))
+         scaleOrientation .assign (new X3D .SFRotation ());
+
       Editor .setFieldValue (this .getExecutionContext (), this .node, this ._translation,      translation);
       Editor .setFieldValue (this .getExecutionContext (), this .node, this ._rotation,         rotation);
       Editor .setFieldValue (this .getExecutionContext (), this .node, this ._scale,            scale);
@@ -129,6 +136,18 @@ class X3DTransformNodeTool extends X3DChildNodeTool
       if (!this .tool .isActive)
          return;
 
+      if (!this .tool .activeTool .match (/^(?:TRANSLATE|ROTATE|SCALE)$/))
+         return;
+
+      if (this .isHidden ())
+         return;
+
+      if (!this ._visible .getValue ())
+         return;
+
+      if (this .tool .group === "NONE")
+         return;
+
       const differenceMatrix = this .#initialMatrix .copy ()
          .multRight (this .#modelMatrix)
          .inverse ()
@@ -146,9 +165,6 @@ class X3DTransformNodeTool extends X3DChildNodeTool
          if (!other ._visible .getValue ())
             continue;
 
-         if (other .tool .group === "NONE")
-            continue;
-
          if (other .tool .group !== this .tool .group)
             continue;
 
@@ -214,14 +230,6 @@ class X3DTransformNodeTool extends X3DChildNodeTool
 
       matrix .get (translation, rotation, scale, scaleOrientation, center);
 
-      Editor .roundToIntegerIfAlmostEqual (translation);
-      Editor .roundToIntegerIfAlmostEqual (rotation);
-      Editor .roundToIntegerIfAlmostEqual (scale);
-      Editor .roundToIntegerIfAlmostEqual (scaleOrientation);
-
-      if (Editor .almostEqual (scale .x, scale .y) && Editor .almostEqual (scale .x, scale .z))
-         scaleOrientation .set (0, 0, 1, 0);
-
       this ._translation      = translation;
       this ._rotation         = rotation;
       this ._scale            = scale;