sunrize 1.7.3 → 1.7.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -15,7 +15,7 @@
     "start": "electron .",
     "development": "SUNRISE_ENVIRONMENT=DEVELOPMENT electron .",
     "release": "node build/release.js",
-    "x3duom": "sh build/x3duom.sh",
+    "X3DUOM": "sh build/X3DUOM.sh",
     "download": "node build/download.js",
     "premake": "npm i -D electron",
     "make": "env PATH=\"$(pwd)/build/wine-proxy:$PATH\" electron-forge make",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.0.2"
+    "x_ite": "^10.0.3"
   },
   "config": {
     "forge": {

package/src/Application/Document.js

@@ -154,6 +154,13 @@ module .exports = class Document extends Interface
          .on ("mousedown", event => this .onmousedown (event))
          .on ("mouseup",   event => this .onmouseup   (event));
 
+      // Load components.
+
+      await this .browser .loadComponents (this .browser .getProfile ("Full"),
+                                           this .browser .getComponent ("X_ITE"));
+
+      this .browser .updateConcreteNode (require ("../Components/Grouping/StaticGroup"));
+
       // Restore
 
       await this .restoreFile ();
@@ -313,10 +320,6 @@ module .exports = class Document extends Interface
 
    async restoreFile ()
    {
-      await this .browser .loadComponents (this .browser .getComponent ("Grouping"));
-
-      this .browser .updateConcreteNode (require ("../Components/Grouping/StaticGroup"));
-
       if (this .fileId)
       {
          const contents = this .config .global .addNameSpace ("unsaved.") [this .fileId];
@@ -566,7 +569,7 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
-      this .sidebar .outlineEditor .copyNodes ();
+      this .sidebar .outlineEditor .copyNodes (true);
       return false;
    }
 

package/src/Bits/X3DUOM.js

@@ -1,11 +1,12 @@
 const
    $    = require ("jquery"),
    fs   = require ("fs"),
-   path = require ("path");
+   path = require ("path"),
+   X3D  = require ("../X3D");
 
 const
-   X3DUOM = $($.parseXML (fs .readFileSync (path .join (__dirname, "..", "assets", "x3duom.xml"), "utf-8"))),
-   X_ITE  = $($.parseXML (fs .readFileSync (path .join (__dirname, "..", "assets", "x3duom-x_ite.xml"), "utf-8")));
+   X3DUOM = $($.parseXML (fs .readFileSync (path .join (__dirname, "..", "assets", "X3DUOM.xml"), "utf-8"))),
+   X_ITE  = $($.parseXML (fs .readFileSync (X3D .X3DUOM_PATH, "utf-8")));
 
 X3DUOM .find ("ConcreteNodes") .append (X_ITE .find ("ConcreteNode"));
 

package/src/Editors/BrowserFrame.js

@@ -95,6 +95,7 @@ module .exports = new class BrowserFrame extends Dialog
 
       this .connect (Editor .getWorldInfo (this .browser .currentScene));
       this .updateInputs ();
+      this .onresize ();
    }
 
    connect (worldInfoNode)

package/src/Editors/Library.js

@@ -2,13 +2,12 @@
 
 const
    $                = require ("jquery"),
+   StringSimilarity = require ("string-similarity"),
    X3D              = require ("../X3D"),
    Dialog           = require ("../Controls/Dialog"),
    Editor           = require ("../Undo/Editor"),
    UndoManager      = require ("../Undo/UndoManager"),
-   Primitives       = require ("./Primitives"),
-   StringSimilarity = require ("string-similarity"),
-   Traverse         = require("../Application/Traverse"),
+   Traverse         = require ("../Application/Traverse"),
    _                = require ("../Application/GetText");
 
 module .exports = new class Library extends Dialog
@@ -17,6 +16,12 @@ module .exports = new class Library extends Dialog
    {
       super ("Sunrize.Library.");
 
+      this .panes = [
+         new (require ("./NodesLibrary")) (this),
+         new (require ("./PrimitivesLibrary")) (this),
+         new (require ("./MaterialsLibrary")) (this),
+      ];
+
       this .setup ();
    }
 
@@ -27,7 +32,7 @@ module .exports = new class Library extends Dialog
       // Set default config values.
 
       this .config .file .setDefaultValues ({
-         type: "NODES",
+         type: this .panes [0] .id,
       });
 
       // Add class.
@@ -41,7 +46,7 @@ module .exports = new class Library extends Dialog
          .addClass ("library-input")
          .attr ("placeholder", _("Search a node"))
          .on ("keydown", event => this .enter (event))
-         .on ("keyup", () => this .update ());
+         .on ("keyup", () => this .filter ());
 
       // Buttons
 
@@ -49,19 +54,15 @@ module .exports = new class Library extends Dialog
          .appendTo (this .element)
          .addClass ("library-buttons");
 
-      this .nodesButton = $("<span></span>")
-         .appendTo (this .buttons)
-         .addClass ("library-button")
-         .data ("type", "NODES")
-         .text (_("Nodes"))
-         .on ("click", () => this .button (this .nodesButton));
-
-      this .primitivesButton = $("<span></span>")
-         .appendTo (this .buttons)
-         .addClass ("library-button")
-         .data ("type", "PRIMITIVES")
-         .text (_("Primitives"))
-         .on ("click", () => this .button (this .primitivesButton));
+      for (const pane of this .panes)
+      {
+         const button = $("<span></span>")
+            .appendTo (this .buttons)
+            .addClass ("library-button")
+            .data ("type", pane .id)
+            .text (_(pane .description))
+            .on ("click", () => this .button (button));
+      }
 
       // Output
 
@@ -69,33 +70,23 @@ module .exports = new class Library extends Dialog
          .appendTo (this .element)
          .addClass ("library-output");
 
-      this .list = $("<ul></ul>")
-         .appendTo (this .output)
-         .addClass ("library-list");
-
       // Configure list type.
 
-      switch (this .config .file .type)
-      {
-         case "NODES":
-            this .button (this .nodesButton);
-            break;
-         case "PRIMITIVES":
-            this .button (this .primitivesButton);
-            break;
-      }
+      const button = [... this .buttons .children ()]
+         .find (button => $(button) .data ("type") === this .config .file .type);
+
+      if (button)
+         this .button ($(button));
    }
 
    async open (executionContext, node, field)
    {
-      await this .browser .loadComponents (this .browser .getProfile ("Full"),
-                                           this .browser .getComponent ("X_ITE"));
-
       this .executionContext = executionContext;
       this .node             = node;
       this .field            = field;
 
       super .open ();
+      this .panes .forEach (pane => pane .open ());
       this .update ();
       this .input .trigger ("focus");
    }
@@ -109,265 +100,94 @@ module .exports = new class Library extends Dialog
       button .addClass ("active");
 
       this .update ();
+      this .filter ();
    }
 
