sunrize 1.9.1 → 1.10.2

package/README.md

@@ -13,7 +13,11 @@ Sunrize is based on [X_ITE](https://create3000.github.io/x_ite/) and is a basic
 * [Website](https://create3000.github.io/sunrize/)
 * [Documentation](https://create3000.github.io/sunrize/documentation/)
 
-## Usage
+## Installer Packages
+
+The latest builds of Sunrize are available as installer packages on the [Sunrize Releases](https://github.com/create3000/sunrize/releases) page on GitHub. From there, you can download precompiled binaries, but currently only for Windows.
+
+## Run from Console
 
 First you need to install both Node.js and npm on your system. To accomplish this, you can use a [Node installer](https://nodejs.org/en/download/) (Windows), or use [Homebrew](https://brew.sh) to install node (macos), or use your Linux package manager.
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.9.1",
+  "version": "1.10.2",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -20,16 +20,15 @@
     "premake": "npm i -D electron",
     "make": "electron-forge make",
     "postmake": "npm i -P electron",
-    "pregithub": "npm i -D electron",
-    "github": "electron-forge publish",
-    "postgithub": "npm i -P electron",
+    "publish-to-github": "node build/publish-to-github.js",
     "predocs": "rm -f -r docs/_site/",
     "docs": "cd docs && bundle exec jekyll serve --ssl-key ssl/server.key --ssl-cert ssl/server.crt --incremental --host=`ipconfig getifaddr en0`",
     "predocs-install": "cd docs && ln -s -f ../../ssl ./",
     "docs-install": "cd docs && gem install bundler && bundle install",
     "docs-update": "cd docs && bundle update",
     "merge-development": "sh build/merge-development.sh",
-    "make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh"
+    "make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh",
+    "loading-gif": "node build/loading-gif.js"
   },
   "repository": {
     "type": "git",
@@ -91,7 +90,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^38.0.0",
+    "electron": "^38.1.2",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -103,14 +102,14 @@
     "material-symbols": "^0.35.0",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
-    "monaco-editor": "^0.50.0",
+    "monaco-editor": "^0.53.0",
     "node-localstorage": "^3.0.5",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.0.7",
+    "x_ite": "^12.0.8",
     "x3d-traverse": "^1.0.13"
   }
 }

package/src/Application/Application.js

@@ -7,6 +7,7 @@ const
    path         = require ("path"),
    fs           = require ("fs"),
    util         = require ("util"),
+   Registry     = require ("./Registry"),
    Template     = require ("./Template"),
    LocalStorage = require ("node-localstorage") .LocalStorage,
    DataStorage  = require ("../Application/DataStorage"),
@@ -33,7 +34,9 @@ module .exports = class Application
       }
 
       if (process .platform === "win32")
-         require ("update-electron-app") .updateElectronApp ();
+         require ("update-electron-app") .updateElectronApp ({ updateInterval: "1 hour" });
+
+      Registry .addWindowsFileTypes ();
 
       electron .app .commandLine .appendSwitch ("--enable-features", "OverlayScrollbar,ConversionMeasurement,AttributionReportingCrossAppWeb");
 
@@ -75,7 +78,7 @@ module .exports = class Application
 
       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/media-template.css"));
       Template .create (path .join (__dirname, "../assets/themes/prompt-template.css"));
 
       this .setup ();
@@ -384,9 +387,14 @@ module .exports = class Application
                   },
                   { type: "separator" },
                   {
-                     label: _("Close"),
+                     label: _("Close Tab"),
                      accelerator: "CmdOrCtrl+W",
-                     click: () => this .mainWindow .webContents .send ("close"),
+                     click: () => this .mainWindow .webContents .send ("close-tab"),
+                  },
+                  {
+                     label: _("Close All Tabs"),
+                     accelerator: "Option+CmdOrCtrl+W",
+                     click: () => this .mainWindow .webContents .send ("close-all-tabs"),
                   },
                   ... process .platform === "darwin" ?
                   [ ]
@@ -424,22 +432,49 @@ module .exports = class Application
                      { type: "separator" },
                      { role: "selectAll" },
                   ],
