sunrize 1.2.7 → 1.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.2.7",
+  "version": "1.3.0",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -20,8 +20,9 @@
     "premake": "npm i -D electron",
     "make": "electron-forge make",
     "postmake": "npm i -P electron",
-    "release": "node build/publish.js",
-    "docs": "cd docs && bundle exec jekyll serve --incremental --host=192.168.0.18"
+    "release": "node build/release.js",
+    "docs": "cd docs && bundle exec jekyll serve --incremental --host=192.168.0.18",
+    "make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh"
   },
   "repository": {
     "type": "git",
@@ -62,16 +63,17 @@
     }
   ],
   "devDependencies": {
-    "@electron-forge/cli": "^7.1.0",
-    "@electron-forge/maker-deb": "^7.1.0",
-    "@electron-forge/maker-rpm": "^7.1.0",
-    "@electron-forge/maker-squirrel": "^7.1.0",
-    "@electron-forge/maker-zip": "^7.1.0"
+    "@electron-forge/cli": "^7.2.0",
+    "@electron-forge/maker-deb": "^7.2.0",
+    "@electron-forge/maker-rpm": "^7.2.0",
+    "@electron-forge/maker-squirrel": "^7.2.0",
+    "@electron-forge/maker-zip": "^7.2.0",
+    "shell-tools": "^1.1.5"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^27.1.2",
+    "electron": "^27.1.3",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.2",
@@ -88,7 +90,7 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^9.1.5"
+    "x_ite": "^9.1.7"
   },
   "config": {
     "forge": {

package/src/Application/Dashboard.js

@@ -1,20 +1,20 @@
-"use strict"
+"use strict";
 
 const
    $         = require ("jquery"),
    X3D       = require ("../X3D"),
    Interface = require ("./Interface"),
-   _         = require ("./GetText")
+   _         = require ("./GetText");
 
 module .exports = class Dashboard extends Interface
 {
    constructor (element)
    {
-      super ("Sunrize.Dashboard.")
+      super ("Sunrize.Dashboard.");
 
-      this .toolbar = element
+      this .toolbar = element;
 
-      this .setup ()
+      this .setup ();
    }
 
    async initialize ()
@@ -23,15 +23,15 @@ module .exports = class Dashboard extends Interface
          .addClass (["image-icon", "hand"])
          .attr ("title", _ ("Switch to browser mode."))
          .appendTo (this .toolbar)
-         .on ("click", () => this .hand ())
+         .on ("click", () => this .hand ());
 
-      this .handButton .addClass ("active")
+      this .handButton .addClass ("active");
 
       this .arrowButton = $("<span></span>")
          .addClass (["image-icon", "arrow"])
          .attr ("title", _ ("Switch to edit mode."))
          .appendTo (this .toolbar)
-         .on ("click", () => this .arrow ())
+         .on ("click", () => this .arrow ());
 
       this .playButton = $("<span></span>")
          .addClass (["material-icons"])
@@ -39,23 +39,23 @@ 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 .fileConfig .play))
+         .on ("click", () => this .play (!this .fileConfig .play));
 
-      $("<span></span>") .addClass ("separator") .appendTo (this .toolbar)
+      $("<span></span>") .addClass ("separator") .appendTo (this .toolbar);
 
       this .viewAllButton = $("<span></span>")
          .addClass (["material-symbols-outlined"])
          .attr ("title", _ ("View all objects in active layer."))
          .text ("center_focus_strong")
          .appendTo (this .toolbar)
-         .on ("click", () => this .viewAll ())
+         .on ("click", () => this .viewAll ());
 
       this .straightenButton = $("<span></span>")
          .addClass (["material-symbols-outlined", "active"])
          .attr ("title", _ ("Straighten horizon."))
          .text ("wb_twilight")
          .appendTo (this .toolbar)
-         .on ("click", () => this .straighten (!this .browser .getBrowserOption ("StraightenHorizon")))
+         .on ("click", () => this .straighten (!this .browser .getBrowserOption ("StraightenHorizon")));
    }
 
    configure ()
@@ -63,56 +63,58 @@ module .exports = class Dashboard extends Interface
       this .fileConfig .setDefaultValues ({
          pointer: "hand",
          play: false,
-      })
+      });
 