-   enter (event)
-   {
-      if (event .key !== "Enter")
-         return;
-
-      const nodes = Array .from (this .list .find (".node"), element => $(element));
-
-      if (!nodes .length)
-         return;
-
-      try
-      {
-         const
-            input        = this .config .file .type === "NODES" ? this .input .val () .toUpperCase () .trim () : "",
-            ConcreteNode = this .browser .getConcreteNode (X3D .HTMLSupport .getNodeTypeName (input));
-
-         this .createNode (ConcreteNode .typeName, ConcreteNode .componentInfo .name);
-      }
-      catch
-      {
-         nodes .sort ((a, b) => a .attr ("similarity") - b .attr ("similarity"))
-            .pop ()
-            .trigger ("dblclick");
-      }
-   }
-
-   update ()
-   {
-      switch (this .config .file .type)
-      {
-         case "NODES":
-            this .updateNodes ();
-            break;
-         case "PRIMITIVES":
-            this .updatePrimitives ();
-            break;
-      }
-   }
-
-   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;
-   }
-
-   updateNodes ()
+   filter ()
    {
-      const cmp = (a, b) => (a > b) - (a < b);
-
-      // Clear list.
-
-      this .list .empty ();
-
       const input = this .input .val () .toLowerCase () .trim ();
 
-      // Get protos.
-
-      const protoFilter = input
-         ? proto => StringSimilarity .compareTwoStrings (proto .name .toLowerCase (), input) > 0.4
-         : () => true;
-
-      const protos = Array .from (this .getProtos () .values ())
-         .filter (protoFilter)
-         .sort ((a, b) => cmp (a .name, b .name));
-
-      // Get supported nodes.
+      if (input)
+      {
+         const elements = Array .from (this .output .find (".node, .component"), e => $(e));
 
-      const nodeFilter = input
-         ? ConcreteNode => StringSimilarity .compareTwoStrings (ConcreteNode .typeName .toLowerCase (), input) > 0.4
-         : () => true;
+         // Hide nodes.
 
-      const nodes = [... this .browser .getConcreteNodes ()]
-         .filter (nodeFilter)
-         .sort ((a, b) => cmp (a .typeName, b .typeName))
-         .sort ((a, b) => cmp (a .componentInfo .name, b .componentInfo .name));
+         for (const node of elements)
+         {
+            if (!node .hasClass ("node"))
+               continue;
 
-      // Create list for proto elements
+            const similarity = StringSimilarity .compareTwoStrings (node .text () .toLowerCase (), input);
 
-      if (protos .length)
-      {
-         $("<li></li>")
-            .addClass ("component")
-            .attr ("name", "prototypes")
-            .text ("Prototypes")
-            .appendTo (this .list);
+            node .data ("similarity", similarity);
 
-         for (const proto of protos)
-         {
-            $("<li></li>")
-               .addClass ("node")
-               .text (proto .name)
-               .attr ("similarity", StringSimilarity .compareTwoStrings (proto .name .toLowerCase (), input))
-               .appendTo (this .list)
-               .on ("dblclick", () => this .createProto (proto));
+            if (similarity > 0.4)
+               node .removeClass ("hidden");
+            else
+               node .addClass ("hidden");
          }
-      }
 
-      // Create list for nodes elements.
+         // Hide components with only hidden nodes.
 
-      let componentName = "";
+         let
+            nodes  = 0,
+            hidden = 0;
 
-      for (const node of nodes)
-      {
-         if (node .componentInfo .name !== componentName)
+         for (const element of elements .reverse ())
          {
-            componentName = node .componentInfo .name;
+            if (element .hasClass ("component"))
+            {
+               if (hidden === nodes)
+                  element .addClass ("hidden")
+               else
+                  element .removeClass ("hidden");
 
-            $("<li></li>")
-               .addClass ("component")
-               .attr ("name", node .componentInfo .name)
-               .text (this .browser .getSupportedComponents () .get (node .componentInfo .name) .title)
-               .appendTo (this .list);
+               nodes  = 0,
+               hidden = 0;
+            }
+            else if (element .hasClass ("node"))
+            {
+               nodes  += 1;
+               hidden += element .hasClass ("hidden");
+            }
          }
-
-         $("<li></li>")
-            .addClass ("node")
-            .text (node .typeName)
-            .attr ("componentName", node .componentInfo .name)
-            .attr ("similarity", StringSimilarity .compareTwoStrings (node .typeName .toLowerCase (), input))
-            .appendTo (this .list)
-            .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name));
       }
-   }
-
-   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 ();
-   }
-
-   async createProto (proto)
-   {
-      UndoManager .shared .beginUndo (_("Create Proto Instance %s"), proto .name);
-
-      const node  = proto .createInstance (this .executionContext);
-
-      this .addNode (node);
-
-      UndoManager .shared .endUndo ();
-   }
-
-   addNode (node)
-   {
-      const field = this .field ?? $.try (() => this .node ?.getField (node .getValue () .getContainerField ()));
-
-      switch (field ?.getType ())
+      else
       {
-         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;
-         }
+         this .output .find (".node, .component") .removeClass ("hidden");
       }
