sunrize 1.10.4 → 1.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.10.4",
+  "version": "1.11.0",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -78,13 +78,13 @@
     "url": "https://patreon.com/X_ITE"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.8.1",
-    "@electron-forge/maker-deb": "^7.8.1",
-    "@electron-forge/maker-dmg": "^7.8.1",
-    "@electron-forge/maker-rpm": "^7.8.1",
-    "@electron-forge/maker-squirrel": "^7.8.1",
-    "@electron-forge/maker-zip": "^7.8.1",
-    "@electron-forge/publisher-github": "^7.8.1",
+    "@electron-forge/cli": "^7.9.0",
+    "@electron-forge/maker-deb": "^7.9.0",
+    "@electron-forge/maker-dmg": "^7.9.0",
+    "@electron-forge/maker-rpm": "^7.9.0",
+    "@electron-forge/maker-squirrel": "^7.9.0",
+    "@electron-forge/maker-zip": "^7.9.0",
+    "@electron-forge/publisher-github": "^7.9.0",
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
@@ -99,7 +99,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.35.0",
+    "material-symbols": "^0.36.1",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
     "monaco-editor": "^0.53.0",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.0.9",
+    "x_ite": "^12.1.0",
     "x3d-traverse": "^1.0.13"
   }
 }

package/src/Application/Application.js

