sunrize 1.0.91 → 1.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.0.91",
+  "version": "1.1.1",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -56,32 +56,34 @@
     }
   ],
   "devDependencies": {
-    "@electron-forge/cli": "^6.2.1",
-    "@electron-forge/maker-deb": "^6.2.1",
-    "@electron-forge/maker-rpm": "^6.2.1",
-    "@electron-forge/maker-squirrel": "^6.2.1",
-    "@electron-forge/maker-zip": "^6.2.1"
+    "@electron-forge/cli": "^6.4.1",
+    "@electron-forge/maker-deb": "^6.4.1",
+    "@electron-forge/maker-rpm": "^6.4.1",
+    "@electron-forge/maker-squirrel": "^6.4.1",
+    "@electron-forge/maker-zip": "^6.4.1"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
     "css-element-queries": "^1.2.3",
-    "electron": "^25.4.0",
+    "electron": "^26.1.0",
+    "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.1",
     "fullname": "^4.0.1",
-    "jquery": "^3.7.0",
+    "jquery": "^3.7.1",
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.15",
-    "material-icons": "^1.13.9",
-    "material-symbols": "^0.10.3",
+    "material-icons": "^1.13.10",
+    "material-symbols": "^0.11.0",
     "md5": "^2.3.0",
     "monaco-editor": "^0.41.0",
-    "node-localstorage": "^2.2.1",
+    "node-clipboardy": "^1.0.3",
+    "node-localstorage": "^3.0.5",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^8.11.16"
+    "x_ite": "^8.12.0"
   },
   "config": {
     "forge": {

package/src/{sunrize/Application → Application}/Application.js

@@ -2,6 +2,8 @@
 
 const
    electron     = require ("electron"),
+   prompt       = require ("electron-prompt"),
+   clipboardy   = require ("node-clipboardy"),
    url          = require ("url"),
    path         = require ("path"),
    fs           = require ("fs"),
@@ -18,6 +20,8 @@ const localStorage = new LocalStorage (path .join (electron .app .getPath ("user
 module .exports = class Application
 {
    config = new DataStorage (localStorage, "Sunrize.Application.")
+   mainMenu = [ ]
+   openURLValue = ""
    exportPath = new Map ()
 
    static run ()
@@ -35,12 +39,13 @@ module .exports = class Application
 
       process .env .ELECTRON_DISABLE_SECURITY_WARNINGS = "true"
 
-      this .menuLabels = {
+      this .menuOptions = {
+         defaultEditMenu: false,
          undoLabel: _ ("Undo"),
          redoLabel: _ ("Redo"),
       }
 
-      this .config .addDefaultValues ({
+      this .config .setDefaultValues ({
          position: [undefined, undefined],
          size: [1100, 680],
          maximized: false,
@@ -55,9 +60,10 @@ module .exports = class Application
          timings: false,
       })
 
-      Template .create (path .join (__dirname, "../../html/application-template.html"))
-      Template .create (path .join (__dirname, "../../html/document-template.html"))
-      Template .create (path .join (__dirname, "../../themes/default-template.css"))
+      Template .create (path .join (__dirname, "../assets/html/application-template.html"))
+      Template .create (path .join (__dirname, "../assets/html/window-template.html"))
+      Template .create (path .join (__dirname, "../assets/themes/default-template.css"))
+      Template .create (path .join (__dirname, "../assets/themes/prompt-template.css"))
 
       this .setup ()
    }
@@ -75,7 +81,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 ("save-file",    (event, filePath)    => this .saveFile (filePath))
-      electron .ipcMain .on ("change-menu",  (event, object)      => this .changeMenu (object))
+      electron .ipcMain .on ("change-menu",  (event, object)      => this .updateMenu (object))
       electron .ipcMain .on ("context-menu", (event, id, menu)    => this .contextMenu (id, menu))
 
       electron .ipcMain .handle ("file-path", async (event, basename) => await this .showSaveDialog (basename))
@@ -83,7 +89,7 @@ module .exports = class Application
 
       this .fullname = await require ("fullname") ()
 
-      await this .createMenu ()
+      await this .updateMenu ()
       await this .createWindow ()
 
       this .openFiles (process .argv .slice (2) .map (filePath => url .pathToFileURL (filePath) .href))
@@ -111,21 +117,28 @@ module .exports = class Application
       this .mainWindow .title = `${title} · Sunrize`
    }
 
-   changeMenu (object = { })
+   pushMenu (menu)
    {
-      Object .assign (this .menuLabels, object)
+      this .mainMenu .push (menu)
+      electron .Menu .setApplicationMenu (menu)
+   }
 
-      this .createMenu ()
+   popMenu ()
+   {
+      this .mainMenu .pop ()
+      electron .Menu .setApplicationMenu (this .mainMenu .at (-1))
    }
 
-   createMenu ()
+   updateMenu (object = { })
    {
+      Object .assign (this .menuOptions, object)
+
       const exportPath = this .exportPath .get (this .currentFile)
 
       const menu = electron .Menu .buildFromTemplate ([
          {
-            label: "Sunrize",
             role: "appMenu",
+            label: "Sunrize",
          },
          {
             role: "fileMenu",
@@ -152,6 +165,43 @@ module .exports = class Application
                      this .openFiles (response .filePaths .map (filePath => url .pathToFileURL (filePath) .href))
                   },
                },
+               {
+                  label: _ ("Open URL..."),
+                  accelerator: "Shift+CmdOrCtrl+O",
+                  click: async () =>
+                  {
+                     const clipboard = await this .clipboard ()
+
+                     this .pushMenu (electron .Menu .buildFromTemplate ([
+                        {
+                           role: "appMenu",
+                           label: "Sunrize",
+                        },
+                        { role: "editMenu" },
+                     ]))
+
+                     const response = await prompt ({
+                        title: "Open URL...",
+                        label: "Enter URL for opening in new tab:",
+                        type: "input",
+                        value: clipboard .match (/^(?:https?|file|ftp|smb):\/\/.+/) ? clipboard : this .openURLValue,
+                        inputAttrs: {
+                           type: "url",
+                           placeholder: "https://example.org",
+                        },
+                        width: 500,
+                        customStylesheet: path .join (__dirname, "../assets/themes/prompt.css"),
+                     },
+                     this .mainWindow)
+
+                     this .popMenu ()
+
+                     if (response === null)
+                        return
+
+                     this .openFiles ([this .openURLValue = response])
+                  },
+               },
                {
                   role: "recentdocuments",
                   submenu: [
@@ -248,7 +298,7 @@ module .exports = class Application
 
                      this .mainWindow .webContents .send ("export-as", response .filePath)
 
-                     this .changeMenu ()
+                     this .updateMenu ()
                   },
                },
                { type: "separator" },
@@ -266,22 +316,23 @@ module .exports = class Application
                },
             ],
          },
+         this .menuOptions .defaultEditMenu ? { role: "editMenu" } :
          {
             role: "editMenu",
             submenu: [
                {
-                  label: this .menuLabels .undoLabel,
+                  label: this .menuOptions .undoLabel,
                   accelerator: "CmdOrCtrl+Z",
-                  enabled: this .menuLabels .undoLabel !== _ ("Undo"),
+                  enabled: this .menuOptions .undoLabel !== _ ("Undo"),
                   click: () =>
                   {
                      this .mainWindow .webContents .send ("undo")
                   },
                },
                {
-                  label: this .menuLabels .redoLabel,
+                  label: this .menuOptions .redoLabel,
                   accelerator: "Shift+CmdOrCtrl+Z",
-                  enabled: this .menuLabels .redoLabel !== _ ("Redo"),
+                  enabled: this .menuOptions .redoLabel !== _ ("Redo"),
                   click: () =>
                   {
                      this .mainWindow .webContents .send ("redo")
@@ -320,6 +371,11 @@ module .exports = class Application
                      this .mainWindow .webContents .send ("delete")
                   },
                },
+            ],
+         },
+         {
+            label: _ ("Selection"),
+            submenu: [
                {
                   label: _ ("Select All"),
                   accelerator: "CmdOrCtrl+A",
@@ -328,11 +384,6 @@ module .exports = class Application
                      this .mainWindow .webContents .send ("select-all")
                   },
                },
-            ],
-         },
-         {
-            label: _ ("Selection"),
-            submenu: [
                {
                   label: _ ("Deselect All"),
                   accelerator: "Shift+CmdOrCtrl+A",
@@ -342,6 +393,28 @@ module .exports = class Application
                   },
                },
                { type: "separator" },
+               {
+                  label: _ ("Hide Unselected Objects"),
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("hide-unselected-objects")
+                  },
+               },
+               {
+                  label: _ ("Show Selected Objects"),
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("show-selected-objects")
+                  },
+               },
+               {
+                  label: _ ("Show All Objects"),
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("show-all-objects")
+                  },
+               },
+               { type: "separator" },
                {
                   label: _ ("Remove Empty Groups"),
                   click: () =>
@@ -366,6 +439,14 @@ module .exports = class Application
                   role: "toggleDevTools",
                   visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
                },
+               {
+                  label: "Reload Tab",
+                  visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("reload")
+                  },
+               },
                {
                   label: "Toggle Tab Developer Tools",
                   visible: process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT",
@@ -534,19 +615,28 @@ module .exports = class Application
          },
          {
             role: "help",
-            submenu: [ ],
+            submenu: [
+               {
+                  label: "Learn More",
+                  click: async () =>
+                  {
+                     await electron .shell .openExternal ("https://create3000.github.io/x_ite/")
+                  },
+               },
+            ],
          },
       ])
 
