sunrize 2.0.6 → 2.0.8

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "2.0.6",
-  "description": "A Multi-Platform X3D Editor",
+  "version": "2.0.8",
+  "description": "Sunrize — A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
     "sunrize": "bin/sunrize.js"
@@ -92,7 +92,7 @@
     "@vscode/codicons": "^0.0.44",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^40.6.1",
+    "electron": "^41.0.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -109,9 +109,9 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "tweakpane": "^3.1.10",
+    "tweakpane": "^4.0.5",
     "update-electron-app": "^3.1.2",
-    "x_ite": "^14.0.6",
+    "x_ite": "^14.0.9",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Application.js

@@ -51,6 +51,8 @@ module .exports = class Application
 
    constructor ()
    {
+      // process .env .SUNRISE_ENVIRONMENT = "DEVELOPMENT"; // Windows test
+
       if (process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT")
          process .env .ELECTRON_ENABLE_LOGGING = 1;
 
@@ -527,15 +529,6 @@ module .exports = class Application
                      label: _("Show All Objects"),
                      click: () => this .mainWindow .webContents .send ("show-all-objects"),
                   },
-                  { type: "separator" },
-                  {
-                     label: _("Transform to Zero"),
-                     click: () => this .mainWindow .webContents .send ("transform-to-zero"),
-                  },
-                  {
-                     label: _("Remove Empty Groups"),
-                     click: () => this .mainWindow .webContents .send ("remove-empty-groups"),
-                  },
                ],
             },
             {

package/src/Application/Document.js

@@ -1267,6 +1267,8 @@ Viewpoint {
             label: _("Viewpoints"),
             submenu: viewpoints .filter ((_, index) => index > 0) .map ((viewpointNode, index) => ({
                label: `${viewpointNode ._description .getValue () || viewpointNode .getDisplayName () || `VP${index + 1}}`}`,
+               type: "radio",
+               checked: viewpointNode ._isBound .getValue (),
                args: ["bindViewpoint", index + 1],
             })),
          },

package/src/Controls/MaterialPreviewPopover.js

@@ -37,26 +37,22 @@ $.fn.materialPreviewPopover = async function (node)
    // Create material node.
 
    const
-      appearanceNode = browser .currentScene .getExportedNode ("Appearance"),
-      previewNode    = node .copy (scene);
+      x3dSyntax     = await Editor .exportX3D (node .getExecutionContext (), [node]),
+      nodes         = await Editor .importX3D (scene, x3dSyntax),
+      previewNode   = nodes [0],
+      appearanceNode = browser .currentScene .getExportedNode ("Appearance");
 
    // Assign material node.
 
    for (const field of previewNode .getFields ())
+      connect (field, node .getField (field .getName ()));
+
+   for (const [i, extension] of previewNode ._extensions ?.entries () ?? [ ])
    {
-      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;
-      }
+      const original = node ._extensions [i] .getValue ();
+
+      for (const field of extension .getValue () .getFields ())
+         connect (field, original .getField (field .getName ()));
    }
 
    previewNode .setup ();
@@ -90,16 +86,7 @@ $.fn.materialPreviewPopover = async function (node)
             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;
-         }
+         connect (field, node .getField (back));
       }
 
       appearanceNode .material = backPreviewNode;
@@ -119,6 +106,9 @@ $.fn.materialPreviewPopover = async function (node)
       events: {
          hide: (event, api) =>
          {
+            for (const extension of Array .from (previewNode ._extensions ?? [ ]))
+               extension .dispose ();
+
             previewNode      .dispose ();
             backPreviewNode ?.dispose ();
             browser          .dispose ();
@@ -135,3 +125,16 @@ $.fn.materialPreviewPopover = async function (node)
    return this;
 };
 
+function connect (field, original)
+{
+   switch (field .getType ())
+   {
+      case X3D .X3DConstants .SFNode:
+      case X3D .X3DConstants .MFNode:
+         break;
+      default:
+         original .addFieldInterest (field);
+         field .assign (original);
+         break;
+   }
+}

package/src/Controls/TexturePreviewPopover.js

@@ -69,18 +69,7 @@ $.fn.texturePreviewPopover = async function (node)
    // 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;
-      }
-   }
+      connect (field, node .getField (field .getName ()));
 
    appearanceNode .texture = previewNode;
 
@@ -194,3 +183,16 @@ $.fn.texturePreviewPopover = async function (node)
    return this;
 };
 
+function connect (field, original)
+{
+   switch (field .getType ())
+   {
+      case X3D .X3DConstants .SFNode:
+      case X3D .X3DConstants .MFNode:
+         break;
+      default:
+         original .addFieldInterest (field);
+         field .assign (original);
+         break;
+   }
+}

package/src/Editors/Library.js

