sunrize 1.5.5 → 1.5.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -69,19 +69,19 @@
     }
   ],
   "devDependencies": {
-    "@electron-forge/cli": "^7.2.0",
-    "@electron-forge/maker-deb": "^7.2.0",
-    "@electron-forge/maker-dmg": "^7.2.0",
-    "@electron-forge/maker-rpm": "^7.2.0",
-    "@electron-forge/maker-squirrel": "^7.2.0",
-    "@electron-forge/maker-zip": "^7.2.0",
-    "@electron-forge/publisher-github": "^7.2.0",
+    "@electron-forge/cli": "^7.3.0",
+    "@electron-forge/maker-deb": "^7.3.0",
+    "@electron-forge/maker-dmg": "^7.3.0",
+    "@electron-forge/maker-rpm": "^7.3.0",
+    "@electron-forge/maker-squirrel": "^7.3.0",
+    "@electron-forge/maker-zip": "^7.3.0",
+    "@electron-forge/publisher-github": "^7.3.0",
     "shell-tools": "^1.1.7"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^28.2.3",
+    "electron": "^29.0.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.4",
@@ -90,7 +90,7 @@
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.16",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.14.7",
+    "material-symbols": "^0.15.0",
     "md5": "^2.3.0",
     "monaco-editor": "^0.46.0",
     "node-clipboardy": "^1.0.3",
@@ -100,7 +100,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^9.2.6"
+    "x_ite": "^9.2.7"
   },
   "config": {
     "forge": {

package/src/Application/ActionKeys.js

@@ -4,6 +4,7 @@ const $ = require ("jquery");
 
 module .exports = class ActionKeys
 {
+   static None     = 0;
    static Shift    = 0b0001;
    static Control  = 0b0010;
    static Alt      = 0b0100;
@@ -17,19 +18,29 @@ module .exports = class ActionKeys
       this .callback = callback;
       this .value    = 0;
 
-      $(window)
-         .on (`keydown.${id}`, this .onkeydown .bind (this))
-         .on (`keyup.${id}`,   this .onkeyup   .bind (this));
+      this .connect ();
    }
 
    dispose ()
+   {
+      this .disconnect ();
+   }
+
+   connect ()
+   {
+      $(window)
+         .on (`keydown.${this .id}`, this .onkeydown .bind (this))
+         .on (`keyup.${this .id}`,   this .onkeyup   .bind (this));
+   }
+
+   disconnect ()
    {
       $(window) .off (`.${this .id}`);
    }
 
    onkeydown (event)
    {
-      //console .log (event .key)
+      // console .log (event .key)
 
       const value = this .value;
 

package/src/Application/Application.js

@@ -87,7 +87,7 @@ module .exports = class Application
       electron .ipcMain .on ("title",               (event, title)       => this .title = title);
       electron .ipcMain .on ("current-file",        (event, currentFile) => this .currentFile = currentFile);
       electron .ipcMain .on ("add-recent-document", (event, filePath)    => this .addRecentDocument (filePath));
-      electron .ipcMain .on ("change-menu",         (event, object)      => this .updateMenu (object));
+      electron .ipcMain .on ("update-menu",         (event, object)      => this .updateMenu (object));
       electron .ipcMain .on ("context-menu",        (event, id, menu)    => this .contextMenu (id, menu));
 
       electron .ipcMain .handle ("open-files", async (event, urls) => this .openFiles (urls));
@@ -637,7 +637,6 @@ module .exports = class Application
                   label: _("Grid Layout Tool"),
                   type: "radio",
                   checked: this .menuOptions .GridTool,
-                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
                   click: () =>
                   {
                      this .mainWindow .webContents .send ("grid-tool", "GridTool", !this .menuOptions .GridTool);
@@ -647,7 +646,6 @@ module .exports = class Application
                   label: _("Angle Grid Layout Tool"),
                   type: "radio",
                   checked: this .menuOptions .AngleGridTool,
-                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
                   click: () =>
                   {
                      this .mainWindow .webContents .send ("grid-tool", "AngleGridTool", !this .menuOptions .AngleGridTool);
@@ -657,7 +655,6 @@ module .exports = class Application
                   label: _("Axonometric Grid Layout Tool"),
                   type: "radio",
                   checked: this .menuOptions .AxonometricGridTool,
-                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
                   click: () =>
                   {
                      this .mainWindow .webContents .send ("grid-tool", "AxonometricGridTool", !this .menuOptions .AxonometricGridTool);
@@ -665,15 +662,63 @@ module .exports = class Application
                },
                { type: "separator" },
                {
-                  label: _("Show Grid Tool in Panel..."),
+                  label: _("Show Grid Tool Options in Panel..."),
                   accelerator: "CmdOrCtrl+G",
                   enabled: this .menuOptions .GridTool || this .menuOptions .AngleGridTool || this .menuOptions .AxonometricGridTool,
-                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
                   click: () =>
                   {
                      this .mainWindow .webContents .send ("grid-options");
                   },
                },
+               { type: "separator" },
+               {
+                  label: _("Activate Snap Target"),
+                  type: "checkbox",
+                  checked: this .menuOptions .SnapTarget,
+                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("activate-snap-target", !this .menuOptions .SnapTarget);
+                  },
+               },
+               {
+                  label: _("Activate Snap Source"),
+                  type: "checkbox",
+                  checked: this .menuOptions .SnapSource,
+                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("activate-snap-source", !this .menuOptions .SnapSource);
+                  },
+               },
+               {
+                  label: _("Center Snap Target in Selection"),
+                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("center-snap-target-in-selection");
+                  },
+               },
+               {
+                  label: _("Move Selection to Snap Target"),
+                  accelerator: "CmdOrCtrl+M",
+                  enabled: this .menuOptions .SnapTarget,
+                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("move-selection-to-snap-target");
+                  },
+               },
+               {
+                  label: _("Move Selection Center to Snap Target"),
+                  accelerator: "Shift+CmdOrCtrl+M",
+                  enabled: this .menuOptions .SnapTarget,
+                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("move-selection-center-to-snap-target");
+                  },
+               },
             ],
          },
          {

package/src/Application/Dashboard.js

@@ -4,6 +4,7 @@ const
    $         = require ("jquery"),
    X3D       = require ("../X3D"),
    Interface = require ("./Interface"),
+   Editor    = require("../Undo/Editor"),
    _         = require ("./GetText");
 
 module .exports = class Dashboard extends Interface
@@ -25,10 +26,8 @@ module .exports = class Dashboard extends Interface
          .appendTo (this .toolbar)
          .on ("click", () => this .hand ());
 
-      this .handButton .addClass ("active");
-
       this .arrowButton = $("<span></span>")
-         .addClass (["image-icon", "arrow"])
+         .addClass (["image-icon", "arrow", "active"])
          .attr ("title", _("Switch to edit mode."))
          .appendTo (this .toolbar)
          .on ("click", () => this .arrow ());
@@ -70,7 +69,7 @@ module .exports = class Dashboard extends Interface
    configure ()
    {
       this .config .file .setDefaultValues ({
-         pointer: "hand",
+         pointer: "arrow",
          play: false,
          panel: false,
       });
@@ -83,26 +82,30 @@ module .exports = class Dashboard extends Interface
          this .togglePanel (this .config .file .panel);
    }
 
-   hand ()
+   arrow ()
    {
-      this .config .file .pointer = "hand";
+      this .config .file .pointer = "arrow";
 
-      if (this .handButton .hasClass ("active"))
+      if (this .arrowButton .hasClass ("active"))
          return;
 
-      this .arrowButton .removeClass ("active");
-      this .handButton .addClass ("active");
+      this .handButton .removeClass ("active");
+      this .arrowButton .addClass ("active");
+
+      this .browser .addBrowserEvent ();
    }
 
-   arrow ()
+   hand ()
    {
-      this .config .file .pointer = "arrow";
+      this .config .file .pointer = "hand";
 
-      if (this .arrowButton .hasClass ("active"))
+      if (this .handButton .hasClass ("active"))
          return;
 
-      this .handButton .removeClass ("active");
-      this .arrowButton .addClass ("active");
+      this .arrowButton .removeClass ("active");
+      this .handButton .addClass ("active");
+
+      this .browser .addBrowserEvent ();
    }
 
    play (value)
@@ -123,31 +126,19 @@ module .exports = class Dashboard extends Interface
 
    viewAll ()
    {
-      const types = new Set ([X3D .X3DConstants .X3DBoundedObject, X3D .X3DConstants .X3DGeometryNode]);
-
       const
-         outlineEditor = require ("./Window") .sidebar .outlineEditor,
-         selection     = outlineEditor .sceneGraph .find (".node.selected");
+         selection = require ("./Selection"),
+         nodes     = selection .nodes;
 
-      if (selection .length)
+      if (nodes .length)
       {
          const
-            layerNode     = this .browser .getActiveLayer (),
-            viewpointNode = this .browser .getActiveViewpoint (),
-            bbox          = new X3D .Box3 (),
-            straighten    = this .browser .getBrowserOption ("StraightenHorizon");
-
-         for (const element of selection)
-         {
-            const node = outlineEditor .getNode ($(element)) .getInnerNode ();
-
-            if (!node .getType () .some (type => types .has (type)))
-               continue;
-
-            const modelMatrix = outlineEditor .getModelMatrix ($(element), false);
+            executionContext = this .browser .currentScene,
+            layerNode        = this .browser .getActiveLayer (),
+            viewpointNode    = this .browser .getActiveViewpoint (),
+            straighten       = this .browser .getBrowserOption ("StraightenHorizon");
 
-            bbox .add (node .getBBox (new X3D .Box3 ()) .copy () .multRight (modelMatrix));
-         }
+         const [values, bbox] = Editor .getModelMatricesAndBBoxes (executionContext, layerNode, nodes);
 
          if (!bbox .size .magnitude ())
             return;