sunrize 1.11.12 → 1.11.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.11.12",
+  "version": "1.11.14",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -88,10 +88,10 @@
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
-    "@vscode/codicons": "^0.0.43",
+    "@vscode/codicons": "^0.0.44",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^39.2.6",
+    "electron": "^39.2.7",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -100,7 +100,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.40.1",
+    "material-symbols": "^0.40.2",
     "md5": "^2.3.0",
     "mime-types": "^3.0.2",
     "monaco-editor": "^0.55.1",
@@ -109,8 +109,8 @@
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
-    "update-electron-app": "^3.1.1",
-    "x_ite": "^12.2.1",
+    "update-electron-app": "^3.1.2",
+    "x_ite": "^12.2.3",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Document.js

@@ -67,8 +67,6 @@ module .exports = class Document extends Interface
          .on ("focusin",  () => this .onfocus ())
          .on ("focusout", () => this .onfocus ());
 
-      $(window) .on ("keydown", event => this .onkeydown (event));
-
       // File Menu
 
       electron .ipcRenderer .on ("open-files",       (event, urls)     => this .loadURL (urls [0])); // DEBUG
@@ -94,10 +92,6 @@ module .exports = class Document extends Interface
 
       electron .ipcRenderer .on ("delete", () => this .delete ());
 
-      // Selection Menu
-
-      electron .ipcRenderer .on ("select-all", () => this .selectAll ());
-
       // View Menu
 
       electron .ipcRenderer .on ("primitive-quality",              (event, value) => this .setPrimitiveQuality (value));
@@ -168,9 +162,12 @@ module .exports = class Document extends Interface
       // Connect for Snap Target and Snap Source.
 
       $(this .browser .element)
-         .on ("mousedown", event => this .onmousedown (event))
-         .on ("mouseup",   event => this .onsnaptool (event))
-         .on ("mouseup",   event => this .onselect (event));
+         .on ("mousedown",   event => this .onmousedown (event))
+         .on ("mouseup",     event => this .onsnaptool (event))
+         .on ("mouseup",     event => this .onselect (event))
+         .on ("contextmenu", event => this .showBrowserContextMenu (event));
+
+      electron .ipcRenderer .on ("document", (event, key, ... args) => this [key] (... args));
 
       // Load components.
 
@@ -356,28 +353,6 @@ module .exports = class Document extends Interface
       return true;
    }
 
-   // Menu Accelerators
-
-   onkeydown (event)
-   {
-      switch (event .key)
-      {
-         case "a":
-         {
-            if (this .activeElementIsInputOrOutput ())
-               break;
-
-            if (ActionKeys .value === ActionKeys .CommandOrControl)
-            {
-               this .selectAll ();
-               return false;
-            }
-
-            break;
-         }
-      }
-   }
-
    /*
     * File Menu
     */
@@ -661,15 +636,6 @@ Viewpoint {
       this .sidebar .outlineEditor .deleteNodes ();
    }
 
-   /*
-    * Selection Menu
-    */
-
-   selectAll ()
-   {
-      this .sidebar .outlineEditor .selectAll ();
-   }
-
    /*
     * View Menu
     */
@@ -1027,7 +993,7 @@ Viewpoint {
          {
             switch (ActionKeys .value)
             {
-               case ActionKeys .None:
+               case ActionKeys .Shift:
                {
                   if (this .#snapTarget ?._visible .getValue ())
                      break;
@@ -1039,7 +1005,7 @@ Viewpoint {
                   this .#snapTarget .onmousedown (event, true);
                   break;
                }
-               case ActionKeys .Option:
+               case ActionKeys .Shift | ActionKeys .Option:
                {
                   if (this .#snapSource ?._visible .getValue ())
                      break;
@@ -1087,10 +1053,6 @@ Viewpoint {
       if (this .#pointer .distance (pointer) > this .browser .getRenderingProperty ("ContentScale"))
          return;
 
-      // Stop event propagation.
-
-      event .preventDefault ();
-
       // Select or deselect.
 
       const outlineEditor = this .sidebar .outlineEditor;
@@ -1262,4 +1224,43 @@ Viewpoint {
       menu .SnapTarget = this .#snapTarget ?._visible .getValue () ?? false;
       menu .SnapSource = this .#snapSource ?._visible .getValue () ?? false;
    }
+
+   /**
+    * Context Menu
+    */
+
+   showBrowserContextMenu (event)
+   {
+      if (event .shiftKey || event .ctrlKey || event .metaKey)
+         return;
+
+      const
+         activeLayer = this .browser .getActiveLayer (),
+         viewpoints  = activeLayer .getViewpoints () .get ();
+
+      const menu = [
+         {
+            label: _("Viewpoints"),
+            submenu: viewpoints .filter ((_, index) => index > 0) .map ((viewpointNode, index) => ({
+               label: `${viewpointNode ._description .getValue () || viewpointNode .getDisplayName () || `VP${index + 1}}`}`,
+               args: ["bindViewpoint", index + 1],
+            })),
+         },
+      ];
+
+      electron .ipcRenderer .send ("context-menu", "document", menu);
+   }
+
+   bindViewpoint (index)
+   {
+      const
+         activeLayer   = this .browser .getActiveLayer (),
+         viewpoints    = activeLayer .getViewpoints () .get (),
+         viewpointNode = viewpoints [index];
+
+      if (!viewpointNode)
+         return;
+
+      viewpointNode ._set_bind = true;
+   }
 };

package/src/Application/Tabs.js

@@ -108,6 +108,7 @@ module .exports = new class Tabs
       this .forwardToActiveTab ("move-selection-to-snap-target");
       this .forwardToActiveTab ("move-selection-center-to-snap-target");
 
+      this .forwardToActiveTab ("document");
       this .forwardToActiveTab ("script-editor");
       this .forwardToActiveTab ("animation-members-list");
       this .forwardToActiveTab ("outline-editor");

package/src/Editors/OutlineView.js

@@ -54,6 +54,7 @@ module .exports = class OutlineView extends Interface
       this .browser .getBrowserOptions () ._ColorSpace .addInterest ("updateSceneGraph", this);
       this .browser ._activeLayer .addInterest ("updateActiveLayer", this);
 
+      electron .ipcRenderer .on ("select-all",              () => this .selectAll ());
       electron .ipcRenderer .on ("deselect-all",            () => this .deselectAll ());
       electron .ipcRenderer .on ("hide-unselected-objects", () => this .hideUnselectedObjects ());
       electron .ipcRenderer .on ("show-selected-objects",   () => this .showSelectedObjects ());

package/src/Tools/SnapTool/SnapSource.js

@@ -7,7 +7,7 @@ const
 
 class SnapSource extends X3DSnapNodeTool
 {
-   toolModifiers = ActionKeys .Option;
+   toolModifiers = ActionKeys .Shift | ActionKeys .Option;
 
    async initializeTool ()
    {

package/src/Tools/SnapTool/SnapTarget.js

@@ -7,6 +7,8 @@ const
 
 class SnapTarget extends X3DSnapNodeTool
 {
+   toolModifiers = ActionKeys .Shift;
+
    #transformTools = [ ];
    #changing       = Symbol ();