sunrize 1.1.7 → 1.1.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -61,7 +61,7 @@
     "@electron-forge/maker-rpm": "^6.4.2",
     "@electron-forge/maker-squirrel": "^6.4.2",
     "@electron-forge/maker-zip": "^6.4.2",
-    "electron": "^27.0.2"
+    "electron": "^27.0.4"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
@@ -74,7 +74,7 @@
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.16",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.13.1",
+    "material-symbols": "^0.14.0",
     "md5": "^2.3.0",
     "monaco-editor": "^0.44.0",
     "node-clipboardy": "^1.0.3",
@@ -82,7 +82,7 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^9.0.1"
+    "x_ite": "^9.0.3"
   },
   "config": {
     "forge": {

package/src/Application/Application.js

@@ -651,57 +651,82 @@ module .exports = class Application
             contextIsolation: false,
             webviewTag: true,
          },
-      })
+      });
 
-      this .mainWindow = window
+      this .mainWindow = window;
 
-      window .setVisibleOnAllWorkspaces (true)
-      window .once ("ready-to-show", () => window .show ())
+      window .setVisibleOnAllWorkspaces (true);
+      window .once ("ready-to-show", () => window .show ());
 
-      window .on ("maximize", ()          => this .maximize ())
-      window .on ("unmaximize", ()        => this .unmaximize ())
-      window .on ("enter-full-screen", () => this .enterFullscreen ())
-      window .on ("leave-full-screen", () => this .leaveFullscreen ())
-      window .on ("blur", ()              => this .blur ())
-      window .on ("close", (event)        => this .close (event))
+      window .on ("maximize", ()          => this .maximize ());
+      window .on ("unmaximize", ()        => this .unmaximize ());
+      window .on ("enter-full-screen", () => this .enterFullscreen ());
+      window .on ("leave-full-screen", () => this .leaveFullscreen ());
+      window .on ("blur", ()              => this .blur ());
+      window .on ("close", (event)        => this .close (event));
 
       if (this .config .maximized)
-         window .maximize ()
+         window .maximize ();
 
-      window .setFullScreen (this .config .fullscreen)
+      window .setFullScreen (this .config .fullscreen);
 