+               ]
+            }
+            : this .menuOptions .monacoEditor ?
+            {
+               role: "editMenu",
+               submenu: [
+                  {
+                     label: _("Undo"),
+                     accelerator: "CmdOrCtrl+Z",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "triggerEvent", "keyboard", "undo", null),
+                  },
+                  {
+                     label: _("Redo"),
+                     accelerator: "CmdOrCtrl+Shift+Z",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "triggerEvent", "keyboard", "redo", null),
+                  },
+                  { type: "separator" },
+                  {
+                     role: "cut",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "cutOrCopy", "cut"),
+                  },
+                  {
+                     role: "copy",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "cutOrCopy", "copy"),
+                  },
+                  {
+                     role: "paste",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "paste"),
+                  },
                   { type: "separator" },
                   {
                      label: _("Toggle Line Comment"),
                      accelerator: process .platform === "darwin" ? "CmdOrCtrl+Shift+7" : "CmdOrCtrl+#",
-                     enabled: this .menuOptions .monacoEditor,
                      click: () => this .mainWindow .webContents .send ("script-editor", "runAction", "editor.action.commentLine"),
                   },
                   {
                      label: _("Toggle Block Comment"),
                      accelerator: "Alt+Shift+A",
-                     enabled: this .menuOptions .monacoEditor,
                      click: () => this .mainWindow .webContents .send ("script-editor", "runAction", "editor.action.blockComment"),
                   },
                ]
             }
-            :
+            : // Outline Editor, Browser
             {
                role: "editMenu",
                submenu: [
@@ -456,15 +491,9 @@ module .exports = class Application
                      click: () => this .mainWindow .webContents .send ("redo"),
                   },
                   { type: "separator" },
-                  {
-                     role: "cut",
-                  },
-                  {
-                     role: "copy",
-                  },
-                  {
-                     role: "paste",
-                  },
+                  { role: "cut" },
+                  { role: "copy" },
+                  { role: "paste" },
                   {
                      label: _("Delete"),
                      accelerator: "CmdOrCtrl+Backspace",
@@ -932,7 +961,7 @@ module .exports = class Application
       {
          if (menuItem .submenu)
             this .addMenuItemHandlers (id, menuItem .submenu);
-         else
+         else if (menuItem .args)
             menuItem .click = () => this .mainWindow .webContents .send (id, ... menuItem .args);
       }
 

package/src/Application/Dashboard.js

@@ -92,7 +92,7 @@ module .exports = class Dashboard extends Interface
 
       this .showPanelsButton = $("<span></span>")
          .addClass (["material-symbols-outlined"])
-         .attr ("title", _("Toggle visibility of Panel."))
+         .attr ("title", _("Show Node Panel."))
          .text ("edit_note")
          .appendTo (this .toolbar)
          .on ("click", () => this .togglePanel (!this .config .file .panel));

package/src/Application/Document.js

@@ -272,9 +272,37 @@ module .exports = class Document extends Interface
    {
       this .activeElement = document .activeElement ? $(document .activeElement) : null;
 
+      if (this .activeElement ?.is ("input, textarea"))
+      {
+         this .activeElement
+            .off ("contextmenu.Document")
+            .on ("contextmenu.Document", () => this .showContextMenu ());
+      }
+
       electron .ipcRenderer .send ("update-menu", this .updateEditMenu ({ }));
    }
 
+   async showContextMenu ()
+   {
+      await $.sleep ();
+
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
+      const menu = [
+         { role: "undo", accelerator: "CmdOrCtrl+Z" },
+         { role: "redo", accelerator: "Shift+CmdOrCtrl+Z" },
+         { type: "separator" },
+         { role: "cut", accelerator: "CmdOrCtrl+X" },
+         { role: "copy", accelerator: "CmdOrCtrl+C" },
+         { role: "paste", accelerator: "CmdOrCtrl+P" },
+         { type: "separator" },
+         { role: "selectAll", accelerator: "CmdOrCtrl+A" },
+      ];
+
+      electron .ipcRenderer .send ("context-menu", "default-context-menu", menu);
+   }
+
    updateEditMenu (menu)
    {
       return Object .assign (menu,
@@ -314,6 +342,9 @@ module .exports = class Document extends Interface
       if (!this .activeElement .closest (".monaco-editor") .length)
          return false;
 
+      if (this .activeElement .closest (".ibwrapper") .length)
+         return false;
+
       return true;
    }
 
@@ -586,6 +617,9 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
       this .sidebar .outlineEditor .cutNodes ();
       return false;
    }
@@ -595,6 +629,9 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
       this .sidebar .outlineEditor .copyNodes (true);
       return false;
    }
@@ -604,6 +641,9 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
       this .sidebar .outlineEditor .pasteNodes ();
       return false;
    }