-      this [this .fileConfig .pointer] ()
-      this .play (this .fileConfig .play)
-      this .straighten (this .browser .getBrowserOption ("StraightenHorizon"))
+      this [this .fileConfig .pointer] ();
+      this .play (this .fileConfig .play);
+      this .straighten (this .browser .getBrowserOption ("StraightenHorizon"));
    }
 
    hand ()
    {
-      this .fileConfig .pointer = "hand"
+      this .fileConfig .pointer = "hand";
 
       if (this .handButton .hasClass ("active"))
-         return
+         return;
 
-      this .arrowButton .removeClass ("active")
-      this .handButton .addClass ("active")
+      this .arrowButton .removeClass ("active");
+      this .handButton .addClass ("active");
    }
 
    arrow ()
    {
-      this .fileConfig .pointer = "arrow"
+      this .fileConfig .pointer = "arrow";
 
       if (this .arrowButton .hasClass ("active"))
-         return
+         return;
 
-      this .handButton .removeClass ("active")
-      this .arrowButton .addClass ("active")
+      this .handButton .removeClass ("active");
+      this .arrowButton .addClass ("active");
    }
 
    play (value)
    {
-      this .fileConfig .play = value
+      this .fileConfig .play = value;
 
       if (value)
       {
-         this .playButton .addClass ("active")
-         this .browser .beginUpdate ()
+         this .playButton .addClass ("active");
+         this .browser .beginUpdate ();
       }
       else
       {
-         this .playButton .removeClass ("active")
-         this .browser .endUpdate ()
+         this .playButton .removeClass ("active");
+         this .browser .endUpdate ();
       }
    }
 
    viewAll ()
    {
+      const types = new Set ([X3D .X3DConstants .X3DBoundedObject, X3D .X3DConstants .X3DGeometryNode]);
+
       const
          outlineEditor = require ("./Window") .sidebar .outlineEditor,
-         selection     = outlineEditor .sceneGraph .find (".node.selected")
+         selection     = outlineEditor .sceneGraph .find (".node.selected");
 
       if (selection .length)
       {
@@ -120,44 +122,39 @@ module .exports = class Dashboard extends Interface
             layerNode     = this .browser .getActiveLayer (),
             viewpointNode = this .browser .getActiveViewpoint (),
             bbox          = new X3D .Box3 (),
-            straighten    = this .browser .getBrowserOption ("StraightenHorizon")
+            straighten    = this .browser .getBrowserOption ("StraightenHorizon");
 
          for (const element of selection)
          {
-            try
-            {
-               const node = outlineEditor .getNode ($(element)) .getInnerNode ()
+            const node = outlineEditor .getNode ($(element)) .getInnerNode ();
 
-               if (!node .getType () .includes (X3D .X3DConstants .X3DBoundedObject))
-                  continue
+            if (!node .getType () .some (type => types .has (type)))
+               continue;
 
-               const modelMatrix = outlineEditor .getModelMatrix ($(element), false)
+            const modelMatrix = outlineEditor .getModelMatrix ($(element), false);
 
-               bbox .add (node .getBBox (new X3D .Box3 ()) .multRight (modelMatrix))
-            }
-            catch
-            { }
+            bbox .add (node .getBBox (new X3D .Box3 ()) .copy () .multRight (modelMatrix));
          }
 
          if (!bbox .size .magnitude ())
             return;
 
-         viewpointNode .lookAtBBox (layerNode, bbox, 1, straighten)
+         viewpointNode .lookAtBBox (layerNode, bbox, 1, straighten);
       }
       else
       {
-         this .browser .viewAll ()
+         this .browser .viewAll ();
       }
    }
 
    straighten (value)
    {
-      this .browser .setBrowserOption ("StraightenHorizon", value)
+      this .browser .setBrowserOption ("StraightenHorizon", value);
 
       if (value)
-         this .straightenButton .addClass ("active")
+         this .straightenButton .addClass ("active");
       else
-         this .straightenButton .removeClass ("active")
+         this .straightenButton .removeClass ("active");
    }
-}
+};
 

package/src/Application/Document.js