-
-      node = node .getValue ();
-
-      requestAnimationFrame (() =>
-      {
-         const outlineEditor = require ("../Application/Window") .sidebar .outlineEditor;
-
-         outlineEditor .expandTo (node);
-         outlineEditor .selectNodeElement ($(`.node[node-id=${node .getId ()}]`));
-      });
    }
 
-   updatePrimitives ()
+   enter (event)
    {
-      const cmp = (a, b) => (a > b) - (a < b);
-
-      // Clear list.
-
-      this .list .empty ();
-
-      // Make filter.
+      if (event .key !== "Enter")
+         return;
 
-      const input = this .input .val () .toLowerCase () .trim ();
+      const input = this .input .val () .trim () .toLowerCase ();
 
-      if (input)
-         var filter = (object) => StringSimilarity .compareTwoStrings (object .typeName .toLowerCase (), input) > 0.4;
-      else
-         var filter = () => true;
+      if (!input)
+         return;
 
-      // Get primitives.
+      const nodes = Array .from (this .output .find (".node:not(.hidden)"), element => $(element));
 
-      const nodes = Primitives
-         .filter (filter)
-         .sort ((a, b) => cmp (a .typeName,  b .typeName))
-         .sort ((a, b) => cmp (a .componentInfo .name, b .componentInfo .name));
+      if (!nodes .length)
+         return;
 
-      // Create list elements.
+      const node = nodes .find (node => node .text () .toLowerCase () === input)
+         ?? nodes .sort ((a, b) => a .data ("similarity") - b .data ("similarity")) .at (-1);
 
-      let componentName = "";
+      node .trigger ("dblclick");
+   }
 