-      await window .loadFile (path .join (__dirname, "../assets/html/application.html"))
+      await window .loadFile (path .join (__dirname, "../assets/html/application.html"));
    }
 
    activate ()
    {
       if (electron .BrowserWindow .getAllWindows () .length)
-         return
+         return;
 
-      this .createWindow ()
+      this .createWindow ();
    }
 
    contextMenu (id, menu)
    {
       electron .Menu .buildFromTemplate (this .createMenuTemplate (id, menu))
-         .popup ({ window: this .mainWindow })
+         .popup ({ window: this .mainWindow });
    }
 
    createMenuTemplate (id, menu)
    {
-      const template = [ ]
+      const template = [ ];
 
-      for (const menuItem of menu)
+      for (const menuItem of this .filterSeparators (menu))
       {
          if (menuItem .submenu)
-            menuItem .submenu = this .createMenuTemplate (id, menuItem .submenu)
+            menuItem .submenu = this .createMenuTemplate (id, menuItem .submenu);
          else
-            menuItem .click = () => this .mainWindow .webContents .send (id, ...menuItem .args)
+            menuItem .click = () => this .mainWindow .webContents .send (id, ... menuItem .args);
+
+         template .push (menuItem);
+      }
+
+      return template;
+   }
+
+   filterSeparators (menu)
+   {
+      const filtered = [ ];
+
+      let separator = false;
+
+      for (const menuItem of menu .filter (menuItem => menuItem .visible ?? true))
+      {
+         if (separator && menuItem .type === "separator")
+            continue;
 
-         template .push (menuItem)
+         separator = menuItem .type === "separator";
+
+         filtered .push (menuItem);
       }
 
-      return template
+      if (filtered .at (0) ?.type === "separator")
+         filtered .shift ();
+
+      if (filtered .at (-1) ?.type === "separator")
+         filtered .pop ();
+
+      return filtered;
    }
 
    /**

package/src/Components/Grouping/StaticGroup.js

@@ -58,9 +58,9 @@ Object .defineProperties (StaticGroup,
    {
       value: "StaticGroup",
    },
-   componentName:
+   componentInfo:
    {
-      value: "Grouping",
+      value: Object .freeze ({ name: "Grouping", level: 3 }),
    },
    containerField:
    {
@@ -68,7 +68,7 @@ Object .defineProperties (StaticGroup,
    },
    specificationRange:
    {
-      value: Object .freeze (["3.0", "Infinity"]),
+      value: Object .freeze ({ from: "3.0", to: "Infinity" }),
    },
    fieldDefinitions:
    {

package/src/Editors/Library.js

@@ -125,7 +125,7 @@ module .exports = new class Library extends Dialog
       {
          const ConcreteNode = this .browser .getConcreteNode (X3D .HTMLSupport .getNodeTypeName (input))
 
-         this .createNode (ConcreteNode .typeName, ConcreteNode .componentName)
+         this .createNode (ConcreteNode .typeName, ConcreteNode .componentInfo .name)
       }
       catch
       {
@@ -167,7 +167,7 @@ module .exports = new class Library extends Dialog
       const nodes = [... this .browser .getConcreteNodes ()]
          .filter (filter)
          .sort ((a, b) => cmp (a .typeName, b .typeName))
-         .sort ((a, b) => cmp (a .componentName, b .componentName))
+         .sort ((a, b) => cmp (a .componentInfo .name, b .componentInfo .name))
 
       // Create list elements.
 
@@ -175,14 +175,14 @@ module .exports = new class Library extends Dialog
 
       for (const node of nodes)
       {
-         if (node .componentName !== componentName)
+         if (node .componentInfo .name !== componentName)
          {
-            componentName = node .componentName
+            componentName = node .componentInfo .name
 
             $("<li></li>")
                .addClass ("component")
-               .attr ("name", node .componentName)
-               .text (this .browser .getSupportedComponents () .get (node .componentName) .title)
+               .attr ("name", node .componentInfo .name)
+               .text (this .browser .getSupportedComponents () .get (node .componentInfo .name) .title)
                .appendTo (this .list)
          }
 
@@ -190,7 +190,7 @@ module .exports = new class Library extends Dialog
             .addClass ("node")
             .text (node .typeName)
             .appendTo (this .list)
-            .on ("dblclick", () => this .createNode (node .typeName, node .componentName))
+            .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name))
       }
    }
 
@@ -229,7 +229,7 @@ module .exports = new class Library extends Dialog
       const nodes = Primitives
          .filter (filter)
          .sort ((a, b) => cmp (a .typeName,  b .typeName))
-         .sort ((a, b) => cmp (a .componentName, b .componentName))
+         .sort ((a, b) => cmp (a .componentInfo .name, b .componentInfo .name))
 
       // Create list elements.
 
@@ -237,13 +237,13 @@ module .exports = new class Library extends Dialog
 
       for (const node of nodes)
       {
-         if (node .componentName !== componentName)
+         if (node .componentInfo .name !== componentName)
          {
-            componentName = node .componentName
+            componentName = node .componentInfo .name
 
             $("<li></li>")
                .addClass ("component")
-               .text (node .componentName)
+               .text (node .componentInfo .name)
                .appendTo (this .list)
          }
 

package/src/Editors/OutlineEditor.js

@@ -145,9 +145,9 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                args: ["resetToDefaultValue", element .attr ("id"), executionContext .getId (), node .getId (), field .getId ()],
             },
             {
-               label: "Add Event",
+               label: "Trigger Event",
                visible: field .getAccessType () !== X3D .X3DConstants .outputOnly,
-               args: ["addEvent", element .attr ("id"), node .getId (), field .getId ()],
+               args: ["triggerEvent", element .attr ("id"), node .getId (), field .getId ()],
             },
          ]
       }
@@ -458,7 +458,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          Editor .setFieldValue (executionContext, node, field, fieldDefinition .value)
    }
 
-   addEvent (id, nodeId, fieldId)
+   triggerEvent (id, nodeId, fieldId)
    {
       const field = this .objects .get (fieldId)
 

package/src/Editors/Primitives.js

@@ -2,7 +2,7 @@
 
 module .exports = [
    {
-      componentName: "EnvironmentalEffects",
+      componentInfo: { name: "EnvironmentalEffects" },
       typeName: "Background Gray",
       x3dSyntax: `
 DEF Gray Background {
@@ -11,7 +11,7 @@ DEF Gray Background {
 `
    },
    {
-      componentName: "EnvironmentalEffects",
+      componentInfo: { name: "EnvironmentalEffects" },
       typeName: "Background Summer",
       x3dSyntax: `
 DEF Summer Background {
@@ -44,7 +44,7 @@ DEF Summer Background {
    }`
    },
    {
-      componentName: "EnvironmentalEffects",
+      componentInfo: { name: "EnvironmentalEffects" },
       typeName: "Background Sunny",
       x3dSyntax: `
 DEF Sunny Background {
@@ -70,7 +70,7 @@ DEF Sunny Background {
 `
    },
    {
-      componentName: "EnvironmentalEffects",
+      componentInfo: { name: "EnvironmentalEffects" },
       typeName: "Background White",
       x3dSyntax: `
 DEF White Background {
@@ -79,7 +79,7 @@ DEF White Background {
 `
    },
    {
-      componentName: "EnvironmentalSensor",
+      componentInfo: { name: "EnvironmentalSensor" },
       typeName: "ProximitySensor",
       x3dSyntax: `
 DEF ProximitySensor Transform {
@@ -90,7 +90,7 @@ DEF ProximitySensor Transform {
 `
    },
    {
-      componentName: "EnvironmentalSensor",
+      componentInfo: { name: "EnvironmentalSensor" },
       typeName: "TransformSensor",
       x3dSyntax: `
 DEF TransformSensor Transform {
@@ -101,7 +101,7 @@ DEF TransformSensor Transform {
 `
    },
    {
-      componentName: "EnvironmentalSensor",
+      componentInfo: { name: "EnvironmentalSensor" },
       typeName: "VisibilitySensor",
       x3dSyntax: `
 DEF VisibilitySensor Transform {
@@ -112,7 +112,7 @@ DEF VisibilitySensor Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "Arc2D",
       x3dSyntax: `
 DEF Arc2D Transform {
@@ -128,7 +128,7 @@ DEF Arc2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "ArcClose2D",
       x3dSyntax: `
 DEF ArcClose2D Transform {
@@ -142,7 +142,7 @@ DEF ArcClose2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "Circle2D",
       x3dSyntax: `
 DEF Circle2D Transform {
@@ -158,7 +158,7 @@ DEF Circle2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "Disk2D",
       x3dSyntax: `
 DEF Disk2D Transform {
@@ -172,7 +172,7 @@ DEF Disk2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "Polyline2D",
       x3dSyntax: `
 DEF Polyline2D Transform {
@@ -196,7 +196,7 @@ DEF Polyline2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "Polypoint2D",
       x3dSyntax: `
 DEF Polypoint2D Transform {
@@ -220,7 +220,7 @@ DEF Polypoint2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "Rectangle2D",
       x3dSyntax: `
 DEF Rectangle2D Transform {
@@ -234,7 +234,7 @@ DEF Rectangle2D Transform {
 `
    },
    {
-      componentName: "Geometry2D",
+      componentInfo: { name: "Geometry2D" },
       typeName: "TriangleSet2D",
       x3dSyntax: `
 DEF TriangleSet2D Transform {
@@ -257,7 +257,7 @@ DEF TriangleSet2D Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "Box",
       x3dSyntax: `
 DEF Box Transform {
@@ -271,7 +271,7 @@ DEF Box Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "Cone",
       x3dSyntax: `
 DEF Cone Transform {
@@ -285,7 +285,7 @@ DEF Cone Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "Cylinder",
       x3dSyntax: `
 DEF Cylinder Transform {
@@ -299,7 +299,7 @@ DEF Cylinder Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "ElevationGrid",
       x3dSyntax: `
 DEF ElevationGrid Transform {
@@ -316,7 +316,7 @@ DEF ElevationGrid Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "Extrusion",
       x3dSyntax: `
 DEF Extrusion Transform {
@@ -330,7 +330,7 @@ DEF Extrusion Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "IndexedFaceSet",
       x3dSyntax: `
 DEF IndexedFaceSet Transform {
@@ -344,7 +344,7 @@ DEF IndexedFaceSet Transform {
 `
    },
    {
-      componentName: "Geometry3D",
+      componentInfo: { name: "Geometry3D" },
       typeName: "Sphere",
       x3dSyntax: `
 DEF Sphere Transform {
@@ -358,7 +358,7 @@ DEF Sphere Transform {
 `
    },
    {
-      componentName: "Text",
+      componentInfo: { name: "Text" },
       typeName: "Text",
       x3dSyntax: `
 DEF Text Transform {
@@ -374,7 +374,7 @@ DEF Text Transform {
 `
    },
    {
-      componentName: "Rendering",
+      componentInfo: { name: "Rendering" },
       typeName: "IndexedLineSet",
       x3dSyntax: `
 DEF IndexedLineSet Transform {
@@ -427,7 +427,7 @@ DEF IndexedLineSet Transform {
 `
    },
    {
-      componentName: "Rendering",
+      componentInfo: { name: "Rendering" },
       typeName: "PointSet",
       x3dSyntax: `
 DEF PointSet Transform {

package/src/Tools.js

@@ -15,7 +15,7 @@ Object .assign (X3D .X3DNode .prototype,
    },
    addTool (action = "createOnDemand")
    {
-      const module = path .resolve (__dirname, "Tools", this .constructor .componentName, this .constructor .typeName + "Tool.js");
+      const module = path .resolve (__dirname, "Tools", this .constructor .componentInfo .name, this .constructor .typeName + "Tool.js");
 
       if (!fs .existsSync (module))
          return this;

package/src/Undo/Editor.js

@@ -69,7 +69,7 @@ module .exports = class Editor
 
       Traverse .traverse (nodes, 0, node =>
       {
-         componentNames .add (node .getComponentName ())
+         componentNames .add (node .getComponentInfo () .name)
          children .add (node)
 
          for (const field of node .getFields ())
@@ -558,7 +558,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          if (node .getScene () !== scene)
             return
 
-         components .add (node .getComponentName ())
+         components .add (node .getComponentInfo () .name)
       })
 
       return components