sunrize 1.6.15 → 1.7.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.6.15",
+  "version": "1.7.0",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -85,26 +85,26 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^30.0.8",
+    "electron": "^30.0.9",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
     "fullname": "^5.0.0",
     "jquery": "^3.7.1",
-    "jquery-ui-dist": "^1.13.2",
+    "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.16",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.18.0",
+    "material-symbols": "^0.19.0",
     "md5": "^2.3.0",
     "mime-types": "^2.1.35",
-    "monaco-editor": "^0.48.0",
+    "monaco-editor": "^0.49.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.0.0",
-    "x_ite": "^9.6.3"
+    "x_ite": "^9.7.0"
   },
   "config": {
     "forge": {

package/src/Application/Application.js

@@ -87,7 +87,6 @@ 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 ("add-recent-document", (event, filePath)    => this .addRecentDocument (filePath));
       electron .ipcMain .on ("add-recent-location", (event, fileURL)     => this .addRecentLocation (fileURL));
       electron .ipcMain .on ("update-menu",         (event, options)     => this .updateMenu (options));
       electron .ipcMain .on ("context-menu",        (event, id, menu)    => this .contextMenu (id, menu));
@@ -868,12 +867,7 @@ module .exports = class Application
       if (this .ready)
       {
          for (const fileURL of urls)
-         {
-            if (fileURL .startsWith ("file:"))
-               this .addRecentDocument (url .fileURLToPath (fileURL));
-            else
-               this .addRecentLocation (fileURL);
-         }
+            this .addRecentLocation (fileURL);
 
          this .mainWindow .webContents .send ("open-files", urls);
          this .mainWindow .show ();
@@ -989,6 +983,12 @@ module .exports = class Application
 
    addRecentLocation (fileURL)
    {
+      if (fileURL .startsWith ("id:"))
+         return;
+      
+      if (fileURL .startsWith ("file:"))
+         return this .addRecentDocument (url .fileURLToPath (fileURL));
+
       this .config .recentLocations = this .config .recentLocations
          .filter (item => item !== fileURL)
          .toSpliced (0, 0, fileURL)

package/src/Application/Document.js

@@ -395,8 +395,6 @@ Viewpoint {
          }
 
          fs .writeFile (this .filePath, Editor .getContents (scene, path .extname (this .filePath)), Function .prototype);
-
-         electron .ipcRenderer .send ("add-recent-document", this .filePath);
       }
       else
       {

package/src/Application/Tabs.js

@@ -133,12 +133,7 @@ module .exports = new class Tabs
       })
 
       for (const fileURL of openTabs .filter (fileURL => !fileURL .startsWith ("id:")))
-      {
-         if (fileURL .startsWith ("file:"))
-            electron .ipcRenderer .send ("add-recent-document", url .fileURLToPath (fileURL));
-         else
-            electron .ipcRenderer .send ("add-recent-location", fileURL);
-      }
+         electron .ipcRenderer .send ("add-recent-location", fileURL);
 
       if (openTabs .length)
          this .openTabs (openTabs, false);
@@ -266,6 +261,7 @@ module .exports = new class Tabs
       $(tab .element) .find (".tab-title") .attr ("title", fileURL .startsWith ("id:") ? _("Currently still unsaved.") : decodeURI (fileURL));
 
       electron .ipcRenderer .send ("title", tab .getTitle ());
+      electron .ipcRenderer .send ("add-recent-location", fileURL);
 
       this .saveTabs ();
    }
@@ -303,6 +299,8 @@ module .exports = new class Tabs
    {
       // If all tabs are closed, open empty tab.
 
+      electron .ipcRenderer .send ("add-recent-location", tab .url);
+
       if (!this .tabs .getTabs () .length)
          this .openTabs ();
 

package/src/Controls/AudioPreviewPopover.js

@@ -0,0 +1,74 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   path        = require ("path"),
+   X3D         = require ("../X3D"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+require ("./Popover");
+
+$.fn.audioPreviewPopover = async function (node)
+{
+   // Create content.
+
+   const preview = $("<div></div") .css ("width", "30vh");
+
+   async function loadNow ()
+   {
+      preview .empty ();
+
+      const audio = $("<audio controls></audio>")
+         .css ("width", "30vh")
+         .appendTo (preview);
+
+      for (const url of node ._url)
+      {
+         $("<source></source>")
+            .attr ("src", new URL (url, node .getExecutionContext () .worldURL))
+            .appendTo (audio);
+      }
+   }
+
+   loadNow ();
+
+   // Reload handling.
+
+   const _url = Symbol ();
+
+   node ._url .addFieldCallback (_url, loadNow);
+
+   this .data ("preview", { loadNow });
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      preview: true,
+      content: preview,
+      show: {
+         modal: false,
+      },
+      style: {
+         classes: "qtip-tipsy qtip-preview qtip-audio",
+      },
+      events: {
+         hide: (event, api) =>
+         {
+            node ._url .removeFieldCallback (_url);
+
+            this .removeData ("preview");
+
+            $(".tree-view") .off (".preview");
+
+            api .destroy (true);
+         },
+      },
+   });
+
+   $(".tree-view") .on ("scroll.preview", () => this .qtip ("reposition"));
+
+   return this;
+};
+

package/src/Controls/MaterialPreviewPopover.js

@@ -0,0 +1,135 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   path        = require ("path"),
+   X3D         = require ("../X3D"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+require ("./Popover");
+
+$.fn.materialPreviewPopover = async function (node)
+{
+   // Create content.
+
+   const preview = $("<div></div") .css ("width", "30vh");
+
+   const canvas = $("<x3d-canvas></x3d-canvas>")
+      .css ({ width: "30vh", height: "30vh" })
+      .attr ("cache", false)
+      .attr ("splashScreen", false)
+      .attr ("contextMenu", false)
+      .attr ("notifications", false)
+      .appendTo (preview);
+
+   const
+      browser = canvas .prop ("browser"),
+      scene   = browser .createScene (browser .getProfile ("Core"));
+
+   scene .setWorldURL (node .getExecutionContext () .worldURL);
+
+   await browser .loadURL (new X3D .MFString (path .join (__dirname, "../assets/X3D/MaterialPreview.x3d")));
+
+   // Create material node.
+
+   const
+      appearanceNode = browser .currentScene .getExportedNode ("Appearance"),
+      previewNode    = node .copy (scene);
+
+   // Assign material node.
+
+   for (const field of previewNode .getFields ())
+   {
+      switch (field .getType ())
+      {
+         case X3D .X3DConstants .SFNode:
+            field .setValue (null);
+            break
+         case X3D .X3DConstants .MFNode:
+            field .length = 0;
+            break;
+         default:
+            field .addReference (node .getField (field .getName ()));
+            field .removeFieldInterest (node .getField (field .getName ()));
+            break;
+      }
+   }
+
+   previewNode .setup ();
+
+   appearanceNode .material = previewNode;
+
+   // Handle TwoSidedMaterial;
+
+   if (node .getType () .includes (X3D .X3DConstants .TwoSidedMaterial))
+   {
+      // Create material node.
+
+      const appearanceNode = browser .currentScene .getExportedNode ("BackAppearance");
+
+      var backPreviewNode = scene .createNode ("Material");
+
+      // Assign material node.
+
+      const names = [
+         "ambientIntensity",
+         "diffuseColor",
+         "specularColor",
+         "emissiveColor",
+         "shininess",
+         "transparency",
+      ];
+
+      for (const name of names)
+      {
+         const
+            field = backPreviewNode .getField (name),
+            back  = `back${name [0] .toUpperCase ()}${name .slice (1)}`;
+
+         switch (field .getType ())
+         {
+            case X3D .X3DConstants .SFNode:
+            case X3D .X3DConstants .MFNode:
+               break;
+            default:
+               field .addReference (node .getField (back));
+               field .removeFieldInterest (node .getField (back));
+               break;
+         }
+      }
+
+      appearanceNode .material = backPreviewNode;
+   }
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      preview: true,
+      content: preview,
+      show: {
+         modal: false,
+      },
+      style: {
+         classes: "qtip-tipsy qtip-preview",
+      },
+      events: {
+         hide: (event, api) =>
+         {
+            previewNode      .dispose ();
+            backPreviewNode ?.dispose ();
+            browser          .dispose ();
+
+            $(".tree-view") .off (".preview");
+
+            api .destroy (true);
+         },
+      },
+   });
+
+   $(".tree-view") .on ("scroll.preview", () => this .qtip ("reposition"));
+
+   return this;
+};
+