@@ -307,7 +307,7 @@ module .exports = class Document extends Interface
 
       clearTimeout (this .#saveTimeoutId);
 
-      this .#saveTimeoutId = setTimeout (() => this .saveFile (), 3000);
+      this .#saveTimeoutId = setTimeout (() => this .saveFile (), 1000);
    }
 
    exportAs (filePath)
@@ -375,8 +375,20 @@ module .exports = class Document extends Interface
     */
    setPrimitiveQuality (value)
    {
+      const live = this .browser .isLive ();
+
+      this .browser .beginUpdate ();
       this .browser .setBrowserOption ("PrimitiveQuality", value);
       this .browser .setDescription (`Primitive Quality: ${value .toLowerCase ()}`);
+
+      if (!live)
+      {
+         this .browser .finishedEvents () .addFieldCallback (this, () =>
+         {
+            this .browser .finishedEvents () .removeFieldCallback (this);
+            this .browser .endUpdate ();
+         })
+      }
    }
 
    /**

package/src/Application/Tabs.js

@@ -1,4 +1,4 @@
-"use strict"
+"use strict";
 
 const
    $           = require ("jquery"),
@@ -10,24 +10,24 @@ const
    fs          = require ("fs"),
    md5         = require ("md5"),
    CSS         = require ("./CSS"),
-   _           = require ("./GetText")
+   _           = require ("./GetText");
 
 module .exports = new class Tabs
 {
    // Construction
 
-   config = new DataStorage (localStorage, "Sunrize.Application.")
+   config = new DataStorage (localStorage, "Sunrize.Application.");
 
    constructor ()
    {
-      this .tabs = $("tab-group") .get (0)
+      this .tabs = $("tab-group") .get (0);
 
       this .config .setDefaultValues ({
          openTabs: [ ],
          scrollLeft: 0,
-      })
+      });
 
-      $(() => this .initialize ())
+      $(() => this .initialize ());
    }
 
    initialize ()
@@ -106,59 +106,60 @@ module .exports = new class Tabs
 
    restoreTabs (activeTab)
    {
-      const config = new DataStorage (localStorage, "Sunrize.")
+      const config = new DataStorage (localStorage, "Sunrize.");
 
       const openTabs = this .config .openTabs .filter (fileURL =>
       {
          if (!fileURL .startsWith ("file:"))
-            return true
+            return true;
 
          if (fs .existsSync (url .fileURLToPath (fileURL)))
-            return true
+            return true;
 
          // Delete keys of deleted file.
 
-         const hash = `.${md5 (fileURL)}.`
+         const hash = `.${md5 (fileURL)}.`;
 
          for (const key of Object .keys (config) .filter (key => key .includes (hash)))
-            config [key] = undefined
+            config [key] = undefined;
 
-         return false
+         return false;
       })
 
       for (const fileURL of openTabs .filter (fileURL => fileURL .startsWith ("file:")))
          electron .ipcRenderer .send ("add-recent-document", url .fileURLToPath (fileURL));
 
       if (openTabs .length)
-         this .openTabs (openTabs, false)
+         this .openTabs (openTabs, false);
 
       if (this .tabs .getTabs () .length)
       {
-         const tab = this .getTabByURL (activeTab) ?? this .tabs .getTabByPosition (0)
+         const tab = this .getTabByURL (activeTab) ?? this .tabs .getTabByPosition (0);
 
-         tab .activate ()
+         tab .activate ();
       }
       else
       {
-         this .openTabs ()
+         this .openTabs ();
       }
    }
 
    openTabs (urls = [""], activate = true)
    {
       if (!urls .length)
-         return
+         return;
 
-      const src = url .pathToFileURL (path .join (__dirname, "../assets/html/window.html"))
+      const src = url .pathToFileURL (path .join (__dirname, "../assets/html/window.html"));
 
       for (let fileURL of urls)
       {
          if (fileURL && this .tabs .getTabs () .some (tab => tab .url === fileURL))
-            continue
+            continue;
 
-         if (!fileURL) fileURL = `id:${md5 (Math .random ())}`
+         if (!fileURL)
+            fileURL = `id:${md5 (Math .random ())}`;
 
-         src .searchParams .set ("url", fileURL)
+         src .searchParams .set ("url", fileURL);
 
          const tab = this .tabs .addTab ({
             src: src,
@@ -169,38 +170,38 @@ module .exports = new class Tabs
             },
             visible: true,
             active: false,
-         })
+         });
 
-         this .setTabURL (tab, fileURL)
+         this .setTabURL (tab, fileURL);
 
          tab .webview .addEventListener ("console-message", (event) =>
          {
-            tab .webview .send ("console-message", event .level, event .sourceId, event .line, event .message)
-         })
+            tab .webview .send ("console-message", event .level, event .sourceId, event .line, event .message);
+         });
 
-         tab .on ("closing", (tab, abort) => this .tabClosing (tab, abort))
-         tab .on ("close", (tab) => this .tabClose (tab))
+         tab .on ("closing", (tab, abort) => this .tabClosing (tab, abort));
+         tab .on ("close", (tab) => this .tabClose (tab));
 
          tab .webview .addEventListener ("ipc-message", (event, value) =>
          {
             if (event .channel !== "saved")
-               return
+               return;
 
-            this .setTabURL (tab, tab .url, ...event .args)
-         })
+            this .setTabURL (tab, tab .url, ...event .args);
+         });
 
          tab .webview .addEventListener ("dom-ready", () =>
          {
             // Workaround for focus issue with webview.
-            tab .webview .focus ()
-            window .blur ()
-            window .focus ()
+            tab .webview .focus ();
+            window .blur ();
+            window .focus ();
 
-            tab .domReady = true
+            tab .domReady = true;
 
             if (this .tabs .getActiveTab () === tab)
-               tab .webview .send ("activate")
-         })
+               tab .webview .send ("activate");
+         });
       }
 
       if (activate)
@@ -208,72 +209,72 @@ module .exports = new class Tabs
          const tab = this .getTabs () .find (tab => urls .includes (tab .url))
             ?? this .tabs .getTabByPosition (this .tabs .getTabs () .length - 1)
 
-         tab .activate ()
+         tab .activate ();
       }
 
-      this .saveTabs ()
+      this .saveTabs ();
    }
 
    reloadTab ()
    {
-      const tab = this .tabs .getActiveTab ()
+      const tab = this .tabs .getActiveTab ();
 
-      tab .webview .src = tab .webview .src
+      tab .webview .src = tab .webview .src;
    }
 
    getTabs ()
    {
-      const cmp = (a, b) => (a > b) - (a < b)
+      const cmp = (a, b) => (a > b) - (a < b);
 
       return this .tabs .getTabs ()
-         .sort ((a, b) => cmp (a .getPosition (), b .getPosition ()))
+         .sort ((a, b) => cmp (a .getPosition (), b .getPosition ()));
    }
 
    getTabByURL (fileURL)
    {
-      return this .getTabs () .findLast (tab => tab .url === fileURL)
+      return this .getTabs () .findLast (tab => tab .url === fileURL);
    }
 
    setTabURL (tab, fileURL, saved = true)
    {
-      tab .url = fileURL
+      tab .url = fileURL;
 
-      tab .setTitle ((fileURL .startsWith ("id:") ? _ ("New Scene") : path .basename (decodeURIComponent (new URL (fileURL) .pathname))) + (saved ? "" : "*"))
+      tab .setTitle ((fileURL .startsWith ("id:") ? _ ("New Scene") : path .basename (decodeURIComponent (new URL (fileURL) .pathname))) + (saved ? "" : "*"));
 
-      $(tab .element) .find (".tab-title") .attr ("title", fileURL .startsWith ("id:") ? _ ("Currently still unsaved.") : decodeURI (fileURL))
+      $(tab .element) .find (".tab-title") .attr ("title", fileURL .startsWith ("id:") ? _ ("Currently still unsaved.") : decodeURI (fileURL));
 
-      electron .ipcRenderer .send ("title", tab .getTitle ())
+      electron .ipcRenderer .send ("title", tab .getTitle ());
 
-      this .saveTabs ()
+      this .saveTabs ();
    }
 
    saveTabs ()
    {
       const
          tabs = this .getTabs (),
-         urls = tabs .map (tab => tab .url)
+         urls = tabs .map (tab => tab .url);
 
-      this .config .openTabs  = urls
-      this .config .activeTab = tabs .length ? this .tabs .getActiveTab () .url : undefined
+      this .config .openTabs  = urls;
+      this .config .activeTab = tabs .length ? this .tabs .getActiveTab () .url : undefined;
    }
 
    tabClosing (tab, abort)
    {
-      tab .webview .send ("close")
+      tab .webview .send ("close");
 
       if (tab !== this .tabs .getActiveTab ())
-         return
-
-      const numTabs = this .tabs .getTabs () .length
+         return;
+;
+      const numTabs = this .tabs .getTabs () .length;
 
       if (numTabs === 1)
-         return
+         return;
 
       const
          position = Math .max (tab .getPosition () - 1, 0),
-         nextTab  = this .tabs .getTabByPosition (position)
+         nextTab  = this .tabs .getTabByPosition (position);
 
-      nextTab .activate ()
+      nextTab .activate ();
    }
 
    tabClose (tab)
@@ -281,84 +282,84 @@ module .exports = new class Tabs
       // If all tabs are closed, open empty tab.
 
       if (!this .tabs .getTabs () .length)
-         this .openTabs ()
+         this .openTabs ();
 
-      this .saveTabs ()
+      this .saveTabs ();
    }
 
    saveFile ()
    {
-      this .tabs .getActiveTab () .webview .send ("save-file", true)
+      this .tabs .getActiveTab () .webview .send ("save-file", true);
    }
 
    saveFileAs (filePath)
    {
       const
          tab     = this .tabs .getActiveTab (),
-         fileURL = url .pathToFileURL (filePath) .href
+         fileURL = url .pathToFileURL (filePath) .href;
 
-      this .setTabURL (tab, fileURL)
+      this .setTabURL (tab, fileURL);
 
-      tab .webview .send ("save-file-as", filePath)
+      tab .webview .send ("save-file-as", filePath);
    }
 
    saveAllFiles ()
    {
       for (const tab of this .tabs .getTabs ())
-         tab .webview .send ("save-file")
+         tab .webview .send ("save-file");
    }
 
    close ()
    {
-      this .saveTabs ()
+      this .saveTabs ();
 
       for (const tab of this .tabs .getTabs ())
-         tab .webview .send ("close")
+         tab .webview .send ("close");
    }
 
    quit ()
    {
-      this .saveTabs ()
+      this .saveTabs ();
 
-      const tabs = this .tabs .getTabs () .filter (tab => tab .initialized)
+      const tabs = this .tabs .getTabs () .filter (tab => tab .initialized);
 
-      let numTabs = tabs .length
+      let numTabs = tabs .length;
 
       for (const tab of tabs)
       {
          tab .webview .addEventListener ("ipc-message", (event) =>
          {
             if (event .channel !== "closed")
-               return
+               return;
 
             if (--numTabs)
-               return
+               return;
 
-            window .close ()
-         })
+            window .close ();
+         });
       }
 
       for (const tab of tabs)
-         tab .webview .send ("close")
+         tab .webview .send ("close");
 
-      //this .maintenance ()
+      //this .maintenance ();
    }
 
    maintenance ()
    {
       // Remove items older than one year, time in milliseconds.
-      new DataStorage (localStorage, "Sunrize.") .removeItems (Date .now () - (1000 * 60 * 60 * 24 * 365))
+      new DataStorage (localStorage, "Sunrize.") .removeItems (Date .now () - (1000 * 60 * 60 * 24 * 365));
    }
 
    // Send messages to tabs
 
    forwardToActiveTab (channel)
    {
-      electron .ipcRenderer .on (channel, (event, ...args) => this .tabs .getActiveTab () .webview .send (channel, ...args))
+      electron .ipcRenderer .on (channel, (event, ...args) => this .tabs .getActiveTab () .webview .send (channel, ...args));
    }
 
    forwardToAllTabs (channel)
    {
-      electron .ipcRenderer .on (channel, (event, ...args) => this .tabs .getTabs () .forEach (tab => tab .webview .send (channel, ...args)))
+      electron .ipcRenderer .on (channel, (event, ...args) => this .tabs .getTabs () .forEach (tab => tab .webview .send (channel, ...args)));
    }
-}
+};