package/src/Application/Registry.js

@@ -0,0 +1,43 @@
+const
+   electron      = require ("electron"),
+   path          = require ("path"),
+   fs            = require ("fs"),
+   child_process = require ("child_process");
+
+module .exports = class Registry
+{
+   static addWindowsFileTypes ()
+   {
+      if (process .platform !== "win32")
+         return;
+
+      if (!electron .app .isPackaged)
+         return;
+
+      const
+         exe = electron .app .getPath ("exe"),
+         reg = fs .readFileSync (path .join (__dirname, "../assets/X3D.reg"), { encoding: "utf-8" }),
+         tmp = path .join (__dirname, "../assets/X3D-tmp.reg");
+
+      const out = reg .replaceAll ("SUNRIZE_EXE", exe .replaceAll ("\\", "\\\\"));
+
+      fs .writeFileSync (tmp, out);
+
+      const ls = child_process .spawn ("reg", ["import", tmp]);
+
+      ls .stdout .on ('data', (data) =>
+      {
+         // console .log (`stdout: ${data}`);
+      });
+
+      ls .stderr .on ('data', (data) =>
+      {
+         // console .error (`stderr: ${data}`);
+      });
+
+      ls .on ("close", (code) =>
+      {
+         fs .unlinkSync (tmp);
+      });
+   }
+}

package/src/Application/Tabs.js

@@ -54,7 +54,8 @@ module .exports = new class Tabs
       electron .ipcRenderer .on ("save-file",      (event)           => this .saveFile ());
       electron .ipcRenderer .on ("save-file-as",   (event, filePath) => this .saveFileAs (filePath));
       electron .ipcRenderer .on ("save-all-files", (event)           => this .saveAllFiles ());
-      electron .ipcRenderer .on ("close",          (event)           => this .tabs .getActiveTab () ?.close (true));
+      electron .ipcRenderer .on ("close-tab",      (event)           => this .tabs .getActiveTab () ?.close (true));
+      electron .ipcRenderer .on ("close-all-tabs", (event)           => this .closeAllTabs ());
       electron .ipcRenderer .on ("quit",           (event)           => this .quit ());
 
       electron .ipcRenderer .on ("toggle-developer-tools", (event) => this .tabs .getActiveTab () .webview .openDevTools ());
@@ -336,6 +337,12 @@ module .exports = new class Tabs
          tab .webview .send ("save-file");
    }
 