package/src/Controls/Popover.js

@@ -4,14 +4,22 @@ const $ = require ("jquery");
 
 require ("qtip2");
 
+$.fn.qtip.zindex = 1000; // Results in 1000 and 1001.
+
 $.fn.popover = function (options)
 {
+   $("[data-hasqtip]") .qtip ?.("hide") .qtip ("destroy", true);
+
+   if (!options .preview)
+      $(".show-preview.on") .removeClass ("on") .addClass ("off");
+
    return this .qtip ($.extend (true,
    {
       position: {
          my: "top right",
          at: "bottom left",
          viewport: $("body"),
+         effect: false,
       },
       style: {
          classes: "qtip-tipsy",

package/src/Controls/TexturePreviewPopover.js

@@ -0,0 +1,192 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   path        = require ("path"),
+   X3D         = require ("../X3D"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+require ("./Popover");
+
+function formatTime (time)
+{
+   const s = time % 60;
+
+   let string = s .toFixed (2) .padStart (5, "0");
+
+   time /= 60;
+   time  = Math .floor (time);
+
+   const m = time % 60;
+
+   string = String (m) .padStart (2, "0") + ":" + string;
+
+   time /= 60;
+   time  = Math .floor (time);
+
+   const h = time % 60;
+
+   string = String (h) .padStart (2, "0") + ":" + string;
+
+   return string;
+}
+
+$.fn.texturePreviewPopover = async function (node)
+{
+   // Create content.
+
+   const preview = $("<div></div") .css ("width", "30vh");
+
+   const canvas = $("<x3d-canvas></x3d-canvas>")
+      .css ("width","30vh")
+      .css ("height", "30vh")
+      .attr ("cache", false)
+      .attr ("splashScreen", false)
+      .attr ("contextMenu", false)
+      .attr ("notifications", false)
+      .appendTo (preview);
+
+   const
+      browser = canvas .prop ("browser"),
+      scene   = browser .createScene (browser .getProfile ("Core"));
+
+   scene .setWorldURL (node .getExecutionContext () .worldURL);
+
+   await browser .loadURL (new X3D .MFString (path .join (__dirname, "../assets/X3D/TexturePreview.x3d")));
+
+   // Create texture node.
+
+   const
+      x3dSyntax      = Editor .exportX3D (node .getExecutionContext (), [node]),
+      nodes          = await Editor .importX3D (scene, x3dSyntax, new UndoManager ()),
+      previewNode    = nodes [0],
+      appearanceNode = browser .currentScene .getExportedNode ("Appearance");
+
+   // Assign texture node.
+
+   for (const field of previewNode .getFields ())
+   {
+      switch (field .getType ())
+      {
+         case X3D .X3DConstants .SFNode:
+         case X3D .X3DConstants .MFNode:
+            break;
+         default:
+            field .addReference (node .getField (field .getName ()));
+            field .removeFieldInterest (node .getField (field .getName ()));
+            break;
+      }
+   }
+
+   appearanceNode .texture = previewNode;
+
+   // Sizes and special cases.
+
+   const sizes = $("<p></p>") .appendTo (preview);
+
+   function loadState (loadState)
+   {
+      switch (loadState)
+      {
+         case X3D .X3DConstants .NOT_STARTED_STATE:
+         {
+            sizes .text (_("Loading not started."))
+            break;
+         }
+         case X3D .X3DConstants .IN_PROGRESS_STATE:
+         {
+            sizes .text (_("Loading in progress."))
+            break;
+         }
+         case X3D .X3DConstants .FAILED_STATE:
+         {
+            sizes .text (_("Loading failed."))
+            break;
+         }
+         case X3D .X3DConstants .COMPLETE_STATE:
+         {
+            sizesText ();
+            break;
+         }
+      }
+   }
+
+   function sizesText ()
+   {
+      for (const type of node .getType () .toReversed ())
+      {
+         switch (type)
+         {
+            case X3D .X3DConstants .MovieTexture:
+            {
+               sizes .text (`${node .getWidth ()} × ${node .getHeight ()}, ${formatTime (node ._duration_changed .getValue ())}`);
+               break;
+            }
+            case X3D .X3DConstants .X3DEnvironmentTextureNode:
+            {
+               sizes .text (`${node .getSize ()} × ${node .getSize ()}`);
+               break;
+            }
+            case X3D .X3DConstants .X3DTexture2DNode:
+            {
+               sizes .text (`${node .getWidth ()} × ${node .getHeight ()}`);
+               break;
+            }
+            case X3D .X3DConstants .X3DTexture3DNode:
+            {
+               sizes .text (`${node .getWidth ()} × ${node .getHeight ()} × ${node .getDepth ()}`);
+               break;
+            }
+            default:
+               continue;
+         }
+
+         break;
+      }
+   }
+
+   const _loadState = Symbol ();
+
+   node ._loadState .addFieldCallback (_loadState, loadState);
+
+   loadState (node ._loadState .getValue ());
+
+   // Reload handling.
+
+   this .data ("preview", previewNode);
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      preview: true,
+      content: preview,
+      show: {
+         modal: false,
+      },
+      style: {
+         classes: "qtip-tipsy qtip-preview",
+      },
+      events: {
+         hide: (event, api) =>
+         {
+            node ._loadState .removeFieldCallback (_loadState);
+
+            this .removeData ("preview");
+
+            previewNode .dispose ();
+            browser     .dispose ();
+
+            $(".tree-view") .off (".preview");
+
+            api .destroy (true);
+         },
+      },
+   });
+
+   $(".tree-view") .on ("scroll.preview", () => this .qtip ("reposition"));
+
+   return this;
+};
+

package/src/Controls/VideoPreviewPopover.js

@@ -0,0 +1,117 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   path        = require ("path"),
+   X3D         = require ("../X3D"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+require ("./Popover");
+
+$.fn.videoPreviewPopover = async function (node)
+{
+   // Create content.
+
+   const
+      preview   = $("<div></div"),
+      container = $("<div></div") .appendTo (preview);
+
+   preview
+      .css ("min-width", "300px")
+      .css ("width", "30vh");
+
+   async function loadNow ()
+   {
+      container .empty ();
+
+      const video = $("<video controls></video>")
+         .css ("min-width", "300px")
+         .css ("width", "30vh")
+         .appendTo (container);
+
+      for (const url of node ._url)
+      {
+         $("<source></source>")
+            .attr ("src", new URL (url, node .getExecutionContext () .worldURL))
+            .appendTo (video);
+      }
+   }
+
+   // Sizes and special cases.
+
+   const sizes = $("<p></p>") .appendTo (preview);
+
+   function loadState (loadState)
+   {
+      switch (loadState)
+      {
+         case X3D .X3DConstants .NOT_STARTED_STATE:
+         {
+            sizes .text (_("Loading not started."))
+            break;
+         }
+         case X3D .X3DConstants .IN_PROGRESS_STATE:
+         {
+            sizes .text (_("Loading in progress."))
+            break;
+         }
+         case X3D .X3DConstants .FAILED_STATE:
+         {
+            sizes .text (_("Loading failed."))
+            break;
+         }
+         case X3D .X3DConstants .COMPLETE_STATE:
+         {
+            sizes .text (`${node .getWidth ()} × ${node .getHeight ()}`);
+            break;
+         }
+      }
+   }
+
+   // Reload handling.
+
+   const
+      _loadState = Symbol (),
+      _url       = Symbol ();
+
+   node ._loadState .addFieldCallback (_loadState, loadState);
+   node ._url       .addFieldCallback (_url,       loadNow);
+
+   loadState (node ._loadState .getValue ());
+   loadNow ();
+
+   this .data ("preview", { loadNow });
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      preview: true,
+      content: preview,
+      show: {
+         modal: false,
+      },
+      style: {
+         classes: "qtip-tipsy qtip-preview qtip-video",
+      },
+      events: {
+         hide: (event, api) =>
+         {
+            node ._loadState .removeFieldCallback (_loadState);
+            node ._url       .removeFieldCallback (_url);
+
+            this .removeData ("preview");
+
+            $(".tree-view") .off (".preview");
+
+            api .destroy (true);
+         },
+      },
+   });
+
+   $(".tree-view") .on ("scroll.preview", () => this .qtip ("reposition"));
+
+   return this;
+};
+

package/src/Editors/OutlineEditor.js

@@ -1000,6 +1000,8 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          copy               = node .copy (executionContext),
          index              = parseInt (element .attr ("index"));
 
+      copy .setup ();
+
       UndoManager .shared .beginUndo (_("Unlink Clone"));
 
       if (node .getName ())