@@ -304,7 +304,7 @@ module .exports = class Application
                      click: () => this .mainWindow .webContents .send ("save-file"),
                   },
                   {
-                     label: _("Save As..."),
+                     label: _("Save as..."),
                      accelerator: "Shift+CmdOrCtrl+S",
                      click: async () =>
                      {
@@ -353,7 +353,7 @@ module .exports = class Application
                   ... exportPath ?
                   [
                      {
-                        label: util .format (_("Export As %s"), path .basename (exportPath)),
+                        label: util .format (_("Export as %s"), path .basename (exportPath)),
                         accelerator: "CmdOrCtrl+E",
                         click: () => this .mainWindow .webContents .send ("export-as", exportPath),
                      }
@@ -361,7 +361,7 @@ module .exports = class Application
                   :
                   [ ],
                   {
-                     label: _("Export As..."),
+                     label: _("Export as..."),
                      accelerator: "Shift+CmdOrCtrl+E",
                      click: async () =>
                      {
@@ -928,7 +928,6 @@ module .exports = class Application
       window .on ("unmaximize",        () => this .onunmaximize ());
       window .on ("enter-full-screen", () => this .onenterfullscreen ());
       window .on ("leave-full-screen", () => this .onleavefullscreen ());
-      window .on ("blur",              () => this .onblur ());
       window .on ("close",        (event) => this .onclose (event));
 
       if (this .config .fullscreen)
@@ -1170,11 +1169,6 @@ module .exports = class Application
       this .config .maximized  = false;
    }
 
-   onblur ()
-   {
-      this .mainWindow .webContents .send ("save-all-files");
-   }
-
    onclose (event)
    {
       if (!this .mainWindow .closing)

package/src/Application/Document.js

@@ -70,7 +70,7 @@ module .exports = class Document extends Interface
       // File Menu
 
       electron .ipcRenderer .on ("open-files",       (event, urls)     => this .loadURL (urls [0])); // DEBUG
-      electron .ipcRenderer .on ("save-file",        (event, force)    => this .saveFile (force));
+      electron .ipcRenderer .on ("save-file",        (event)           => this .saveFile ());
       electron .ipcRenderer .on ("save-file-as",     (event, filePath) => this .saveFileAs (filePath));
       electron .ipcRenderer .on ("save-copy-as",     (event, filePath) => this .saveCopyAs (filePath));
       electron .ipcRenderer .on ("auto-save",        (event, value)    => this .autoSave = value);
@@ -434,13 +434,10 @@ Viewpoint {
     *
     * @param {boolean} force force save
     */
-   saveFile (force = false)
+   saveFile ()
    {
       this .footer .scriptEditor ?.apply ();
 
-      if (!UndoManager .shared .saveNeeded && !force)
-         return;
-
       const scene = this .browser .currentScene;
 
       // Infer profile and components.
@@ -515,7 +512,7 @@ Viewpoint {
 
       Editor .rewriteURLs (scene, scene, oldWorldURL, scene .worldURL);
 
-      this .saveFile (true);
+      this .saveFile ();
    }
 
    /**
@@ -536,7 +533,7 @@ Viewpoint {
 
       Editor .rewriteURLs (scene, scene, oldWorldURL, newWorldURL, undoManager);
 
-      this .saveFile (true);
+      this .saveFile ();
 
       undoManager .undo ();
 
@@ -552,19 +549,19 @@ Viewpoint {
    {
       this .config .global .autoSave = value;
 
-      this .registerAutoSave ();
+      this .requestAutoSave ();
    }
 
    #saveTimeoutId = undefined;
 
-   registerAutoSave ()
+   requestAutoSave ()
    {
       if (!this .autoSave)
          return;
 
       clearTimeout (this .#saveTimeoutId);
 
-      this .#saveTimeoutId = setTimeout (() => this .saveFile (false), 1000);
+      this .#saveTimeoutId = setTimeout (() => this .saveFile (), 1000);
    }
 
    exportAs (filePath)
@@ -574,7 +571,8 @@ Viewpoint {
 
    close ()
    {
-      this .saveFile (false);
+      if (UndoManager .shared .saveNeeded)
+         this .saveFile ();
 
       electron .ipcRenderer .sendToHost ("closed");
    }
@@ -598,7 +596,7 @@ Viewpoint {
       this .updateMenu ();
 
       if (UndoManager .shared .saveNeeded)
-         this .registerAutoSave ();
+         this .requestAutoSave ();
 
       electron .ipcRenderer .sendToHost ("saved", !UndoManager .shared .saveNeeded);
    }

package/src/Application/Footer.js

@@ -16,11 +16,9 @@ module .exports = class Footer extends Tabs
 
    addTabs ()
    {
-      this .addTextTab ("console",       _("Console"))
-      this .addTextTab ("script-editor", _("Script Editor"))
-
-      if (process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT")
-         this .addTextTab ("animation-editor", _("Animation Editor"))
+      this .addTextTab ("console",          _("Console"))
+      this .addTextTab ("script-editor",    _("Script Editor"))
+      this .addTextTab ("animation-editor", _("Animation Editor"))
 
       this .console = new Console (this .getPanel ("console"))
    }

package/src/Application/Tabs.js

@@ -51,7 +51,6 @@ module .exports = new class Tabs
 
       electron .ipcRenderer .on ("open-files",     (event, urls)     => this .openTabs (urls));
       electron .ipcRenderer .on ("reload"        , (event)           => this .reloadTab ());
-      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-tab",      (event)           => this .tabs .getActiveTab () ?.close (true));
@@ -68,7 +67,7 @@ module .exports = new class Tabs
       this .forwardToAllTabs ("auto-save");
       this .forwardToActiveTab ("export-as");
 
-      this .forwardToActiveTab ("scene-properties");
+      this .forwardToActiveTab ("save-file");
       this .forwardToActiveTab ("save-copy-as");
       this .forwardToActiveTab ("scene-properties");
 
@@ -110,6 +109,7 @@ module .exports = new class Tabs
       this .forwardToActiveTab ("move-selection-center-to-snap-target");
 
       this .forwardToActiveTab ("script-editor");
+      this .forwardToActiveTab ("animation-members-list");
       this .forwardToActiveTab ("outline-editor");
 
       // Restore tabs.
@@ -315,11 +315,6 @@ module .exports = new class Tabs
       this .saveTabs ();
    }
 
-   saveFile ()
-   {
-      this .tabs .getActiveTab () .webview .send ("save-file", true);
-   }
-
    saveFileAs (filePath)
    {
       const

package/src/Components/Navigation/Collision.js

@@ -11,6 +11,14 @@ function Collision (executionContext)
 
 Object .assign (Object .setPrototypeOf (Collision .prototype, X3D .Collision .prototype),
 {
+   initialize ()
+   {
+      X3D .Collision .prototype .initialize .call (this);
+
+      this ._proxy .addInterest ("set_tool_proxy__", this);
+
+      this .set_tool_proxy__ ();
+   },
    getProxyDisplay ()
    {
       return this .proxyDisplay;
@@ -21,21 +29,23 @@ Object .assign (Object .setPrototypeOf (Collision .prototype, X3D .Collision .pr
 
       this .set_collisionObjects__ ();
    },
-   set_proxy__ ()
+   set_tool_proxy__ ()
    {
-      this .pointingObjects .delete (this .proxyNode);
-      this .visibleObjects  .delete (this .proxyNode);
+      this .pointingObjects .delete (this .toolProxyNode);
+      this .visibleObjects  .delete (this .toolProxyNode);
+
+      this .toolProxyNode = X3D .X3DCast (X3D .X3DConstants .X3DChildNode, this ._proxy);
 
-      X3D .Collision .prototype .set_proxy__ .call (this);
+      this .set_collisionObjects__ ();
    },
    set_pointingObjects__ ()
    {
-      if (this .proxyNode)
+      if (this .toolProxyNode)
       {
          if (this .proxyDisplay)
-            this .pointingObjects .add (this .proxyNode);
+            this .pointingObjects .add (this .toolProxyNode);
          else
-            this .pointingObjects .delete (this .proxyNode);
+            this .pointingObjects .delete (this .toolProxyNode);
       }
 
       X3D .Collision .prototype .set_pointingObjects__ .call (this);
@@ -51,12 +61,12 @@ Object .assign (Object .setPrototypeOf (Collision .prototype, X3D .Collision .pr
    },
    set_visibleObjects__ ()
    {
-      if (this .proxyNode)
+      if (this .toolProxyNode)
       {
          if (this .proxyDisplay)
-            this .visibleObjects .add (this .proxyNode);
+            this .visibleObjects .add (this .toolProxyNode);
          else
-            this .visibleObjects .delete (this .proxyNode);
+            this .visibleObjects .delete (this .toolProxyNode);
       }
 
       X3D .Collision .prototype .set_visibleObjects__ .call (this);

package/src/Controls/AnimationPropertiesPopover.js

@@ -0,0 +1,98 @@
+"use strict";
+
+const
+   X3D  = require ("../X3D"),
+   util = require ("util"),
+   $    = require ("jquery"),
+   _    = require ("../Application/GetText");
+
+require ("./Popover");
+
+$.fn.animationPropertiesPopover = function (editor)
+{
+   // Create content.
+
+   const content = $("<div></div>");
+
+   $("<span></span>")
+      .text (_("Frames"))
+      .appendTo (content);
+
+   const durationInput = $("<input></input>")
+      .attr ("type", "number")
+      .attr ("step", 1)
+      .attr ("min", 1)
+      .attr ("placeholder", _("Enter duration"))
+      .val (editor .getDuration ())
+      .on ("change input", updateTime)
+      .appendTo (content);
+
+   $("<span></span>")
+      .text (_("Frame Rate (fps)"))
+      .appendTo (content);
+
+   const frameRateInput = $("<input></input>")
+      .attr ("type", "number")
+      .attr ("step", 1)
+      .attr ("min", 1)
+      .attr ("placeholder", _("Enter frame rate"))
+      .val (editor .getFrameRate ())
+      .on ("change input", updateTime)
+      .appendTo (content);
+
+   const scaleInput = $("<input></input>")
+      .attr ("type", "checkbox")
+      .attr ("id", "keyframe-scale")
+      .appendTo (content);
+
+   if (editor .config .file .scaleKeyframes)
+      scaleInput .attr ("checked", "");
+
+   const scaleLabel = $("<label></label>")
+      .attr ("for", "keyframe-scale")
+      .text (_("Scale Keyframes"))
+      .appendTo (content);
+
+   const timeText = $("<span></span>")
+      .attr ("title", _("Duration (hours:minutes:seconds:frames)."))
+      .css ("margin-top", "2px")
+      .css ("margin-bottom", "4px")
+      .appendTo (content);
+
+   const applyButton = $("<button></button>")
+      .text (_("Apply"))
+      .appendTo (content);
+
+   updateTime ();
+
+   function updateTime ()
+   {
+      const duration  = parseInt (durationInput .val ())
+      const frameRate = parseInt (frameRateInput .val ());
+
+      timeText .text (util .format (_("Duration: %s"), editor .formatFrames (duration, frameRate)));
+   }
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      position: {
+         my: "bottom right",
+         at: "top left",
+      },
+      content: content,
+      events: {
+         show: (event, api) =>
+         {
+            applyButton .on ("click", (event) =>
+            {
+               api .toggle (false);
+               editor .resizeAnimation (parseInt (durationInput .val ()), parseInt (frameRateInput .val ()), scaleInput .prop ("checked"));
+            })
+         },
+      },
+   });
+
+   return this;
+};
+

package/src/Controls/Splitter.js

@@ -3,56 +3,56 @@
 const
    $         = require ("jquery"),
    Interface = require ("../Application/Interface"),
-   Algorithm = require ("../Bits/Algorithm")
+   Algorithm = require ("../Bits/Algorithm");
 
 module .exports = class Splitter extends Interface
 {
    constructor (element, orientation)
    {
-      super (`Sunrize.Splitter.${element .attr ("id")}.`)
+      super (`Sunrize.Splitter.${element .attr ("id")}.`);
 
-      this .splitter    = element
-      this .orientation = orientation
+      this .splitter    = element;
+      this .orientation = orientation;
 
       switch (this .orientation)
       {
          case "horizontal":
          {
-            const top = this .splitter .find ("> .horizontal-splitter-top")
+            const top = this .splitter .find ("> .horizontal-splitter-top");
 
             top .resizable ({
                minHeight: 0,
                handles: "s",
                resize: () => this .position = this .position,
-            })
+            });
 
-            top .find ("> .ui-resizable-s") .append ($("<div></div>"))
-            break
+            top .find ("> .ui-resizable-s") .append ($("<div></div>"));
+            break;
          }
          case "vertical":
          {
-            const left = this .splitter .find ("> .vertical-splitter-left")
+            const left = this .splitter .find ("> .vertical-splitter-left");
 
             left .resizable ({
                minWidth: 0,
                handles: "e",
                resize: () => this .position = this .position,
-            })
+            });
 
-            left .find ("> .ui-resizable-e") .append ($("<div></div>"))
-            break
+            left .find ("> .ui-resizable-e") .append ($("<div></div>"));
+            break;
          }
       }
 
-      this .setup ()
+      this .setup ();
    }
 
    configure ()
    {
       if (this .config .file .position !== undefined)
-         this .position = this .config .file .position
+         this .position = this .config .file .position;
       else
-         this .splitter .trigger ("position")
+         this .splitter .trigger ("position");
    }
 
    get position ()
@@ -61,15 +61,15 @@ module .exports = class Splitter extends Interface
       {
          case "horizontal":
          {
-            const top = this .splitter .find ("> .horizontal-splitter-top")
+            const top = this .splitter .find ("> .horizontal-splitter-top");
 
-            return this .position = top .outerHeight () / this .splitter .innerHeight ()
+            return top .outerHeight () / this .splitter .innerHeight ();
          }
          case "vertical":
          {
-            const left = this .splitter .find ("> .vertical-splitter-left")
+            const left = this .splitter .find ("> .vertical-splitter-left");
 
-            return left .outerWidth () / this .splitter .innerWidth ()
+            return left .outerWidth () / this .splitter .innerWidth ();
          }
       }
    }
@@ -79,9 +79,9 @@ module .exports = class Splitter extends Interface
     */
    set position (position)
    {
-      position = Algorithm .clamp (position, 0, 1)
+      position = Algorithm .clamp (position, 0, 1);
 
-      this .config .file .position = position
+      this .config .file .position = position;
 
       switch (this .orientation)
       {
@@ -89,24 +89,24 @@ module .exports = class Splitter extends Interface
          {
             const
                top    = this .splitter .find ("> .horizontal-splitter-top"),
-               bottom = this .splitter .find ("> .horizontal-splitter-bottom")
+               bottom = this .splitter .find ("> .horizontal-splitter-bottom");
 
-            top    .css ("height", (100 * position) + "%")
-            bottom .css ("height", (100 * (1 - position)) + "%")
-            break
+            top    .css ("height", (100 * position) + "%");
+            bottom .css ("height", (100 * (1 - position)) + "%");
+            break;
          }
          case "vertical":
          {
             const
                left  = this .splitter .find ("> .vertical-splitter-left"),
-               right = this .splitter .find ("> .vertical-splitter-right")
+               right = this .splitter .find ("> .vertical-splitter-right");
 
-            left  .css ("width", (100 * position) + "%")
-            right .css ("width", (100 * (1 - position)) + "%")
-            break
+            left  .css ("width", (100 * position) + "%");
+            right .css ("width", (100 * (1 - position)) + "%");
+            break;
          }
       }
 
-      this .splitter .trigger ("position")
+      this .splitter .trigger ("position");
    }
 }