+   closeAllTabs ()
+   {
+      for (const tab of this .tabs .getTabs ())
+         tab .close (true);
+   }
+
    close ()
    {
       this .saveTabs ();

package/src/Application/Template.js

@@ -22,8 +22,8 @@ class Template
 
       const file = fs .readFileSync (template)
          .toString ()
-         .replace (/(url\()(.*?)(\))/sg, Template .resolve .bind (null, template))
-         .replace (/(href=")(.*?)(")/sg, Template .resolve .bind (null, template));
+         .replace (/(url\()(.*?)(\))/sg, (... args) => this .resolve (template, ... args))
+         .replace (/(href=")(.*?)(")/sg, (... args) => this .resolve (template, ... args));
 
       fs .writeFileSync (filename, file);
       fs .utimesSync (dirname, stats .atime, stats .mtime);

package/src/Controls/RenameNodeInput.js

@@ -12,9 +12,19 @@ require ("../Bits/Validate");
 
 $.fn.renameNodeInput = function (node)
 {
+   this .data ("node") ?.name_changed .removeFieldCallback (this);
+   this .data ("node", node);
+
+   node ?.name_changed .addFieldCallback (this, () => this .val (node .getName ()));
+
+   if (node)
+      this .removeAttr ("disabled");
+   else
+      this .attr ("disabled", "");
+
    this
       .val (node ? node .getName () : "")
-      .siblings () .addBack () .off ("keydown.renameNodeInput")
+      .siblings () .addBack () .off ("keydown.renameNodeInput");
 
    this .validate (Editor .Id, () =>
    {
@@ -107,4 +117,3 @@ $.fn.renameNodeInput = function (node)
 
    return this;
 };
-

package/src/Editors/OutlineEditor.js

@@ -151,6 +151,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             { type: "separator" },
             {
                label: _("Paste"),
+               accelerator: "CmdOrCtrl+V",
                visible: field .getType () === X3D .X3DConstants .SFNode || field .getType () === X3D .X3DConstants .MFNode,
                args: ["pasteNodes", element .attr ("id"), executionContext .getId (), node .getId (), field .getId ()],
             },
@@ -223,18 +224,22 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                { type: "separator" },
                {
                   label: _("Cut"),
+                  accelerator: "CmdOrCtrl+X",
                   args: ["cutNodes"],
                },
                {
                   label: _("Copy"),
+                  accelerator: "CmdOrCtrl+C",
                   args: ["copyNodes"],
                },
                {
                   label: _("Paste"),
+                  accelerator: "CmdOrCtrl+V",
                   args: ["pasteNodes", element .attr ("id"), executionContext .getId (), node .getId ()],
                },
                {
                   label: _("Delete"),
+                  accelerator: "CmdOrCtrl+Backspace",
                   args: ["deleteNodes"],
                },
                {
@@ -537,14 +542,17 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             var menu = [
                {
                   label: _("Cut"),
+                  accelerator: "CmdOrCtrl+X",
                   args: ["cutNodes"],
                },
                {
                   label: _("Copy"),
+                  accelerator: "CmdOrCtrl+C",
                   args: ["copyNodes"],
                },
                {
                   label: _("Delete"),
+                  accelerator: "CmdOrCtrl+Backspace",
                   args: ["deleteNodes"],
                },
             ];
@@ -670,6 +678,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             },
             {
                label: _("Paste"),
+               accelerator: "CmdOrCtrl+V",
                args: ["pasteNodes", element .attr ("id"), executionContext .getId ()],
             },
          ];

package/src/Editors/OutlineRouteGraph.js

@@ -5,10 +5,6 @@ const
    X3D         = require ("../X3D"),
    OutlineView = require ("./OutlineView");
 
-const
-   routeColor         = "#000000",
-   routeSelectedColor = "rgb(255, 69, 58)";
-
 module .exports = class OutlineRouteGraph extends OutlineView
 {
    constructor (element)
@@ -18,6 +14,16 @@ module .exports = class OutlineRouteGraph extends OutlineView
       this .selectedRoutes = new Set ();
    }
 
+   colorScheme (shouldUseDarkColors)
+   {
+      super .colorScheme (shouldUseDarkColors);
+
+      this .routeColor         = window .getComputedStyle ($("body") [0]) .getPropertyValue ("--system-gray1");
+      this .routeSelectedColor = window .getComputedStyle ($("body") [0]) .getPropertyValue ("--system-red");
+
+      this .requestUpdateRouteGraph ();
+   }
+
    selectRoutes (type, event)
    {
       // Select routes.
@@ -143,6 +149,8 @@ module .exports = class OutlineRouteGraph extends OutlineView
          parent  = canvas .parent (),
          context = canvas .get (0) .getContext ("2d");
 
+      const { routeColor, routeSelectedColor } = this;
+
       canvas .height (Math .ceil (parent .height ()));
 
       canvas .prop ("width",  canvas .width ());
@@ -221,6 +229,8 @@ module .exports = class OutlineRouteGraph extends OutlineView
          parent  = canvas .parent (),
          context = canvas .get (0) .getContext ("2d");
 
+      const { routeColor, routeSelectedColor } = this;
+
       canvas .height (Math .ceil (parent .height ()));
 
       canvas .prop ("width",  canvas .width ());
@@ -275,6 +285,8 @@ module .exports = class OutlineRouteGraph extends OutlineView
 
    updateRouteCurves (canvases, fields)
    {
+      const { routeColor, routeSelectedColor } = this;
+
       // Scale canvases
 
       for (let i = 0, length = canvases .length - 1; i < length; ++ i)

package/src/Editors/OutlineView.js

@@ -1716,7 +1716,7 @@ module .exports = class OutlineView extends Interface
                   .addClass ("input-selector") .appendTo (map);
 
                const inputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .attr ("coords", "20,0,28,7")
                   .addClass ("input-routes-selector") .appendTo (map);
@@ -1736,7 +1736,7 @@ module .exports = class OutlineView extends Interface
                   .addClass ("output-selector") .appendTo (map);
 
                const outputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .attr ("coords", "20,5,28,12")
                   .addClass ("output-routes-selector")
@@ -1765,7 +1765,7 @@ module .exports = class OutlineView extends Interface
                   .appendTo (map);
 
                const inputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .attr ("coords", "34,0,42,7")
                   .addClass ("input-routes-selector")
@@ -1775,7 +1775,7 @@ module .exports = class OutlineView extends Interface
                   inputRoutesSelector .attr ("href", "#");
 
                const outputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .addClass ("output-routes-selector")
                   .appendTo (map);
@@ -2359,7 +2359,7 @@ module .exports = class OutlineView extends Interface
 
       $("<div></div>")
          .addClass (type + "-value-container")
-         .append ($("<input></input>") .attr ("type", "text"))
+         .append ($("<input></input>") .attr ("type", "text") .attr ("lang", "en"))
          .appendTo (li);
 
       // Make jsTree.
@@ -2467,7 +2467,7 @@ module .exports = class OutlineView extends Interface
 
       $("<div></div>")
          .addClass (type + "-value-container")
-         .append ($("<textarea></textarea>"))
+         .append ($("<textarea></textarea>") .attr ("lang", "en"))
          .appendTo (li)
 
       // Make jsTree.
@@ -3827,7 +3827,7 @@ module .exports = class OutlineView extends Interface
 
    selectRoutes (type, event)
    {
-      // Select routes.
+      // Select route(s).
    }
 
    selectSingleRoute (type, event)

package/src/Editors/Panel.js

@@ -120,7 +120,7 @@ module .exports = new class Panel extends Interface
 
       this .container .css ({
          "overflow": "visible",
-         "max-height": "auto",
+         "max-height": "unset",
       });
 
       // Create folders.

package/src/Editors/SceneProperties.js

@@ -227,9 +227,9 @@ module .exports = new class SceneProperties extends Dialog
 
       this .executionContext .getWorldInfos () .addInterest ("updateWorldInfo", this);
 
-      const window = require ("../Application/Window");
+      const app = require ("../Application/Window");
 
-      this .profileAndComponents .inputs .checkbox .prop ("checked", window .config .file .inferProfileAndComponents);
+      this .profileAndComponents .inputs .checkbox .prop ("checked", app .config .file .inferProfileAndComponents);
 
       this .toggleInferProfileAndComponents ();
       this .updateProfile ();
@@ -251,9 +251,9 @@ module .exports = new class SceneProperties extends Dialog
 
    toggleInferProfileAndComponents ()
    {
-      const window = require ("../Application/Window");
+      const app = require ("../Application/Window");
 
-      window .config .file .inferProfileAndComponents = this .profileAndComponents .inputs .checkbox .prop ("checked");
+      app .config .file .inferProfileAndComponents = this .profileAndComponents .inputs .checkbox .prop ("checked");
 
       if (this .profileAndComponents .inputs .checkbox .prop ("checked"))
          this .profileAndComponents .checkboxRow .addClass ("disabled");