@@ -188,7 +188,7 @@ module .exports = new class Library extends Dialog
       const node = nodes .find (node => node .text () .toLowerCase () === input)
          ?? nodes .sort ((a, b) => a .data ("similarity") - b .data ("similarity")) .at (-1);
 
-      node .trigger ("click");
+      node .trigger ("dblclick");
    }
 
    update ()

package/src/Editors/MaterialsLibrary.js

@@ -4,9 +4,10 @@ const
    $           = require ("jquery"),
    X3D         = require ("../X3D"),
    LibraryPane = require ("./LibraryPane"),
+   Editor      = require("../Undo/Editor"),
    _           = require ("../Application/GetText");
 
-module .exports = class Materials extends LibraryPane
+module .exports = class MaterialsLibrary extends LibraryPane
 {
    id          = "MATERIALS";
    description = "Materials";
@@ -36,7 +37,7 @@ module .exports = class Materials extends LibraryPane
       const
          canvas  = $("<x3d-canvas preserveDrawingBuffer='true' xrSessionMode='NONE'></x3d-canvas>"),
          browser = canvas .prop ("browser"),
-         scene   = await browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/Materials.x3d`));
+         scene   = await browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/../assets/X3D/Materials.x3d`));
 
       // Buttons
 
@@ -83,7 +84,7 @@ module .exports = class Materials extends LibraryPane
                   .addClass ("text")
                   .text (`${group .getNodeName ()} ${c + 1}`))
                .appendTo (this .#list)
-               .on ("click", () => this .importMaterial (material .getNodeName ())));
+               .on ("dblclick", () => this .importMaterial (material .getNodeName ())));
          }
       }
 
@@ -113,7 +114,7 @@ module .exports = class Materials extends LibraryPane
       const
          canvas  = $("<x3d-canvas preserveDrawingBuffer='true' xrSessionMode='NONE'></x3d-canvas>"),
          browser = canvas .prop ("browser"),
-         scene   = await browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/Materials.x3d`));
+         scene   = await browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/../assets/X3D/Materials.x3d`));
 
       scene .addComponent (browser .getComponent ("X_ITE"));
 
@@ -146,7 +147,7 @@ module .exports = class Materials extends LibraryPane
 
          if (this .config .global .convertToPhysical)
          {
-            const material = this .convertPhongToPhysical (scene, appearance .material);
+            const material = Editor .convertPhongToPhysical (scene, appearance .material, null);
 
             scene .updateNamedNode (appearance .material .getNodeName (), material);
 
@@ -170,49 +171,4 @@ module .exports = class Materials extends LibraryPane
       browser .dispose ();
       canvas .remove ();
    }
-
-   convertPhongToPhysical (executionContext, phong)
-   {
-      let
-         physical          = executionContext .createNode ("PhysicalMaterial"),
-         baseColor         = phong .diffuseColor .sRGBToLinear (),
-         specularColor     = phong .specularColor .sRGBToLinear (),
-         specularIntensity = Math .max (... specularColor),
-         metallic          = Math .min (Math .max ((specularIntensity - 0.04) / (1.0 - 0.04), 0), 1) * 0.5,
-         roughness         = 1 - phong .shininess,
-         emissiveColor     = phong .emissiveColor .sRGBToLinear (),
-         transparency      = phong .transparency,
-         transmission      = transparency ** (1/3);
-
-      if ([... specularColor] .some (Boolean) && roughness)
-      {
-         const specularMaterial = executionContext .createNode ("SpecularMaterialExtension");
-
-         specularMaterial .specularColor    = specularColor;
-         specularMaterial .specularStrength = 10 * roughness;
-
-         physical .extensions .push (specularMaterial);
-
-         metallic  *= 0.1;
-         roughness *= 0.5;
-      }
-
-      if (transparency)
-      {
-         const transmissionMaterial = executionContext .createNode ("TransmissionMaterialExtension");
-
-         transmissionMaterial .transmission = transmission;
-
-         physical .extensions .push (transmissionMaterial);
-
-         roughness *= 0.5 * (1 - transparency);
-      }
-
-      physical .baseColor     = baseColor;
-      physical .metallic      = metallic;
-      physical .roughness     = roughness;
-      physical .emissiveColor = emissiveColor;
-
-      return physical;
-   }
 };

package/src/Editors/NodesLibrary.js

@@ -77,7 +77,7 @@ module .exports = class NodesLibrary extends LibraryPane
                .text (node .typeName)
                .attr ("componentName", node .componentInfo .name)
                .appendTo (this .#list)
-               .on ("click", () => this .createNode (node .typeName, node .componentInfo .name));
+               .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name));
          }
       }
 
@@ -97,7 +97,7 @@ module .exports = class NodesLibrary extends LibraryPane
                .addClass ("node")
                .text (proto .name)
                .appendTo (this .#list)
-               .on ("click", () => this .createProto (proto));
+               .on ("dblclick", () => this .createProto (proto));
          }
       }
 
