sunrize 1.5.0 → 1.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^28.2.0",
+    "electron": "^28.2.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.4",
@@ -98,8 +98,9 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
+    "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^9.2.2"
+    "x_ite": "^9.2.4"
   },
   "config": {
     "forge": {

package/src/Application/Dashboard.js

@@ -56,6 +56,15 @@ module .exports = class Dashboard extends Interface
          .text ("wb_twilight")
          .appendTo (this .toolbar)
          .on ("click", () => this .straighten (!this .browser .getBrowserOption ("StraightenHorizon")));
+
+      $("<span></span>") .addClass ("separator") .appendTo (this .toolbar);
+
+      this .showPanelsButton = $("<span></span>")
+         .addClass (["material-symbols-outlined"])
+         .attr ("title", _("Toggle visibility of node panel."))
+         .text ("edit_note")
+         .appendTo (this .toolbar)
+         .on ("click", () => this .togglePanel ());
    }
 
    configure ()
@@ -63,11 +72,15 @@ module .exports = class Dashboard extends Interface
       this .fileConfig .setDefaultValues ({
          pointer: "hand",
          play: false,
+         panel: false,
       });
 
       this [this .fileConfig .pointer] ();
       this .play (this .fileConfig .play);
       this .straighten (this .browser .getBrowserOption ("StraightenHorizon"));
+
+      if (this .panel || this .fileConfig .panel)
+         this .togglePanel (!this .fileConfig .panel);
    }
 
    hand ()
@@ -156,5 +169,25 @@ module .exports = class Dashboard extends Interface
       else
          this .straightenButton .removeClass ("active");
    }
+
+   togglePanel (visible)
+   {
+      this .panel = require ("../Editors/Panel");
+
+      visible ??= this .panel .visible;
+
+      if (visible)
+      {
+         this .panel .hide ();
+         this .showPanelsButton .removeClass ("active");
+      }
+      else
+      {
+         this .panel .show ();
+         this .showPanelsButton .addClass ("active");
+      }
+
+      this .fileConfig .panel = !visible;
+   }
 };
 

package/src/Application/Interface.js

@@ -1,4 +1,4 @@
-"use strict"
+"use strict";
 
 const
    $           = require ("jquery"),
@@ -6,11 +6,11 @@ const
    md5         = require ("md5"),
    X3D         = require ("../X3D"),
    CSS         = require ("../Application/CSS"),
-   DataStorage = require ("./DataStorage")
+   DataStorage = require ("./DataStorage");
 
