sunrize 2.0.6 → 2.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -92,7 +92,7 @@
     "@vscode/codicons": "^0.0.44",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^40.6.1",
+    "electron": "^40.8.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -111,7 +111,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.2",
-    "x_ite": "^14.0.6",
+    "x_ite": "^14.0.8",
     "x3d-traverse": "^1.0.22"
   }
 }

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
 
@@ -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/OutlineEditor.js

@@ -305,6 +305,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 +342,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 +383,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 +411,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;
@@ -1438,6 +1470,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 +1563,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 +1609,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 +1789,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 +1801,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 +1819,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)];
 

package/src/Tools/Networking/InlineGeometryTool.js

@@ -0,0 +1,7 @@
+"use strict";
+
+const X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool");
+
+class InlineGeometryTool extends X3DGeometryNodeTool { }
+
+module .exports = InlineGeometryTool;

package/src/Undo/Editor.js

@@ -2551,6 +2551,58 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       return Math .abs (target - value) < epsilon;
    }
 
+   static convertPhongToPhysical (executionContext, phong, undoManager = UndoManager .shared)
+   {
+      let
+         browser           = executionContext .getBrowser (),
+         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)
+      {
+         if (undoManager && !executionContext .hasComponent ("X_ITE"))
+            this .addComponent (executionContext, browser .getComponent ("X_ITE"), undoManager);
+
+         const specularMaterial = executionContext .createNode ("SpecularMaterialExtension");
+
+         specularMaterial .specularColor    = specularColor;
+         specularMaterial .specularStrength = 10 * roughness;
+
+         physical .extensions .push (specularMaterial);
+
+         metallic  *= 0.1;
+         roughness *= 0.5;
+      }
+
+      if (transparency)
+      {
+         if (undoManager && !executionContext .hasComponent ("X_ITE"))
+            this .addComponent (executionContext, browser .getComponent ("X_ITE"), undoManager);
+
+         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;
+   }
+
    static moveViewpoint (viewpointNode, position, orientation, centerOfRotation, fieldOfView, undoManager = UndoManager .shared)
    {
       viewpointNode = viewpointNode .valueOf ();

package/src/assets/X3D/MaterialPreview.x3d

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 4.0//EN" "http://www.web3d.org/specifications/x3d-4.0.dtd">
-<X3D profile='Interchange' version='4.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-4.0.xsd'>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 4.1//EN" "https://www.web3d.org/specifications/x3d-4.1.dtd">
+<X3D profile='Interchange' version='4.1' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-4.1.xsd'>
   <head>
-    <component name='Geometry2D' level='2'/>
+    <component name='CubeMapTexturing' level='2'/>
+    <component name='Geometry2D' level='1'/>
     <component name='Layering' level='1'/>
-    <component name='Layout' level='2'/>
+    <component name='Layout' level='1'/>
     <component name='PointingDeviceSensor' level='1'/>
     <component name='Scripting' level='1'/>
     <meta name='created' content='Thu, 10 Jul 2014 17:28:33 GMT'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.7.6, https://create3000.github.io/sunrize/'/>
-    <meta name='modified' content='Fri, 19 Jul 2024 18:04:50 GMT'/>
+    <meta name='generator' content='Sunrize X3D Editor V2.0.6, https://create3000.github.io/sunrize/'/>
+    <meta name='modified' content='Mon, 02 Mar 2026 11:28:07 GMT'/>
   </head>
   <Scene>
     <LayerSet
@@ -44,6 +45,10 @@
             position='0 0 3'>
           <NavigationInfo USE='_1' containerField='navigationInfo'/>
         </Viewpoint>
+        <EnvironmentLight DEF='CannonExterior_1'>
+          <ImageCubeMapTexture containerField='specularTexture'
+              url='"CannonExterior.avif"'/>
+        </EnvironmentLight>
         <DirectionalLight
             ambientIntensity='0.4'/>
         <Group DEF='Models'>