@@ -123,7 +123,7 @@ module .exports = class NodesLibrary extends LibraryPane
             .text (node .typeName)
             .attr ("componentName", node .componentInfo .name)
             .appendTo (this .#list)
-            .on ("click", () => this .createNode (node .typeName, node .componentInfo .name));
+            .on ("dblclick", () => this .createNode (node .typeName, node .componentInfo .name));
       }
    }
 

package/src/Editors/OutlineEditor.js

@@ -24,9 +24,6 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       electron .ipcRenderer .on ("outline-editor", (event, key, ... args) => this [key] (... args));
 
-      electron .ipcRenderer .on ("transform-to-zero",   () => this .transformToZero ());
-      electron .ipcRenderer .on ("remove-empty-groups", () => this .removeEmptyGroups ());
-
       this .setup ();
    }
 
@@ -54,26 +51,6 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       ]);
    }
 
-   transformToZero ()
-   {
-      const
-         selection = this .sceneGraph .find (".node.primary, .node.manually"),
-         ids       = selection .map (function () { return this .id }) .get (),
-         nodes     = ids .length ? ids .map (id => this .getNode ($(`#${id}`))) : this .executionContext .rootNodes;
-
-      Editor .transformToZero (this .executionContext, nodes);
-   }
-
-   removeEmptyGroups ()
-   {
-      const
-         selection = this .sceneGraph .find (".node.primary, .node.manually"),
-         ids       = selection .map (function () { return this .id }) .get (),
-         nodes     = ids .length ? ids .map (id => this .getNode ($(`#${id}`))) : this .executionContext .rootNodes;
-
-      Editor .removeEmptyGroups (this .executionContext, nodes);
-   }
-
    showContextMenu (event)
    {
       const element = $(document .elementFromPoint (event .pageX, event .pageY))
@@ -305,6 +282,14 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                         });
                      }
 
+                     if (!node .getType () .includes (X3D .X3DConstants .InlineGeometry))
+                     {
+                        menu .push ({
+                           label: _("Convert Node to InlineGeometry..."),
+                           args: ["convertNodeToInlineFile", element .attr ("id"), executionContext .getId (), node .getId (), "InlineGeometry"],
+                        });
+                     }
+
                      continue;
                   }
                   case X3D .X3DConstants .ImageTexture:
@@ -334,6 +319,21 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
                      continue;
                   }
