sunrize 1.7.43 → 1.7.45

package/src/Editors/OutlineView.js

@@ -1092,6 +1092,9 @@ module .exports = class OutlineView extends Interface
          {
             case X3D .X3DConstants .X3DLayerNode:
             {
+               if (node .getExecutionContext () !== this .executionContext)
+                  continue;
+
                buttons .push ($("<span></span>")
                   .attr ("order", "2")
                   .attr ("title", _("Activate layer."))
@@ -1247,7 +1250,9 @@ module .exports = class OutlineView extends Interface
       if (!this .browser .getActiveLayer ())
          return;
 
-      this .sceneGraph .find (`.node[node-id=${this .browser .getActiveLayer () .getId ()}], .exported-node[node-id=${this .browser .getActiveLayer () .getId ()}]`)
+      this .sceneGraph .find (`.node[node-id=${this .browser .getActiveLayer () .getId ()}],
+         .imported-node[node-id=${this .browser .getActiveLayer () .getId ()}],
+         .exported-node[node-id=${this .browser .getActiveLayer () .getId ()}]`)
          .find ("> .item .activate-layer")
          .removeClass ("off")
          .addClass ("green");
@@ -1256,7 +1261,9 @@ module .exports = class OutlineView extends Interface
    updateNodeBound (node)
    {
       this .sceneGraph
-         .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         .find (`.node[node-id=${node .getId ()}],
+         .imported-node[node-id=${node .getId ()}],
+         .exported-node[node-id=${node .getId ()}]`)
          .find ("> .item .bind-node")
          .removeClass (["on", "off"])
          .addClass (node ._isBound .getValue () ? "on" : "off")
@@ -1268,7 +1275,10 @@ module .exports = class OutlineView extends Interface
       const [className] = this .getLoadState (node .checkLoadState (), node .getTypeName ());
 
       this .sceneGraph
-         .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}], .externproto[node-id=${node .getId ()}]`)
+         .find (`.node[node-id=${node .getId ()}],
+         .imported-node[node-id=${node .getId ()}],
+         .exported-node[node-id=${node .getId ()}],
+         .externproto[node-id=${node .getId ()}]`)
          .find ("> .item .reload-node")
          .removeClass (["not-started-state", "in-progress-state", "complete-state", "failed-state"])
          .addClass (className);
@@ -1279,7 +1289,9 @@ module .exports = class OutlineView extends Interface
       const buttons = [ ];
 
       buttons .push (this .sceneGraph
-         .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         .find (`.node[node-id=${node .getId ()}],
+         .imported-node[node-id=${node .getId ()}],
+         .exported-node[node-id=${node .getId ()}]`)
          .find ("> .item .play-node")
          .removeClass (["on", "off"])
          .addClass (node ._isPaused .getValue () ? "on" : "off")
@@ -1287,13 +1299,17 @@ module .exports = class OutlineView extends Interface
          .text (node ._isActive .getValue () ? "pause" : "play_arrow"));
 
       buttons .push (this .sceneGraph
-         .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         .find (`.node[node-id=${node .getId ()}],
+         .imported-node[node-id=${node .getId ()}],
+         .exported-node[node-id=${node .getId ()}]`)
          .find ("> .item .stop-node")
          .removeClass (["on", "off"])
          .addClass (node ._isActive .getValue () ? "on" : "off"));
 
       buttons .push (this .sceneGraph
-         .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         .find (`.node[node-id=${node .getId ()}],
+         .imported-node[node-id=${node .getId ()}],
+         .exported-node[node-id=${node .getId ()}]`)
          .find ("> .item .loop-node")
          .removeClass (["on", "off"])
          .addClass (node ._loop .getValue () ? "on" : "off"));
@@ -1309,7 +1325,7 @@ module .exports = class OutlineView extends Interface
 
    isInParents (parent, node)
    {
-      return parent .closest (".node[node-id=" + node .getId () + "]", this .sceneGraph) .length;
+      return parent .closest (`.node[node-id=${node .getId ()}]`, this .sceneGraph) .length;
    }
 
    #importedNodeSymbol = Symbol ();
@@ -2710,7 +2726,9 @@ module .exports = class OutlineView extends Interface
 
    nodeCloseClones (element)
    {
-      const opened = this .sceneGraph .find (`.node[node-id=${element .attr ("node-id")}], .imported-node[node-id=${element .attr ("node-id")}], .exported-node[node-id=${element .attr ("node-id")}]`);
+      const opened = this .sceneGraph .find (`.node[node-id=${element .attr ("node-id")}],
+         .imported-node[node-id=${element .attr ("node-id")}],
+         .exported-node[node-id=${element .attr ("node-id")}]`);
 
       opened .each (function (key, value)
       {
@@ -2908,7 +2926,7 @@ module .exports = class OutlineView extends Interface
          }
       });
 
-      element .find (".node:not([node-id=NULL])") .each ((i, e) =>
+      element .find (".node:not([node-id=NULL]), .imported-node, .exported-node") .each ((i, e) =>
       {
          const
             child = $(e),
@@ -2916,6 +2934,7 @@ module .exports = class OutlineView extends Interface
 
          // If node is somewhere else, don't disconnect.
          if (Array .from (this .sceneGraph .find (`.node[node-id="${node .getId ()}"],
+            .imported-node[node-id="${node .getId ()}"],
             .exported-node[node-id="${node .getId ()}"]`))
             .some (s => !$(s) .closest (element) .length))
          {
@@ -2956,7 +2975,7 @@ module .exports = class OutlineView extends Interface
       {
          const
             child = $(e),
-            node = this .getNode (child);
+            node  = this .getNode (child);
 
          node .typeName_changed .removeFieldCallback (this .#exportedNodeSymbol);
          node .name_changed     .removeFieldCallback (this .#exportedNodeSymbol);
@@ -2966,7 +2985,7 @@ module .exports = class OutlineView extends Interface
       {
          const
             child = $(e),
-            field   = this .getField (child);
+            field = this .getField (child);
 
          field .removeReferencesCallback (this .#fieldSymbol);
          field .removeRouteCallback (this .#fieldSymbol);
@@ -3021,7 +3040,7 @@ module .exports = class OutlineView extends Interface
       const
          icon    = $(event .currentTarget) ,
          item    = icon .closest (".item", this .sceneGraph),
-         element = icon .closest (".node, .exported-node", this .sceneGraph),
+         element = icon .closest (".node, .imported-node, .exported-node", this .sceneGraph),
          node    = this .objects .get (parseInt (element .attr ("node-id"))),
          on      = !!item .attr ("data-hasqtip");
 
@@ -3092,7 +3111,7 @@ module .exports = class OutlineView extends Interface
    {
       const
          target  = $(event .target),
-         element = target .closest (".node, .exported-node, .imported-node", this .sceneGraph),
+         element = target .closest (".node, .imported-node, .exported-node", this .sceneGraph),
          node    = this .getNode (element),
          hidden  = !node .isHidden ();
 
@@ -3101,7 +3120,9 @@ module .exports = class OutlineView extends Interface
 
       node .setHidden (hidden);
 
-      this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}], .imported-node[node-id=${node .getId ()}]`)
+      this .sceneGraph .find (`.node[node-id=${node .getId ()}],
+         .imported-node[node-id=${node .getId ()}],
+         .exported-node[node-id=${node .getId ()}]`)
          .find ("> .item .toggle-visibility")
          .removeClass (["on", "off"])
          .addClass (hidden ? "off" : "on")
@@ -3112,7 +3133,7 @@ module .exports = class OutlineView extends Interface
    {
       const
          target  = $(event .target),
-         element = target .closest (".node, .exported-node", this .sceneGraph),
+         element = target .closest (".node, .imported-node, .exported-node", this .sceneGraph),
          node    = this .getNode (element),
          tool    = node .getTool ();
 
@@ -3131,7 +3152,9 @@ module .exports = class OutlineView extends Interface
 
       node .setUserData (_changing, true);
 
-      this .sceneGraph .find (`.node[node-id=${node .getId ()}] > .item .toggle-tool, .exported-node[node-id=${node .getId ()}] > .item .toggle-tool`)
+      this .sceneGraph .find (`.node[node-id=${node .getId ()}] > .item .toggle-tool,
+         .imported-node[node-id=${node .getId ()}] > .item .toggle-tool,
+         .exported-node[node-id=${node .getId ()}] > .item .toggle-tool`)
          .removeClass (["on", "off"])
          .addClass (tool ? "off" : "on");
    }
@@ -3142,7 +3165,7 @@ module .exports = class OutlineView extends Interface
    {
       const
          target  = $(event .target),
-         element = target .closest (".node, .exported-node", this .sceneGraph),
+         element = target .closest (".node, .imported-node, .exported-node", this .sceneGraph),
          node    = this .getNode (element);
 
       event .preventDefault ();
@@ -3161,7 +3184,7 @@ module .exports = class OutlineView extends Interface
    {
       const
          target  = $(event .target),
-         element = target .closest (".node, .exported-node, .externproto", this .sceneGraph),
+         element = target .closest (".node, .imported-node, .exported-node, .externproto", this .sceneGraph),
          item    = target .closest (".item"),
          node    = this .getNode (element);
 
@@ -3196,7 +3219,9 @@ module .exports = class OutlineView extends Interface
 
          node .setHidden (node .getType () .includes (X3D .X3DConstants .X3DShapeNode));
 
-         this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         this .sceneGraph .find (`.node[node-id=${node .getId ()}],
+            .imported-node[node-id=${node .getId ()}],
+            .exported-node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass (["on", "off"])
             .addClass (node .isHidden () ? "off" : "on")
@@ -3222,7 +3247,9 @@ module .exports = class OutlineView extends Interface
 
          node .setHidden (false);
 
-         this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         this .sceneGraph .find (`.node[node-id=${node .getId ()}],
+            .imported-node[node-id=${node .getId ()}],
+            .exported-node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass ("off")
             .addClass ("on")
@@ -3246,7 +3273,9 @@ module .exports = class OutlineView extends Interface
 
          node .setHidden (false);
 
-         this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         this .sceneGraph .find (`.node[node-id=${node .getId ()}],
+            .imported-node[node-id=${node .getId ()}],
+            .exported-node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass ("off")
             .addClass ("on")
@@ -3268,7 +3297,9 @@ module .exports = class OutlineView extends Interface
 
          node .setHidden (false);
 
-         this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+         this .sceneGraph .find (`.node[node-id=${node .getId ()}],
+            .imported-node[node-id=${node .getId ()}],
+            .exported-node[node-id=${node .getId ()}]`)
             .find ("> .item .toggle-visibility")
             .removeClass ("off")
             .addClass ("on")

package/src/Editors/PrimitivesLibrary.js

@@ -11,6 +11,20 @@ module .exports = class PrimitivesLibrary extends LibraryPane
 
    #list;
 
+   open ()
+   {
+      // Set default config values.
+
+      this .config .global .setDefaultValues ({
+         recentPrimitives: [ ],
+      });
+
+      // Clear output.
+
+      this .#list ?.remove ();
+      this .#list = undefined;
+   }
+
    update ()
    {
       // Fill output.
@@ -33,6 +47,30 @@ module .exports = class PrimitivesLibrary extends LibraryPane
          .sort ((a, b) => a .typeName .localeCompare (b .typeName))
          .sort ((a, b) => a .componentInfo .name .localeCompare (b .componentInfo .name));
 
+      // Get recently used primitives.
+
+      const recentPrimitives = this .config .global .recentPrimitives;
+
+      // Create list for recently used elements.
+
+      if (recentPrimitives .length)
+      {
+         $("<li></li>")
+            .addClass ("component")
+            .attr ("name", "recent")
+            .text ("Recently Used Primitives")
+            .appendTo (this .#list);
+
+         for (const typeName of recentPrimitives)
+         {
+            $("<li></li>")
+               .addClass ("node")
+               .text (typeName)
+               .appendTo (this .#list)
+               .on ("dblclick", () => this .createRecentNode (nodes, typeName));
+         }
+      }
+
       // Create list elements.
 
       let componentName = "";
@@ -52,9 +90,27 @@ module .exports = class PrimitivesLibrary extends LibraryPane
          $("<li></li>")
             .addClass ("node")
             .text (node .typeName)
-            .attr ("x3dSyntax", node .x3dSyntax)
             .appendTo (this .#list)
-            .on ("dblclick", () => this .importX3D (node .typeName, node .x3dSyntax));
+            .on ("dblclick", () => this .createNode (node));
       }
    }
+
+   createRecentNode (nodes, typeName)
+   {
+      const node = nodes .find (node => node .typeName === typeName);
+
+      this .createNode (node);
+   }
+
+   createNode ({ typeName, x3dSyntax})
+   {
+      const recentPrimitives = this .config .global .recentPrimitives .filter (name => name !== typeName);
+
+      recentPrimitives .unshift (typeName);
+      recentPrimitives .splice (10);
+
+      this .config .global .recentPrimitives = recentPrimitives;
+
+      this .importX3D (typeName, x3dSyntax);
+   }
 };

package/src/Tools/Geometry2D/Disk2DTool.js

@@ -19,58 +19,56 @@ class Disk2DTool extends X3DGeometryNodeTool
 
       const toolChildren = new X3D .MFNode ();
 
-      // Transform Tool innerRadius
+      // Transform Tool outerRadius
       {
          const
             groupNode     = this .getToolScene () .createNode ("Group"),
             transformNode = this .getToolScene () .createNode ("Transform"),
             transformTool = await transformNode .getValue () .addTool () .getToolInstance ();
 
-         this .#innerRadiusTransformNode = transformNode;
+         this .#outerRadiusTransformNode = transformNode;
 
-         transformNode .scale .addInterest ("set_innerRadiusScale", this);
+         transformNode .scale .addInterest ("set_outerRadiusScale", this);
          transformTool .getField ("isActive") .addInterest ("handleUndo", this);
-         transformTool .getField ("isActive") .addInterest ("set_innerRadiusActive", this);
+         transformTool .getField ("isActive") .addInterest ("set_outerRadiusActive", this);
 
          groupNode     .bboxSize      = new X3D .Vector3 (2, 2, 0);
          transformNode .children      = [groupNode];
-         transformTool .group         = `${this .getTypeName ()}.innerRadius`;
+         transformTool .group         = `${this .getTypeName ()}.outerRadius`;
          transformTool .undo          = false;
          transformTool .tools         = ["SCALE"];
          transformTool .keys          = [ ];
          transformTool .connectedAxes = ["XY", "YX", "ZX"];
          transformTool .centerDisplay = false;
          transformTool .centerTool    = false;
-         transformTool .xAxisDisplay  = false;
-         transformTool .yAxisDisplay  = false;
          transformTool .zAxisDisplay  = false;
          transformTool .bboxColor     = ToolColors .BLUE;
 
          toolChildren .push (transformNode);
 
-         // Connections innerRadius
+         // Connections outerRadius
 
-         this .node ._innerRadius .addInterest ("set_innerRadius", this);
+         this .node ._outerRadius .addInterest ("set_outerRadius", this);
 
-         this .set_innerRadius (this .node ._innerRadius);
+         this .set_outerRadius (this .node ._outerRadius);
       }
 
-      // Transform Tool outerRadius
+      // Transform Tool innerRadius
       {
          const
             groupNode     = this .getToolScene () .createNode ("Group"),
             transformNode = this .getToolScene () .createNode ("Transform"),
             transformTool = await transformNode .getValue () .addTool () .getToolInstance ();
 
-         this .#outerRadiusTransformNode = transformNode;
+         this .#innerRadiusTransformNode = transformNode;
 
-         transformNode .scale .addInterest ("set_outerRadiusScale", this);
+         transformNode .scale .addInterest ("set_innerRadiusScale", this);
          transformTool .getField ("isActive") .addInterest ("handleUndo", this);
-         transformTool .getField ("isActive") .addInterest ("set_outerRadiusActive", this);
+         transformTool .getField ("isActive") .addInterest ("set_innerRadiusActive", this);
 
          groupNode     .bboxSize      = new X3D .Vector3 (2, 2, 0);
          transformNode .children      = [groupNode];
-         transformTool .group         = `${this .getTypeName ()}.outerRadius`;
+         transformTool .group         = `${this .getTypeName ()}.innerRadius`;
          transformTool .undo          = false;
          transformTool .tools         = ["SCALE"];
          transformTool .keys          = [ ];
@@ -82,11 +80,11 @@ class Disk2DTool extends X3DGeometryNodeTool
 
          toolChildren .push (transformNode);
 
-         // Connections outerRadius
+         // Connections innerRadius
 
-         this .node ._outerRadius .addInterest ("set_outerRadius", this);
+         this .node ._innerRadius .addInterest ("set_innerRadius", this);
 
-         this .set_outerRadius (this .node ._outerRadius);
+         this .set_innerRadius (this .node ._innerRadius);
       }
 
       this .tool .undo        = true;