-require ("../Tools")
-require ("../Bits/Highlight")
-require ("../Bits/Beep")
+require ("../Tools");
+require ("../Bits/Highlight");
+require ("../Bits/Beep");
 
 Object .assign ($,
 {

package/src/Application/Selection.js

@@ -1,45 +1,104 @@
-module .exports = new class Selection
+const Interface = require ("./Interface");
+
+module .exports = new class Selection extends Interface
 {
    constructor ()
    {
-      this .nodes = new Map ();
+      super ("Sunrize.Selection.");
+
+      this .nodes = [ ];
+
+      this .setup ();
+   }
+
+   configure ()
+   {
+      this .clear ();
    }
 
    has (node)
    {
-      return this .nodes .has (node .valueOf ());
+      return this .nodes .includes (node .valueOf ());
+   }
+
+   clear ()
+   {
+      this .#clear ();
+      this .processInterests ();
+   }
+
+   set (node)
+   {
+      this .#clear (node);
+      this .#add (node);
+      this .processInterests ();
+   }
+
+   add (node)
+   {
+      this .#add (node);
+      this .processInterests ();
+   }
+
+   remove (node)
+   {
+      this .#remove (node);
+      this .processInterests ();
    }
 
-   clear (exclude /* private option */)
+   #clear (exclude)
    {
-      for (const node of this .nodes .keys ())
+      exclude = exclude ?.valueOf ();
+
+      for (const node of this .nodes)
       {
-         if (node === exclude ?.valueOf ())
+         if (node === exclude)
             continue;
 
          node .getTool () ?.setSelected (false);
          node .removeTool ("createOnSelection");
       }
 
-      this .nodes .clear ();
+      this .nodes = this .nodes .filter (n => n === exclude);
    }
 
-   set (node)
+   #add (node)
    {
-      this .clear (node);
-      this .add (node);
-   }
+      node = node .valueOf ();
 
-   add (node)
-   {
-      this .nodes .set (node .valueOf (), node .addTool ("createOnSelection"));
+      node .addTool ("createOnSelection");
       node .getTool () ?.setSelected (true);
+
+      this .nodes = this .nodes .filter (n => n !== node);
+
+      this .nodes .push (node);
    }
 
-   remove (node)
+   #remove (node)
    {
+      node = node .valueOf ();
+
       node .getTool () ?.setSelected (false);
       node .removeTool ("createOnSelection");
-      this .nodes .delete (node .valueOf ());
+
+      this .nodes = this .nodes .filter (n => n !== node);
+   }
+
+   interests = new Map ();
+
+   addInterest (key, callback)
+   {
+      this .interests .set (key, callback);
+   }
+
+   removeInterest (key)
+   {
+      this .interests .delete (key);
+   }
+
+   processInterests ()
+   {
+      for (const callback of this .interests .values ())
+         callback ();
    }
 }

package/src/Bits/X3DUOM.js

@@ -0,0 +1,12 @@
+const
+   $    = require ("jquery"),
+   fs   = require ("fs"),
+   path = require ("path");
+
+const X3DUOM = $($.parseXML (fs .readFileSync (path .join (__dirname, "..", "assets", "x3duom.xml"), "utf-8")));
+
+// emissiveColor fix
+X3DUOM .find (`AbstractNodeType[name=X3DOneSidedMaterialNode]`)
+   .append (X3DUOM .find ("field[name=emissiveColor]") .first () .clone ());
+
+module .exports = X3DUOM;

package/src/Editors/NodeInspector.js

@@ -1,18 +1,18 @@
-"use strict"
+"use strict";
 
 const
-   Interface = require ("../Application/Interface")
+   Interface = require ("../Application/Interface");
 
 module .exports = class NodeInspector extends Interface
 {
    constructor (element)
    {
-      super (`Sunrize.NodeInspector.${element .attr ("id")}.`)
+      super (`Sunrize.NodeInspector.${element .attr ("id")}.`);
 
-      this .nodeInspector = element
+      this .nodeInspector = element;
 
-      this .nodeInspector .text ("Node Inspector")
+      this .nodeInspector .text ("Node Inspector");
 
-      this .setup ()
+      this .setup ();
    }
-}
+};

package/src/Editors/OutlineView.js

@@ -1,17 +1,16 @@
 "use strict";
 
 const
-   $            = require ("jquery"),
-   electron     = require ("electron"),
-   fs           = require ("fs"),
-   path         = require ("path"),
-   util         = require ("util"),
-   jstree       = require ("jstree"),
-   X3D          = require ("../X3D"),
-   Interface    = require ("../Application/Interface"),
-   ActionKeys   = require ("../Application/ActionKeys"),
-   Traverse     = require ("../Application/Traverse"),
-   _            = require ("../Application/GetText");
+   $          = require ("jquery"),
+   electron   = require ("electron"),
+   util       = require ("util"),
+   jstree     = require ("jstree"),
+   X3D        = require ("../X3D"),
+   Interface  = require ("../Application/Interface"),
+   ActionKeys = require ("../Application/ActionKeys"),
+   Traverse   = require ("../Application/Traverse"),
+   X3DUOM     = require ("../Bits/X3DUOM"),
+   _          = require ("../Application/GetText");
 
 const
    _expanded     = Symbol (),
@@ -31,7 +30,6 @@ module .exports = class OutlineView extends Interface
       this .objects           = new Map (); // <id, node>
       this .actionKeys        = new ActionKeys ("OutlineView");
       this .onDemandToolNodes = new Set ();
-      this .x3duom            = $($.parseXML (fs .readFileSync (path .join (__dirname, "..", "assets", "x3duom.xml"), "utf-8")));
 
       this .globalConfig .setDefaultValues ({
          expandExternProtoDeclarations: true,
@@ -1577,7 +1575,7 @@ module .exports = class OutlineView extends Interface
       if (!node)
          return;
 
-      const description = this .x3duom .find (`ConcreteNode[name="${node .getTypeName ()}"] InterfaceDefinition`) .attr ("appinfo");
+      const description = X3DUOM .find (`ConcreteNode[name=${node .getTypeName ()}] InterfaceDefinition`) .attr ("appinfo");
 
       let title = "";
 
@@ -1594,7 +1592,7 @@ module .exports = class OutlineView extends Interface
          element     = $(event .currentTarget) .closest (".field, .special", this .sceneGraph),
          node        = this .objects .get (parseInt (element .attr ("node-id"))),
          field       = this .objects .get (parseInt (element .attr ("field-id"))),
-         description = this .x3duom .find (`ConcreteNode[name="${node .getTypeName ()}"] field[name="${field .getName ()}"]`) .attr ("description");
+         description = X3DUOM .find (`ConcreteNode[name=${node .getTypeName ()}] field[name=${field .getName ()}]`) .attr ("description");
 
       let title = "";
 
@@ -2829,14 +2827,14 @@ module .exports = class OutlineView extends Interface
    {
       const
          selection = require ("../Application/Selection"),
-         nodes     = this .sceneGraph .find (".primary, .selected")
+         nodes     = this .sceneGraph .find (".primary, .selected");
 
-      nodes .removeClass (["primary", "manually", "selected"])
+      nodes .removeClass (["primary", "manually", "selected"]);
 
       for (const element of nodes)
-         this .getNode ($(element)) .setUserData (_selected, false)
+         this .getNode ($(element)) .setUserData (_selected, false);
 
-      selection .clear ()
+      selection .clear ();
    }
 
    toggleVisibility (event)
@@ -2940,7 +2938,7 @@ module .exports = class OutlineView extends Interface
 
       const selection = require ("../Application/Selection");
 
-      Traverse .traverse ([... selection .nodes .values ()], Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      Traverse .traverse (selection .nodes, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
       {
          if (!node .setHidden)
             return
@@ -2961,7 +2959,7 @@ module .exports = class OutlineView extends Interface
    {
       const selection = require ("../Application/Selection")
 
-      Traverse .traverse (selection .nodes .size ? [... selection .nodes .values ()] : this .executionContext, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
+      Traverse .traverse (selection .nodes .length ? selection .nodes : this .executionContext, Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES | Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES, node =>
       {
          if (!node .setHidden)
             return