sunrize 1.7.4 → 1.7.5

package/src/Editors/MaterialsLibrary.js

@@ -0,0 +1,96 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   X3D         = require ("../X3D"),
+   LibraryPane = require ("./LibraryPane");
+
+module .exports = class Materials extends LibraryPane
+{
+   id          = "MATERIALS";
+   description = "Materials";
+
+   #canvas;
+   #browser;
+   #scene;
+   #list;
+
+   async update ()
+   {
+      // Fill output.
+
+      if (this .#list)
+      {
+         this .output .append (this .#list);
+         return;
+      }
+
+      // Create list.
+
+      this .#list = $("<ul></ul>")
+         .appendTo (this .output)
+         .addClass ("library-list");
+
+      this .#canvas  ??= $("<x3d-canvas preserveDrawingBuffer='true''></x3d-canvas>");
+      this .#browser ??= this .#canvas .prop ("browser");
+      this .#scene   ??= await this .#browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/Materials.x3d`));
+
+      const
+         materials = this .#scene .getExportedNode ("Materials"),
+         viewpoint = this .#scene .getExportedNode ("Viewpoint"),
+         nodes     = [ ];
+
+      for (const [g, group] of materials .children .entries ())
+      {
+         $("<li></li>")
+            .addClass ("component")
+            .text (group .getNodeName ())
+            .appendTo (this .#list);
+
+         for (const [c, node] of group .children .entries ())
+         {
+            const material = node .children [0] .appearance .material;
+
+            nodes .push ($("<li></li>")
+               .addClass (["node", "icon"])
+               .text (`${group .getNodeName ()} ${c + 1}`)
+               .attr ("group", g)
+               .attr ("child", c)
+               .appendTo (this .#list)
+               .on ("dblclick", () => this .importX3D (material .getNodeName (), material .toXMLString ())));
+         }
+      }
+
+      // Create icons.
+
+      this .#canvas
+         .css ({ "position": "absolute", "visibility": "hidden" })
+         .prependTo (this .element);
+
+      await this .#browser .resize (25, 25);
+      await this .#browser .replaceWorld (this .#scene);
+
+      for (const element of Array .from (this .output .find (".node"), e => $(e)))
+      {
+         const
+            group   = element .attr ("group"),
+            child   = element .attr ("child"),
+            section = materials .children [group],
+            node    = section .children [child];
+
+         materials .whichChoice = group;
+         section   .whichChoice = child;
+
+         viewpoint .position .x = node .translation .x;
+         viewpoint .position .y = node .translation .y;
+         viewpoint .position .z = 2.65;
+
+         await this .#browser .nextFrame ();
+
+         element .css ("background-image", `url(${this .#canvas [0] .toDataURL ()})`);
+      }
+
+      this .#browser .dispose ();
+      this .#canvas .remove ();
+   }
+};

package/src/Editors/NodesLibrary.js

@@ -0,0 +1,182 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   X3D         = require ("../X3D"),
+   LibraryPane = require ("./LibraryPane"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require ("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+module .exports = class NodesLibrary extends LibraryPane
+{
+   id          = "NODES";
+   description = "Nodes";
+
+   #list;
+
+   open ()
+   {
+      this .#list ?.remove ();
+      this .#list = undefined;
+   }
+
+   update ()
+   {
+      // Fill output.
+
+      if (this .#list)
+      {
+         this .output .append (this .#list);
+         return;
+      }
+
+      // Create list.
+
+      this .#list = $("<ul></ul>")
+         .appendTo (this .output)
+         .addClass ("library-list");
+
+      // Get protos.
+
+      const protos = Array .from (this .getProtos () .values ())
+         .sort ((a, b) => a .name .localeCompare (b .name));
+
+      // Get supported nodes.
+
+      const nodes = [... this .browser .getConcreteNodes ()]
+         .sort ((a, b) => a .typeName .localeCompare (b .typeName))
+         .sort ((a, b) => a .componentInfo .name .localeCompare (b .componentInfo .name));
+
+      // Create list for proto elements
+
+      if (protos .length)
+      {
+         $("<li></li>")
+            .addClass ("component")
+            .attr ("name", "prototypes")
+            .text ("Prototypes")
+            .appendTo (this .#list);
+
+         for (const proto of protos)
+         {
+            $("<li></li>")
+               .addClass ("node")
+               .text (proto .name)
+               .appendTo (this .#list)
+               .on ("dblclick", () => this .createProto (proto));
+         }
+      }
+
+      // Create list for nodes elements.
+
+      let componentName = "";
+
+      for (const node of nodes)
+      {
+         if (node .componentInfo .name !== componentName)
+         {
+            componentName = node .componentInfo .name;
+
+            $("<li></li>")
+               .addClass ("component")
+               .attr ("name", node .componentInfo .name)
+               .text (this .browser .getSupportedComponents () .get (node .componentInfo .name) .title)
+               .appendTo (this .#list);
+         }
+
+         $("<li></li>")
+            .addClass ("node")
+            .text (node .typeName)
+            .attr ("componentName", node .componentInfo .name)
+            .appendTo (this .#list)
+            .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name));
+      }
+   }
+
+   getProtos (executionContext = this .executionContext, protos = new Map (), outerNode)
+   {
+      if (!executionContext)
+         return protos;
+
+      for (const proto of executionContext .protos)
+      {
+         if (proto === outerNode)
+            break;
+
+         if (protos .has (proto .name))
+            continue;
+
+         protos .set (proto .name, proto);
+      }
+
+      for (const proto of executionContext .externprotos)
+      {
+         if (proto === outerNode)
+            break;
+
+         if (protos .has (proto .name))
+            continue;
+
+         protos .set (proto .name, proto);
+      }
+
+      if (!(executionContext instanceof X3D .X3DScene))
+         this .getProtos (executionContext .getExecutionContext (), protos, executionContext .getOuterNode ());
+
+      return protos;
+   }
+
+   async createNode (typeName, componentName)
+   {
+      UndoManager .shared .beginUndo (_("Create Node %s"), typeName);
+
+      await Editor .addComponent (this .executionContext, componentName);
+
+      const node = this .executionContext .createNode (typeName);
+
+      this .addNode (node);
+
+      UndoManager .shared .endUndo ();
+
+      await this .expandToAndSelectNode (node .getValue ());
+   }
+
+   async createProto (proto)
+   {
+      UndoManager .shared .beginUndo (_("Create Proto Instance %s"), proto .name);
+
+      const node = proto .createInstance (this .executionContext);
+
+      this .addNode (node);
+
+      UndoManager .shared .endUndo ();
+
+      await this .expandToAndSelectNode (node .getValue ());
+   }
+
+   addNode (node)
+   {
+      const field = this .field
+         ?? $.try (() => this .node ?.getField (node .getValue () .getContainerField ()));
+
+      switch (field ?.getType ())
+      {
+         case X3D .X3DConstants .SFNode:
+         {
+            Editor .setFieldValue (this .executionContext, this .node, field, node);
+            break;
+         }
+         case X3D .X3DConstants .MFNode:
+         {
+            Editor .insertValueIntoArray (this .executionContext, this .node, field, field .length, node);
+            break;
+         }
+         default:
+         {
+            Editor .insertValueIntoArray (this .executionContext, this .executionContext, this .executionContext .rootNodes, this .executionContext .rootNodes .length, node);
+            break;
+         }
+      }
+   }
+};

package/src/Editors/OutlineEditor.js

@@ -22,8 +22,9 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       element .on ("contextmenu", (event) => this .showContextMenu (event));
 
       electron .ipcRenderer .on ("outline-editor", (event, key, ...args) => this [key] (...args));
-      electron .ipcRenderer .on ("transform-to-zero", (event) => this .transformToZero ());
-      electron .ipcRenderer .on ("remove-empty-groups", (event) => this .removeEmptyGroups ());
+
+      electron .ipcRenderer .on ("transform-to-zero",   () => this .transformToZero ());
+      electron .ipcRenderer .on ("remove-empty-groups", () => this .removeEmptyGroups ());
 
       this .setup ();
    }
@@ -803,7 +804,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
-   copyNodes ()
+   copyNodes (deselect)
    {
       const
          primary     = $(".node.primary, .proto.primary, .externproto.primary"),
@@ -835,6 +836,9 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       navigator .clipboard .writeText (x3dSyntax);
 
       undoManager .undo ();
+
+      if (deselect)
+         this .deselectAll ();
    }
 
    copyExternPrototype ()
@@ -926,11 +930,10 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
          UndoManager .shared .endUndo ();
 
-         requestAnimationFrame (() =>
-         {
-            for (const node of nodes)
-               this .expandTo (node);
-         });
+         await this .browser .nextFrame ();
+
+         for (const node of nodes)
+            this .expandTo (node);
       }
       catch (error)
       {
@@ -1135,7 +1138,9 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       UndoManager .shared .endUndo ();
 
-      requestAnimationFrame (() => this .expandTo (node, true));
+      await this .browser .nextFrame ();
+
+      this .expandTo (node, true);
    }
 
    removeParent (id, executionContextId, nodeId)
@@ -1398,8 +1403,12 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       UndoManager .shared .endUndo ();
 
-      if (nodes .length > 1)
-         requestAnimationFrame (() => this .expandTo (childNode, true));
+      if (nodes .length < 2)
+         return;
+
+      await this .browser .nextFrame ();
+
+      this .expandTo (childNode, true);
    }
 
    protocolToMimeType = new Map ([
@@ -1530,7 +1539,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       Editor .setFieldValue (node .getExecutionContext (), node, node ._bboxSize,   new X3D .Vector3 (-1, -1, -1));
       Editor .setFieldValue (node .getExecutionContext (), node, node ._bboxCenter, new X3D .Vector3 ());
 
-      await Editor .nextFrame (this .browser);
+      await this .browser .nextFrame ();
 
       const bbox = node .getBBox (new X3D .Box3 ());
 
@@ -1587,7 +1596,9 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       UndoManager .shared .endUndo ();
 
-      requestAnimationFrame (() => this .expandTo (inlineNode));
+      await this .browser .nextFrame ();
+
+      this .expandTo (inlineNode);
    }
 
    addNormalsToGeometry (id, executionContextId, nodeId)

package/src/Editors/OutlineView.js

@@ -457,7 +457,9 @@ module .exports = class OutlineView extends Interface
 
          const nodes = Array .from (scene .rootNodes);
 
-         requestAnimationFrame (() => nodes .forEach (n => n .setNodeUserData (_changing, false)));
+         this .browser .nextFrame ()
+            .then (() => nodes .forEach (n => n .setNodeUserData (_changing, false)));
+
          return;
       }
 
@@ -1816,7 +1818,9 @@ module .exports = class OutlineView extends Interface
             if (!field .getValue () || !field .getNodeUserData (_changing))
                break;
 
-            requestAnimationFrame (() => field .setNodeUserData (_changing, false));
+            this .browser .nextFrame ()
+               .then (() => field .setNodeUserData (_changing, false));
+
             return;
          }
          case X3D .X3DConstants .MFNode:
@@ -1828,7 +1832,9 @@ module .exports = class OutlineView extends Interface
 
                const nodes = Array .from (field);
 
-               requestAnimationFrame (() => nodes .forEach (n => n .setNodeUserData (_changing, false)));
+               this .browser .nextFrame ()
+                  .then (() => nodes .forEach (n => n .setNodeUserData (_changing, false)));
+
                return;
             }
 

package/src/Editors/Panel.js

@@ -372,16 +372,16 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFVec4f:
          {
             const
-               executionContext = node .getExecutionContext (),
-               category         = field .getUnit (),
-               min              = fieldElement .attr ("minInclusive") ?? fieldElement .attr ("minExclusive"),
-               max              = fieldElement .attr ("maxInclusive") ?? fieldElement .attr ("maxExclusive");
+               scene    = this .browser .currentScene,
+               category = field .getUnit (),
+               min      = fieldElement .attr ("minInclusive") ?? fieldElement .attr ("minExclusive"),
+               max      = fieldElement .attr ("maxInclusive") ?? fieldElement .attr ("maxExclusive");
 
             if (min !== undefined)
-               options .min = executionContext .toUnit (category, parseFloat (min));
+               options .min = scene .toUnit (category, parseFloat (min));
 
             if (max !== undefined)
-               options .max = executionContext .toUnit (category, parseFloat (max));
+               options .max = scene .toUnit (category, parseFloat (max));
 
             this .refresh (parameter, node, field);
 
@@ -470,6 +470,7 @@ module .exports = new class Panel extends Interface
    refresh (parameter, node, field)
    {
       const
+         scene            = this .browser .currentScene,
          executionContext = node .getExecutionContext (),
          category         = field .getUnit (),
          name             = field .getName ();
@@ -483,7 +484,7 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFString:
          case X3D .X3DConstants .SFTime:
          {
-            parameter [name] = executionContext .toUnit (category, field .getValue ());
+            parameter [name] = scene .toUnit (category, field .getValue ());
             break;
          }
          case X3D .X3DConstants .SFImage:
@@ -502,7 +503,7 @@ module .exports = new class Panel extends Interface
             p .x = field .x;
             p .y = field .y;
             p .z = field .z;
-            p .w = executionContext .toUnit ("angle", field .angle);
+            p .w = scene .toUnit ("angle", field .angle);
             break;
          }
          case X3D .X3DConstants .SFColor:
@@ -522,7 +523,7 @@ module .exports = new class Panel extends Interface
             const p = parameter [name] ??= { };
 
             for (const key in field)
-               p [key] = executionContext .toUnit (category, field [key]);
+               p [key] = scene .toUnit (category, field [key]);
 
             break;
          }
@@ -588,6 +589,7 @@ module .exports = new class Panel extends Interface
    onchange (node, field, value)
    {
       const
+         scene            = this .browser .currentScene,
          executionContext = node .getExecutionContext (),
          category         = field .getUnit ();
 
@@ -618,7 +620,7 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFInt32:
          case X3D .X3DConstants .SFTime:
          {
-            this .assign (executionContext, node, field, executionContext .fromUnit (category, value));
+            this .assign (executionContext, node, field, scene .fromUnit (category, value));
             break;
          }
          case X3D .X3DConstants .SFRotation:
@@ -626,7 +628,7 @@ module .exports = new class Panel extends Interface
             value = new X3D .Rotation4 (value .x,
                                         value .y,
                                         value .z,
-                                        executionContext .fromUnit ("angle", value .w));
+                                        scene .fromUnit ("angle", value .w));
 
             this .assign (executionContext, node, field, value);
             break;
@@ -634,8 +636,8 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFVec2d:
          case X3D .X3DConstants .SFVec2f:
          {
-            value = new X3D .Vector2 (executionContext .fromUnit (category, value .x),
-                                      executionContext .fromUnit (category, value .y));
+            value = new X3D .Vector2 (scene .fromUnit (category, value .x),
+                                      scene .fromUnit (category, value .y));
 
             this .assign (executionContext, node, field, value);
             break;
@@ -643,9 +645,9 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFVec3d:
          case X3D .X3DConstants .SFVec3f:
          {
-            value = new X3D .Vector3 (executionContext .fromUnit (category, value .x),
-                                      executionContext .fromUnit (category, value .y),
-                                      executionContext .fromUnit (category, value .z));
+            value = new X3D .Vector3 (scene .fromUnit (category, value .x),
+                                      scene .fromUnit (category, value .y),
+                                      scene .fromUnit (category, value .z));
 
             this .assign (executionContext, node, field, value);
             break;
@@ -653,10 +655,10 @@ module .exports = new class Panel extends Interface
          case X3D .X3DConstants .SFVec4d:
          case X3D .X3DConstants .SFVec4f:
          {
-            value = new X3D .Vector4 (executionContext .fromUnit (category, value .x),
-                                      executionContext .fromUnit (category, value .y),
-                                      executionContext .fromUnit (category, value .z),
-                                      executionContext .fromUnit (category, value .w));
+            value = new X3D .Vector4 (scene .fromUnit (category, value .x),
+                                      scene .fromUnit (category, value .y),
+                                      scene .fromUnit (category, value .z),
+                                      scene .fromUnit (category, value .w));
 
             this .assign (executionContext, node, field, value);
             break;

package/src/Editors/Primitives.js

@@ -1,4 +1,4 @@
-"use strict"
+"use strict";
 
 module .exports = [
    {
@@ -455,4 +455,4 @@ DEF PointSet Transform {
 }
 `
    },
-]
+];

package/src/Editors/PrimitivesLibrary.js

@@ -0,0 +1,60 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   LibraryPane = require ("./LibraryPane");
+
+module .exports = class PrimitivesLibrary extends LibraryPane
+{
+   id          = "PRIMITIVES";
+   description = "Primitives";
+
+   #list;
+
+   update ()
+   {
+      // Fill output.
+
+      if (this .#list)
+      {
+         this .output .append (this .#list);
+         return;
+      }
+
+      // Create list.
+
+      this .#list = $("<ul></ul>")
+         .appendTo (this .output)
+         .addClass ("library-list");
+
+      // Get primitives.
+
+      const nodes = require ("./Primitives")
+         .sort ((a, b) => a .typeName .localeCompare (b .typeName))
+         .sort ((a, b) => a .componentInfo .name .localeCompare (b .componentInfo .name));
+
+      // Create list elements.
+
+      let componentName = "";
+
+      for (const node of nodes)
+      {
+         if (node .componentInfo .name !== componentName)
+         {
+            componentName = node .componentInfo .name;
+
+            $("<li></li>")
+               .addClass ("component")
+               .text (node .componentInfo .name)
+               .appendTo (this .#list);
+         }
+
+         $("<li></li>")
+            .addClass ("node")
+            .text (node .typeName)
+            .attr ("x3dSyntax", node .x3dSyntax)
+            .appendTo (this .#list)
+            .on ("dblclick", () => this .importX3D (node .typeName, node .x3dSyntax));
+      }
+   }
+};

package/src/Editors/ScriptEditor.js

@@ -251,7 +251,7 @@ module .exports = class ScriptEditor extends Interface
       if (!this .node .getType () .includes (X3D .X3DConstants .Script))
          return;
 
-      this .#declarations ??= fs .readFileSync (require .resolve ("x_ite/x_ite.d.ts"), "utf8")
+      this .#declarations ??= fs .readFileSync (X3D .TYPE_SCRIPT_PATH, "utf8")
          .replace (/^.*?(?:declare const X3D: X3D;)/s, "");
 
       const fields = Array .from (this .node .getUserDefinedFields (), field =>

package/src/Tools/Core/X3DNodeTool.js

@@ -176,7 +176,7 @@ class X3DNodeTool extends X3DBaseTool
 
    createTool (scene, protoName)
    {
-      this .tool = scene .protos .get (protoName) .createInstance (this .getExecutionContext ());
+      this .tool = scene .createProto (protoName);
 
       this .tool .getValue () .setPrivate (true);
 

package/src/Tools/Grouping/X3DTransformNodeTool.x3d

@@ -1792,7 +1792,7 @@ function set_moveCenterToBBoxCenter (value)
 
       center = bboxCenter;
 
-      requestAnimationFrame (() => active = false);
+      Browser .nextFrame () .then (() => active = false);
    }
 }
 

package/src/Undo/Editor.js

@@ -18,17 +18,6 @@ module .exports = class Editor
     */
    static Id = /(?:^[^\x30-\x39\x00-\x20\x22\x23\x27\x2b\x2c\x2d\x2e\x5b\x5c\x5d\x7b\x7d\x7f]{1}[^\x00-\x20\x22\x23\x27\x2c\x2e\x5b\x5c\x5d\x7b\x7d\x7f]*$|^$)/
 
-   /**
-    *
-    * @param {X3DBrowser} browser
-    */
-   static nextFrame (browser)
-   {
-      browser .addBrowserEvent ();
-
-      return new Promise (resolve => requestAnimationFrame (resolve));
-   }
-
    /**
     *
     * @param {X3DExecutionContext} executionContext source execution context
@@ -252,8 +241,6 @@ module .exports = class Editor
       scene .setProfile (browser .getProfile ("Full"));
       scene .updateComponent (browser .getComponent ("X_ITE"));
 
-      await browser .loadComponents (scene .getProfile (), scene .getComponents ());
-
       try
       {
          const parser = new X3D .GoldenGate (tempScene);
@@ -829,7 +816,6 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Set Profile to »%s«"), profile ? profile .title : "Full");
 
-      browser .loadComponents (profile);
       scene .setProfile (profile);
 
       undoManager .registerUndo (() =>
@@ -854,8 +840,6 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Set Components of Scene"));
 
-      browser .loadComponents (... components .map (component => component .name));
-
       for (const { name } of oldComponents)
          scene .removeComponent (name);
 
@@ -876,7 +860,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     * @param {string|ComponentInfo} name
     * @param {UndoManager} undoManager
     */
-   static async addComponent (scene, name, undoManager = UndoManager .shared)
+   static addComponent (scene, name, undoManager = UndoManager .shared)
    {
       scene = this .getScene (scene);
       name  = name instanceof X3D .ComponentInfo ? name .name : name;
@@ -888,7 +872,6 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
       undoManager .beginUndo (_("Add Component %s"), name);
 
-      await browser .loadComponents (name);
       scene .addComponent (browser .getComponent (name));
 
       undoManager .registerUndo (() =>