-      electron .Menu .setApplicationMenu (menu)
+      this .mainMenu [0] = menu
 
-      this .mainMenu = menu
+      if (this .mainMenu .length === 1)
+         electron .Menu .setApplicationMenu (menu)
    }
 
    async createWindow ()
    {
       const window = new electron .BrowserWindow ({
-         icon: path .join (__dirname, "../../images/icon.png"),
+         icon: path .join (__dirname, "../assets/images/icon.png"),
          x: this .config .position [0],
          y: this .config .position [1],
          width: Math .max (this .config .getDefaultValue ("size") [0] / 4, this .config .size [0]),
@@ -556,7 +646,7 @@ module .exports = class Application
          backgroundColor: electron .nativeTheme .shouldUseDarkColors ? "rgb(28, 28, 30)" : "rgb(242, 242, 247)",
          show: false,
          webPreferences: {
-            preload: path .join (__dirname, "../../html/application.js"),
+            preload: path .join (__dirname, "../assets/html/application.js"),
             nodeIntegration: true,
             contextIsolation: false,
             webviewTag: true,
@@ -580,7 +670,7 @@ module .exports = class Application
 
       window .setFullScreen (this .config .fullscreen)
 
-      await window .loadFile (path .join (__dirname, "../../html/application.html"))
+      await window .loadFile (path .join (__dirname, "../assets/html/application.html"))
    }
 
    activate ()
@@ -631,13 +721,28 @@ module .exports = class Application
 
    async showOpenDialog (defaultPath)
    {
-      return await electron .dialog .showOpenDialog ({
+      this .pushMenu (electron .Menu .buildFromTemplate ([
+         {
+            role: "appMenu",
+            label: "Sunrize",
+         },
+         { role: "editMenu" },
+      ]))
+
+      const response = await electron .dialog .showOpenDialog ({
          defaultPath: defaultPath,
          properties: ["openFile", "multiSelections"],
-         filters : [
-            {name: "X3D Document", extensions: ["x3d", "x3dz", "x3dj", "x3djz", "x3dv", "x3dvz", "wrl", "wrz", "wrl.gz", "vrml", "gltf", "glb", "obj", "stl", "ply", "svg"]},
+         filters: [
+            {
+               name: "X3D Document",
+               extensions: ["x3d", "x3dz", "x3dj", "x3djz", "x3dv", "x3dvz", "wrl", "wrz", "wrl.gz", "vrml", "gltf", "glb", "obj", "stl", "ply", "svg"],
+            },
          ],
       })
+
+      this .popMenu ()
+
+      return response
    }
 
    saveFile (filePath)
@@ -647,7 +752,15 @@ module .exports = class Application
 
    async showSaveDialog (defaultPath)
    {
-      return await electron .dialog .showSaveDialog ({
+      this .pushMenu (electron .Menu .buildFromTemplate ([
+         {
+            role: "appMenu",
+            label: "Sunrize",
+         },
+         { role: "editMenu" },
+      ]))
+
+      const response = await electron .dialog .showSaveDialog ({
          defaultPath: defaultPath,
          properties: ["createDirectory", "showOverwriteConfirmation"],
          filters : [
@@ -659,17 +772,33 @@ module .exports = class Application
             { name: "X3D VRML Classic Document GZipped", extensions: ["x3dvz"] },
          ],
       })
+
+      this .popMenu ()
+
+      return response
    }
 
    async showExportDialog (defaultPath)
    {
-      return await electron .dialog .showSaveDialog ({
+      this .pushMenu (electron .Menu .buildFromTemplate ([
+         {
+            role: "appMenu",
+            label: "Sunrize",
+         },
+         { role: "editMenu" },
+      ]))
+
+      const response = await electron .dialog .showSaveDialog ({
          defaultPath: defaultPath,
          properties: ["createDirectory", "showOverwriteConfirmation"],
          filters : [
             { name: "HTML Document", extensions: ["html"] },
          ],
       })
+
+      this .popMenu ()
+
+      return response
    }
 
    maximize ()
@@ -715,15 +844,24 @@ module .exports = class Application
       }
    }
 
+   async clipboard ()
+   {
+      try
+      {
+         return await clipboardy .read ()
+      }
+      catch
+      {
+         return ""
+      }
+   }
+
    quit ()
    {
       if (!this .applicationShouldQuitAfterLastWindowClosed)
          return
 
-      Template .remove (path .join (__dirname, "../../html/application-template.html"))
-      Template .remove (path .join (__dirname, "../../html/document-template.html"))
-      Template .remove (path .join (__dirname, "../../themes/default-template.css"))
-
+      Template .removeAll ()
       electron .app .quit ()
    }
 }

package/src/{sunrize/Application → Application}/Dashboard.js

@@ -4,7 +4,6 @@ const
    $         = require ("jquery"),
    X3D       = require ("../X3D"),
    Interface = require ("./Interface"),
-   Box3      = X3D .require ("standard/Math/Geometry/Box3"),
    _         = require ("./GetText")
 
 module .exports = class Dashboard extends Interface
@@ -40,7 +39,7 @@ module .exports = class Dashboard extends Interface
          .css ({ position: "relative", left: "-1px", "font-weight": "bold" })
          .text ("play_arrow")
          .appendTo (this .toolbar)
-         .on ("click", () => this .play (!this .config .file .play))
+         .on ("click", () => this .play (!this .fileConfig .play))
 
       $("<span></span>") .addClass ("separator") .appendTo (this .toolbar)
 
@@ -61,19 +60,19 @@ module .exports = class Dashboard extends Interface
 
    configure ()
    {
-      this .config .file .addDefaultValues ({
+      this .fileConfig .setDefaultValues ({
          pointer: "hand",
          play: false,
       })
 
-      this [this .config .file .pointer] ()
-      this .play (this .config .file .play)
+      this [this .fileConfig .pointer] ()
+      this .play (this .fileConfig .play)
       this .straighten (this .browser .getBrowserOption ("StraightenHorizon"))
    }
 
    hand ()
    {
-      this .config .file .pointer = "hand"
+      this .fileConfig .pointer = "hand"
 
       if (this .handButton .hasClass ("active"))
          return
@@ -84,7 +83,7 @@ module .exports = class Dashboard extends Interface
 
    arrow ()
    {
-      this .config .file .pointer = "arrow"
+      this .fileConfig .pointer = "arrow"
 
       if (this .arrowButton .hasClass ("active"))
          return
@@ -95,7 +94,7 @@ module .exports = class Dashboard extends Interface
 
    play (value)
    {
-      this .config .file .play = value
+      this .fileConfig .play = value
 
       if (value)
       {
@@ -112,7 +111,7 @@ module .exports = class Dashboard extends Interface
    viewAll ()
    {
       const
-         outlineEditor = require ("./Document") .sidebar .outlineEditor,
+         outlineEditor = require ("./Window") .sidebar .outlineEditor,
          selection     = outlineEditor .sceneGraph .find (".node.selected")
 
       if (selection .length)
@@ -120,7 +119,7 @@ module .exports = class Dashboard extends Interface
          const
             layerNode     = this .browser .getActiveLayer (),
             viewpointNode = this .browser .getActiveViewpoint (),
-            bbox          = new Box3 (),
+            bbox          = new X3D .Box3 (),
             straighten    = this .browser .getBrowserOption ("StraightenHorizon")
 
          for (const element of selection)
@@ -134,7 +133,7 @@ module .exports = class Dashboard extends Interface
 
                const modelMatrix = outlineEditor .getModelMatrix ($(element), false)
 
-               bbox .add (node .getBBox (new Box3 ()) .multRight (modelMatrix))
+               bbox .add (node .getBBox (new X3D .Box3 ()) .multRight (modelMatrix))
             }
             catch
             { }

package/src/{sunrize/Application → Application}/DataStorage.js

@@ -123,7 +123,7 @@ module .exports = class DataStorage
 	 *
 	 * @param {object} object
 	 */
-	addDefaultValues (object)
+	setDefaultValues (object)
 	{
 		Object .assign (defaults .get (this .target), object)
 	}