+                  case X3D .X3DConstants .InlineGeometry:
+                  {
+                     menu .push ({
+                        label: _("Open InlineGeometry Scene in New Tab"),
+                        enabled: node .checkLoadState () === X3D .X3DConstants .COMPLETE_STATE,
+                        args: ["openFileInNewTab", node .getInternalScene () ?.worldURL],
+                     },
+                     {
+                        label: _("Fold InlineGeometry Back into Scene"),
+                        enabled: node .checkLoadState () === X3D .X3DConstants .COMPLETE_STATE && !!node .getGeometry (),
+                        args: ["foldInlineGeometryBackIntoScene", element .attr ("id"), executionContext .getId (), node .getId ()],
+                     });
+
+                     continue;
+                  }
                   case X3D .X3DConstants .PixelTexture:
                   {
                      menu .push ({
@@ -360,6 +360,15 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
                      continue;
                   }
+                  case X3D .X3DConstants .Material:
+                  {
+                     menu .push ({
+                        label: _("Convert Node to PhysicalMaterial"),
+                        args: ["convertToPhysicalMaterial", element .attr ("id"), executionContext .getId (), node .getId ()],
+                     });
+
+                     continue;
+                  }
                   case X3D .X3DConstants .X3DPrototypeInstance:
                   {
                      if (!$.try (() => node .getInnerNode ()))
@@ -379,7 +388,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                   {
                      menu .push ({
                         label: _("Convert Node to Inline File..."),
-                        args: ["convertNodeToInlineFile", element .attr ("id"), executionContext .getId (), node .getId ()],
+                        args: ["convertNodeToInlineFile", element .attr ("id"), executionContext .getId (), node .getId (), "Inline"],
                      });
 
                      continue;
@@ -401,6 +410,15 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
                      continue;
                   }
+                  case X3D .X3DConstants .X3DTransformNode:
+                  {
+                     menu .push ({
+                        label: _("Transform to Zero"),
+                        args: ["transformToZero", element .attr ("id"), executionContext .getId (), node .getId ()],
+                     });
+
+                     continue;
+                  }
                   case X3D .X3DConstants .X3DUrlObject:
                   {
                      if (node ._url .some (fileURL => !fileURL .match (/^\s*(?:data|ecmascript|javascript|vrmlscript):/s)))
@@ -1321,6 +1339,25 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
+   transformToZero (id, executionContextId, nodeId)
+   {
+      const
+         executionContext = this .objects .get (executionContextId),
+         transformNode    = this .objects .get (nodeId);
+
+      Editor .transformToZero (executionContext, [transformNode]);
+   }
+
+   removeEmptyGroups ()
+   {
+      const
+         selection = this .sceneGraph .find (".node.primary, .node.manually"),
+         ids       = selection .map (function () { return this .id }) .get (),
+         nodes     = ids .length ? ids .map (id => this .getNode ($(`#${id}`))) : this .executionContext .rootNodes;
+
+      Editor .removeEmptyGroups (this .executionContext, nodes);
+   }
+
    convertImageTextureToPixelTexture (id, executionContextId, nodeId)
    {
       const
@@ -1438,6 +1475,26 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
+   convertToPhysicalMaterial (id, executionContextId, nodeId)
+   {
+      const
+         executionContext = this .objects .get (executionContextId),
+         materialNode     = this .objects .get (nodeId);
+
+      // Add undo step.
+
+      UndoManager .shared .beginUndo (_("Convert Node to PhysicalMaterial"));
+
+      const physicalMaterialNode = Editor .convertPhongToPhysical (executionContext, new X3D .SFNode (materialNode))
+
+      if (materialNode .getName ())
+         Editor .updateNamedNode (executionContext, materialNode .getName (), physicalMaterialNode);
+
+      Editor .replaceAllOccurrences (executionContext, materialNode, physicalMaterialNode);
+
+      UndoManager .shared .endUndo ();
+   }
+
    async convertPixelTextureToImageTexture (id, executionContextId, nodeId)
    {
       const
@@ -1511,8 +1568,8 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       const
          rootNodes     = executionContext .rootNodes .copy (),
-         nodesToImport = [... inlineNode .getInternalScene () .rootNodes] .map (node => node .getValue ()),
-         x3dSyntax     = await Editor .exportX3D (inlineNode .getInternalScene (), nodesToImport, { importedNodes: true }),
+         nodesToExport = [... inlineNode .getInternalScene () .rootNodes] .map (node => node .getValue ()),
+         x3dSyntax     = await Editor .exportX3D (inlineNode .getInternalScene (), nodesToExport, { importedNodes: true }),
          nodes         = await Editor .importX3D (executionContext, x3dSyntax);
 
       // Remove imported nodes from root nodes.
@@ -1557,6 +1614,36 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       this .expandTo (childNode, { expandObject: true });
    }
 
+   async foldInlineGeometryBackIntoScene (id, executionContextId, nodeId)
+   {
+      const
+         executionContext   = this .objects .get (executionContextId),
+         inlineGeometryNode = this .objects .get (nodeId);
+
+      UndoManager .shared .beginUndo (_("Fold InlineGeometry Back into Scene"));
+
+      const
+         rootNodes     = executionContext .rootNodes .copy (),
+         nodesToExport = [inlineGeometryNode .getGeometry ()],
+         x3dSyntax     = await Editor .exportX3D (inlineGeometryNode .getInternalScene (), nodesToExport),
+         nodes         = await Editor .importX3D (executionContext, x3dSyntax),
+         geometryNode  = nodes [0];
+
+      // Remove imported nodes from root nodes.
+
+      Editor .setFieldValue (executionContext, executionContext, executionContext .rootNodes, rootNodes);
+
+      // Insert InlineGeometry node.
+
+      Editor .replaceAllOccurrences (executionContext, inlineGeometryNode, geometryNode);
+
+      UndoManager .shared .endUndo ();
+
+      await this .browser .nextFrame ();
+
+      this .expandTo (geometryNode, { expandObject: true });
+   }
+
    protocolToMimeType = new Map ([
       ["ecmascript:", "application/ecmascript"],
       ["javascript:", "application/javascript"],
@@ -1707,7 +1794,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
-   async convertNodeToInlineFile (id, executionContextId, nodeId)
+   async convertNodeToInlineFile (id, executionContextId, nodeId, typeName)
    {
       const
          executionContext = this .objects .get (executionContextId),
@@ -1719,7 +1806,15 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       if (response .canceled)
          return;
 
-      UndoManager .shared .beginUndo (_("Convert Node to Inline File"));
+      switch (typeName)
+      {
+         case "Inline":
+            UndoManager .shared .beginUndo (_("Convert Node to Inline File"));
+            break;
+         case "InlineGeometry":
+            UndoManager .shared .beginUndo (_("Convert Node to InlineGeometry"));
+            break;
+      }
 
       // Create inline file.
 
@@ -1729,7 +1824,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       await Editor .addComponent (executionContext, "Networking");
 
-      const inlineNode = executionContext .createNode ("Inline") .getValue ();
+      const inlineNode = executionContext .createNode (typeName) .getValue ();
 
       inlineNode ._url = [Editor .relativePath (executionContext, response .filePath)];