sunrize 1.7.63 → 1.8.1

package/src/Application/Hierarchy.js

@@ -0,0 +1,268 @@
+const
+   X3D       = require ("../X3D"),
+   Interface = require ("./Interface"),
+   Traverse  = require ("x3d-traverse") (X3D);
+
+module .exports = new class Hierarchy extends Interface
+{
+   #target      = null;
+   #nodes       = [ ];
+   #hierarchies = [ ];
+
+   constructor ()
+   {
+      super ("Sunrize.Hierarchy.");
+
+      this .setup ();
+   }
+
+   configure ()
+   {
+      this .executionContext ?.sceneGraph_changed .removeInterest ("update", this);
+
+      this .executionContext = this .browser .currentScene;
+
+      this .executionContext .sceneGraph_changed .addInterest ("update", this);
+   }
+
+   update ()
+   {
+      const
+         target = this .#target,
+         nodes  = this .#nodes;
+
+      this .target (target ?.isLive () ? target : null);
+      nodes .forEach (node => this .add (node));
+   }
+
+   #targetTypes = new Set ([
+      X3D .X3DConstants .X3DShapeNode,
+      X3D .X3DConstants .Inline,
+   ]);
+
+   target (node)
+   {
+      node = node ?.valueOf () ?? null;
+
+      this .#target = node;
+      this .#nodes  = [ ];
+
+      if (!node)
+      {
+         this .#hierarchies = [ ];
+      }
+      else if (!node .getType () .includes (X3D .X3DConstants .X3DShapeNode))
+      {
+         this .#hierarchies = [ ];
+
+         let flags = Traverse .NONE;
+
+         flags |= Traverse .PROTO_DECLARATIONS;
+         flags |= Traverse .PROTO_DECLARATION_BODY;
+         flags |= Traverse .ROOT_NODES;
+
+         for (const object of Traverse .traverse (node, flags))
+         {
+            if (!(object instanceof X3D .SFNode))
+               continue;
+
+            const node = object .getValue () .valueOf ();
+
+            if (!node .getType () .some (type => this .#targetTypes .has (type)))
+               continue;
+
+            const target = node .getGeometry ?.() ?.valueOf () ?? node;
+
+            for (const hierarchy of this .#find (target))
+               this .#hierarchies .push (hierarchy);
+         }
+
+         if (!this .#hierarchies .length)
+            this .#hierarchies = this .#find (node);
+      }
+      else
+      {
+         const target = node .getType () .includes (X3D .X3DConstants .X3DShapeNode)
+            ? node .getGeometry () ?.valueOf () ?? node
+            : node;
+
+         this .#hierarchies = this .#find (target);
+      }
+
+      this .#processInterests ();
+   }
+
+   set (node)
+   {
+      node = node ?.valueOf () ?? null;
+
+      if (!this .#has (node))
+         return;
+
+      this .#nodes = [node];
+
+      this .#processInterests ();
+   }
+
+   add (node)
+   {
+      node = node ?.valueOf () ?? null;
+
+      if (!this .#has (node))
+         return;
+
+      if (this .#nodes .includes (node))
+         return;
+
+      this .#nodes .push (node);
+
+      this .#processInterests ();
+   }
+
+   remove (node)
+   {
+      node = node ?.valueOf () ?? null;
+
+      this .#nodes = this .#nodes .filter (n => n !== node);
+
+      this .#processInterests ();
+   }
+
+   clear ()
+   {
+      this .#target      = null;
+      this .#nodes       = [ ];
+      this .#hierarchies = [ ];
+
+      this .#processInterests ();
+   }
+
+   #find (target)
+   {
+      if (!target)
+         return [ ];
+
+      // Find target node.
+
+      let flags = Traverse .NONE;
+
+      flags |= Traverse .PROTO_DECLARATIONS;
+      flags |= Traverse .PROTO_DECLARATION_BODY;
+      flags |= Traverse .ROOT_NODES;
+
+      return Array .from (this .executionContext .find (target, flags),
+         hierarchy => hierarchy .filter (object => object instanceof X3D .SFNode)
+            .map (node => node .getValue () .valueOf ()));
+   }
+
+   #has (node)
+   {
+      return this .#hierarchies .some (hierarchy => hierarchy .includes (node));
+   }
+
+   #indices (node)
+   {
+      return this .#hierarchies .map (hierarchy => hierarchy .indexOf (node));
+   }
+
+   up ()
+   {
+      this .#nodes = this .#nodes .flatMap (node => this .#indices (node) .map (index =>
+      {
+         return index - 1 >= 0 ? index - 1 : index;
+      })
+      .map ((index, i) => this .#hierarchies [i] [index])
+      .filter (node => node));
+
+      this .#nodes = Array .from (new Set (this .#nodes));
+
+      // Combine to most highest node.
+
+      const indices = Array .from (this .#hierarchies, hierarchy => hierarchy .length);
+
+      for (const node of this .#nodes)
+      {
+         for (const [i, index] of this .#indices (node) .entries ())
+         {
+            if (index < 0)
+               continue;
+
+            indices [i] = Math .min (indices [i], index);
+         }
+      }
+
+      this .#nodes = indices .map ((index, i) => this .#hierarchies [i] [index]) .filter (node => node);
+      this .#nodes = Array .from (new Set (this .#nodes));
+
+      // Propagate change.
+
+      this .#processInterests ();
+
+      return this .#nodes;
+   }
+
+   down ()
+   {
+      this .#nodes = this .#nodes .flatMap (node => this .#indices (node) .map ((index, i) =>
+      {
+         return index >= 0 && index + 1 < this .#hierarchies [i] .length ? index + 1 : index;
+      })
+      .map ((index, i) => this .#hierarchies [i] [index])
+      .filter (node => node));
+
+      this .#nodes = Array .from (new Set (this .#nodes));
+
+      // Combine to most lowest node.
+
+      const indices = Array .from (this .#hierarchies, () => -1);
+
+      for (const node of this .#nodes)
+      {
+         for (const [i, index] of this .#indices (node) .entries ())
+         {
+            if (index < 0)
+               continue;
+
+            indices [i] = Math .max (indices [i], index);
+         }
+      }
+
+      this .#nodes = indices .map ((index, i) => this .#hierarchies [i] [index]) .filter (node => node);
+      this .#nodes = Array .from (new Set (this .#nodes));
+
+      // Propagate change.
+
+      this .#processInterests ();
+
+      return this .#nodes;
+   }
+
+   canUp ()
+   {
+      return this .#nodes .some (node => this .#indices (node) .some (index => index > 0));
+   }
+
+   canDown ()
+   {
+      return this .#nodes .some (node => this .#indices (node)
+         .some ((index, i) => index >= 0 && index < this .#hierarchies [i] .length - 1));
+   }
+
+   #interest = new Map ();
+
+   addInterest (key, callback)
+   {
+      this .#interest .set (key, callback);
+   }
+
+   removeInterest (key)
+   {
+      this .#interest .delete (key);
+   }
+
+   #processInterests ()
+   {
+      for (const callback of this .#interest .values ())
+         callback (this .nodes);
+   }
+}

package/src/Application/Selection.js

@@ -37,7 +37,7 @@ module .exports = new class Selection extends Interface
       // this .nodes = this .nodes .map (n => n .isLive ()); // Leave tool working.
 
       if (length !== this .nodes .length)
-         this .processInterests ();
+         this .#processInterests ();
    }
 
    has (node)
@@ -51,7 +51,7 @@ module .exports = new class Selection extends Interface
    clear ()
    {
       this .#clear ();
-      this .processInterests ();
+      this .#processInterests ();
    }
 
    set (node)
@@ -61,7 +61,7 @@ module .exports = new class Selection extends Interface
 
       this .#clear (node);
       this .#add (node);
-      this .processInterests ();
+      this .#processInterests ();
    }
 
    add (node)
@@ -70,7 +70,7 @@ module .exports = new class Selection extends Interface
          return;
 
       this .#add (node);
-      this .processInterests ();
+      this .#processInterests ();
    }
 
    remove (node)
@@ -79,7 +79,7 @@ module .exports = new class Selection extends Interface
          return;
 
       this .#remove (node);
-      this .processInterests ();
+      this .#processInterests ();
    }
 
    #clear (exclude)
@@ -132,7 +132,7 @@ module .exports = new class Selection extends Interface
       this .#interest .delete (key);
    }
 
-   processInterests ()
+   #processInterests ()
    {
       for (const callback of this .#interest .values ())
          callback (this .nodes);

package/src/Application/Tabs.js

@@ -105,6 +105,7 @@ module .exports = new class Tabs
       this .forwardToActiveTab ("activate-snap-target");
       this .forwardToActiveTab ("activate-snap-source");
       this .forwardToActiveTab ("center-snap-target-in-selection");
+      this .forwardToActiveTab ("center-snap-source-in-selection");
       this .forwardToActiveTab ("move-selection-to-snap-target");
       this .forwardToActiveTab ("move-selection-center-to-snap-target");
 

package/src/Components/Grouping/StaticGroup.js

@@ -1,4 +1,4 @@
-"use strict"
+"use strict";
 
 const X3D = require ("../../X3D");
 

package/src/Components/Grouping/Switch.js

@@ -0,0 +1,34 @@
+"use strict";
+
+const X3D = require ("../../X3D");
+
+function Switch (executionContext)
+{
+   X3D .Switch .call (this, executionContext);
+
+   this .editChild = null;
+}
+
+Object .assign (Object .setPrototypeOf (Switch .prototype, X3D .Switch .prototype),
+{
+   getEditChild ()
+   {
+      return this .editChild;
+   },
+   setEditChild (childNode)
+   {
+      this .editChild = childNode;
+
+      this .set_children__ ();
+
+      this .getBrowser () .addBrowserEvent ();
+   },
+   setChild (childNode)
+   {
+      X3D .Switch .prototype .setChild .call (this, this .editChild ?.getTool () ?? this .editChild ?? childNode);
+   },
+});
+
+Object .assign (Switch, X3D .Switch);
+
+module .exports = Switch;

package/src/Components/Navigation/Collision.js

@@ -0,0 +1,70 @@
+"use strict";
+
+const X3D = require ("../../X3D");
+
+function Collision (executionContext)
+{
+   X3D .Collision .call (this, executionContext);
+
+   this .proxyDisplay = false;
+}
+
+Object .assign (Object .setPrototypeOf (Collision .prototype, X3D .Collision .prototype),
+{
+   getProxyDisplay ()
+   {
+      return this .proxyDisplay;
+   },
+   setProxyDisplay (proxyDisplay)
+   {
+      this .proxyDisplay = proxyDisplay;
+
+      this .set_collisionObjects__ ();
+   },
+   set_proxy__ ()
+   {
+      this .pointingObjects .delete (this .proxyNode);
+      this .visibleObjects  .delete (this .proxyNode);
+
+      X3D .Collision .prototype .set_proxy__ .call (this);
+   },
+   set_pointingObjects__ ()
+   {
+      if (this .proxyNode)
+      {
+         if (this .proxyDisplay)
+            this .pointingObjects .add (this .proxyNode);
+         else
+            this .pointingObjects .delete (this .proxyNode);
+      }
+
+      X3D .Collision .prototype .set_pointingObjects__ .call (this);
+
+      this .getBrowser () .addBrowserEvent ();
+   },
+   set_collisionObjects__ ()
+   {
+      this .set_pointingObjects__ ();
+      this .set_visibleObjects__ ();
+
+      X3D .Collision .prototype .set_collisionObjects__ .call (this);
+   },
+   set_visibleObjects__ ()
+   {
+      if (this .proxyNode)
+      {
+         if (this .proxyDisplay)
+            this .visibleObjects .add (this .proxyNode);
+         else
+            this .visibleObjects .delete (this .proxyNode);
+      }
+
+      X3D .Collision .prototype .set_visibleObjects__ .call (this);
+
+      this .getBrowser () .addBrowserEvent ();
+   },
+});
+
+Object .assign (Collision, X3D .Collision);
+
+module .exports = Collision;

package/src/Components/Navigation/LOD.js

@@ -0,0 +1,34 @@
+"use strict";
+
+const X3D = require ("../../X3D");
+
+function LOD (executionContext)
+{
+   X3D .LOD .call (this, executionContext);
+
+   this .editChild = null;
+}
+
+Object .assign (Object .setPrototypeOf (LOD .prototype, X3D .LOD .prototype),
+{
+   getEditChild ()
+   {
+      return this .editChild;
+   },
+   setEditChild (childNode)
+   {
+      this .editChild = childNode;
+
+      this .set_children__ ();
+
+      this .getBrowser () .addBrowserEvent ();
+   },
+   setChild (childNode)
+   {
+      X3D .LOD .prototype .setChild .call (this, this .editChild ?.getTool () ?? this .editChild ?? childNode);
+   },
+});
+
+Object .assign (LOD, X3D .LOD);
+
+module .exports = LOD;

package/src/Editors/Library.js

@@ -263,6 +263,6 @@ module .exports = new class Library extends Dialog
       const outlineEditor = require ("../Application/Window") .sidebar .outlineEditor;
 
       outlineEditor .expandTo (node);
-      outlineEditor .selectNodeElement ($(`.node[node-id=${node .getId ()}]`));
+      outlineEditor .selectNodeElement ($(`.node[node-id=${node .getId ()}]`), { target: true });
    }
 }

package/src/Editors/OutlineEditor.js

@@ -1199,7 +1199,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       await this .browser .nextFrame ();
 
-      this .expandTo (node, true);
+      this .expandTo (node, { expandObject: true });
+
+      const groupElement = this .sceneGraph .find (`.node[node-id=${node .getId ()}]`);
+
+      this .selectNodeElement (groupElement, { target: true });
    }
 
    removeParent (id, executionContextId, nodeId)
@@ -1467,7 +1471,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       await this .browser .nextFrame ();
 
-      this .expandTo (childNode, true);
+      this .expandTo (childNode, { expandObject: true });
    }
 
    protocolToMimeType = new Map ([

package/src/Editors/OutlineRouteGraph.js

@@ -38,7 +38,7 @@ module .exports = class OutlineRouteGraph extends OutlineView
             for (const route of field .getInputRoutes ())
             {
                this .selectedRoutes .add (route);
-               this .expandTo (route .getSourceNode (), true);
+               this .expandTo (route .getSourceNode (), { expandObject: true });
             }
 
             break;
@@ -48,7 +48,7 @@ module .exports = class OutlineRouteGraph extends OutlineView
             for (const route of field .getOutputRoutes ())
             {
                this .selectedRoutes .add (route);
-               this .expandTo (route .getDestinationNode (), true);
+               this .expandTo (route .getDestinationNode (), { expandObject: true });
             }
 
             break;
@@ -78,7 +78,7 @@ module .exports = class OutlineRouteGraph extends OutlineView
             const route = this .getRoute (element, field .getInputRoutes ());
 
             this .selectedRoutes .add (route);
-            this .expandTo (route .getSourceNode (), true);
+            this .expandTo (route .getSourceNode (), { expandObject: true });
             break;
          }
          case "output":
@@ -86,7 +86,7 @@ module .exports = class OutlineRouteGraph extends OutlineView
             const route = this .getRoute (element, field .getOutputRoutes ());
 
             this .selectedRoutes .add (route);
-            this .expandTo (route .getDestinationNode (), true);
+            this .expandTo (route .getDestinationNode (), { expandObject: true });
             break;
          }
       }