-      for (const node of nodes)
-      {
-         if (node .componentInfo .name !== componentName)
-         {
-            componentName = node .componentInfo .name;
+   update ()
+   {
+      this .output .children () .detach ();
 
-            $("<li></li>")
-               .addClass ("component")
-               .text (node .componentInfo .name)
-               .appendTo (this .list);
-         }
+      const pane = this .panes
+         .find (pane => pane .id === this .config .file .type);
 
-         $("<li></li>")
-            .addClass ("node")
-            .text (node .typeName)
-            .attr ("x3dSyntax", node .x3dSyntax)
-            .attr ("similarity", StringSimilarity .compareTwoStrings (node .typeName .toLowerCase (), input))
-            .appendTo (this .list)
-            .on ("dblclick", () => this .importX3D (node .typeName, node .x3dSyntax));
-      }
+      pane .update ();
    }
 
    async importX3D (typeName, x3dSyntax)
@@ -420,12 +240,16 @@ module .exports = new class Library extends Dialog
 
       UndoManager .shared .endUndo ();
 
-      requestAnimationFrame (() =>
-      {
-         const outlineEditor = require ("../Application/Window") .sidebar .outlineEditor;
+      await this .expandToAndSelectNode (node);
+   }
 
-         outlineEditor .expandTo (node);
-         outlineEditor .selectNodeElement ($(`.node[node-id=${node .getId ()}]`));
-      });
+   async expandToAndSelectNode (node)
+   {
+      await this .browser .nextFrame ();
+
+      const outlineEditor = require ("../Application/Window") .sidebar .outlineEditor;
+
+      outlineEditor .expandTo (node);
+      outlineEditor .selectNodeElement ($(`.node[node-id=${node .getId ()}]`));
    }
 }

package/src/Editors/LibraryPane.js

@@ -0,0 +1,53 @@
+"use strict";
+
+module .exports = class LibraryPanel
+{
+   #library;
+
+   constructor (library)
+   {
+      this .#library = library;
+   }
+
+   get browser ()
+   {
+      return this .#library .browser;
+   }
+
+   get executionContext ()
+   {
+      return this .#library .executionContext;
+   }
+
+   get node ()
+   {
+      return this .#library .node;
+   }
+
+   get field ()
+   {
+      return this .#library .field;
+   }
+
+   get element ()
+   {
+      return this .#library .element;
+   }
+
+   get output ()
+   {
+      return this .#library .output;
+   }
+
+   get importX3D ()
+   {
+      return this .#library .importX3D;
+   }
+
+   get expandToAndSelectNode ()
+   {
+      return this .#library .expandToAndSelectNode;
+   }
+
+   open () { }
+};