sunrize 1.7.35 → 1.7.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.35",
+  "version": "1.7.36",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -99,7 +99,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.27.1",
+    "material-symbols": "^0.27.2",
     "md5": "^2.3.0",
     "mime-types": "^2.1.35",
     "monaco-editor": "^0.50.0",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.5.15",
+    "x_ite": "^11.0.0",
     "x3d-traverse": "^1.0.6"
   }
 }

package/src/Controls/MaterialPreviewPopover.js

@@ -28,7 +28,7 @@ $.fn.materialPreviewPopover = async function (node)
 
    const
       browser = canvas .prop ("browser"),
-      scene   = browser .createScene (browser .getProfile ("Core"));
+      scene   = await browser .createScene (browser .getProfile ("Core"));
 
    scene .setWorldURL (node .getExecutionContext () .worldURL);
 

package/src/Controls/TexturePreviewPopover.js

@@ -52,7 +52,7 @@ $.fn.texturePreviewPopover = async function (node)
 
    const
       browser = canvas .prop ("browser"),
-      scene   = browser .createScene (browser .getProfile ("Core"));
+      scene   = await browser .createScene (browser .getProfile ("Core"));
 
    scene .setWorldURL (node .getExecutionContext () .worldURL);
 
@@ -61,7 +61,7 @@ $.fn.texturePreviewPopover = async function (node)
    // Create texture node.
 
    const
-      x3dSyntax      = Editor .exportX3D (node .getExecutionContext (), [node]),
+      x3dSyntax      = await Editor .exportX3D (node .getExecutionContext (), [node]),
       nodes          = await Editor .importX3D (scene, x3dSyntax, new UndoManager ()),
       previewNode    = nodes [0],
       appearanceNode = browser .currentScene .getExportedNode ("Appearance");

package/src/Editors/OutlineEditor.js

@@ -794,17 +794,17 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       Editor .removeImportedNode (importedNode .getExecutionContext (), importedNode .getImportedName ());
    }
 
-   cutNodes ()
+   async cutNodes ()
    {
       UndoManager .shared .beginUndo (_("Cut Nodes"));
 
-      this .copyNodes ();
-      this .deleteNodes ();
+      await this .copyNodes ();
+      await this .deleteNodes ();
 
       UndoManager .shared .endUndo ();
    }
 
-   copyNodes (deselect)
+   async copyNodes (deselect)
    {
       const
          primary     = $(".node.primary, .proto.primary, .externproto.primary"),
@@ -829,7 +829,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       undoManager .endUndo ();
 
-      const x3dSyntax = Editor .exportX3D (this .executionContext, nodes, { importedNodes: true });
+      const x3dSyntax = await Editor .exportX3D (this .executionContext, nodes, { importedNodes: true });
 
       //console .log (x3dSyntax)
 
@@ -841,7 +841,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          this .deselectAll ();
    }
 
-   copyExternPrototype ()
+   async copyExternPrototype ()
    {
       const
          elements = $(".proto.primary, .proto.manually"),
@@ -849,7 +849,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       const
          browser  = this .executionContext .getBrowser (),
-         scene    = browser .createScene (),
+         scene    = await browser .createScene (browser .getProfile ("Full")),
          worldURL = new URL (this .executionContext .worldURL),
          basename = path .basename (worldURL .pathname);
 
@@ -1366,7 +1366,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       const
          rootNodes     = executionContext .rootNodes .copy (),
          nodesToImport = [... inlineNode .getInternalScene () .rootNodes] .map (node => node .getValue ()),
-         x3dSyntax     = Editor .exportX3D (inlineNode .getInternalScene (), nodesToImport, { importedNodes: true }),
+         x3dSyntax     = await Editor .exportX3D (inlineNode .getInternalScene (), nodesToImport, { importedNodes: true }),
          nodes         = await Editor .importX3D (executionContext, x3dSyntax);
 
       // Remove imported nodes from root nodes.
@@ -2865,7 +2865,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             {
                UndoManager .shared .beginUndo (_("Copy Extern Proto »%s«"), sourceExternProto .getName ());
 
-               await Editor .importX3D (destinationExecutionContext, Editor .exportX3D (sourceExecutionContext, [sourceExternProto]));
+               await Editor .importX3D (destinationExecutionContext, await Editor .exportX3D (sourceExecutionContext, [sourceExternProto]));
 
                const
                   externprotos = Array .from (destinationExecutionContext .externprotos),
@@ -2939,7 +2939,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             {
                UndoManager .shared .beginUndo (_("Copy Prototype »%s«"), sourceProto .getName ());
 
-               await Editor .importX3D (destinationExecutionContext, Editor .exportX3D (sourceExecutionContext, [sourceProto]));
+               await Editor .importX3D (destinationExecutionContext, await Editor .exportX3D (sourceExecutionContext, [sourceProto]));
 
                const
                   protos = Array .from (destinationExecutionContext .protos),
@@ -3044,7 +3044,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          }
 
          const copiedNodes = sourceNodes .length
-            ? await Editor .importX3D (destinationExecutionContext, Editor .exportX3D (this .executionContext, sourceNodes, { importedNodes: true }))
+            ? await Editor .importX3D (destinationExecutionContext, await Editor .exportX3D (this .executionContext, sourceNodes, { importedNodes: true }))
             : [ ];
 
          if (copiedNodes .length)

package/src/Editors/ScriptEditor.js

@@ -256,40 +256,63 @@ module .exports = class ScriptEditor extends Interface
 
       const fields = Array .from (this .node .getUserDefinedFields (), field =>
       {
-         switch (field .getAccessType ())
+         if (field .getAccessType () === X3D .X3DConstants .inputOnly)
+            return "";
+
+         const accessType = [ ];
+
+         if (field .isInput ())
+            accessType .push ("in");
+
+         if (field .isOutput ())
+            accessType .push ("out");
+
+         let value = "";
+
+         if (field instanceof X3D .X3DArrayField)
+         {
+            value += `(${field .length} elements)`;
+         }
+         else
          {
-            case X3D .X3DConstants .initializeOnly:
-            case X3D .X3DConstants .outputOnly:
-            case X3D .X3DConstants .inputOutput:
+            const STRING_MAX = 16;
+
+            if (field instanceof X3D .SFString)
+               value += `"${X3D .SFString .escape (field .valueOf ()) .substring (0, STRING_MAX)}${field .length <= STRING_MAX ? "" : "..."}"`;
+            else
+               value += String (field);
+         }
+
+         let string = "";
+
+         string += `/** This is the user-defined field ${field .getTypeName ()} [${accessType .join (", ")}] *${field .getName ()}* ${value}. */\n`;
+         string += `declare let ${field .getName ()}: `;
+
+         switch (field .getType ())
+         {
+            case X3D .X3DConstants .SFNode:
             {
-               switch (field .getType ())
-               {
-                  case X3D .X3DConstants .SFNode:
-                  {
-                     if (field .getValue ())
-                        return `declare let ${field .getName ()}: X3D .${field .getNodeTypeName ()}Proxy;`;
-                     else
-                        return `declare let ${field .getName ()}: X3D .SFNode | null;`;
-                  }
-                  case X3D .X3DConstants .MFNode:
-                  {
-                     const types = Array .from (new Set (Array .from (field, node => node ? `${node .getNodeTypeName ()}Proxy` : "null")));
-
-                     if (types .length)
-                        return `declare let ${field .getName ()}: X3D .MFNode <${types .join ("|")}|null>;`;
-                     else
-                        return `declare let ${field .getName ()}: X3D .MFNode;`;
-                  }
-                  default:
-                  {
-                     return `declare let ${field .getName ()}: ${
-                        this .#internalTypes .get (field .getType ()) ?? "X3D ." + field .getTypeName ()
-                     };`;
-                  }
-               }
+               if (field .getValue ())
+                  string += `X3D .${field .getNodeTypeName ()}Proxy;`;
+               else
+                  string += `X3D .SFNode | null;`;
+            }
+            case X3D .X3DConstants .MFNode:
+            {
+               const types = Array .from (new Set (Array .from (field, node => node ? `${node .getNodeTypeName ()}Proxy` : "null")));
+
+               if (types .length)
+                  string += `X3D .MFNode <${types .join ("|")}|null>;`;
+               else
+                  string += `X3D .MFNode;`;
             }
             default:
-               return "";
+            {
+               string += this .#internalTypes .get (field .getType ()) ?? `X3D .${field .getTypeName ()}`;
+               string += "";"";
+            }
+
+            return string;
          }
       });
 
@@ -380,11 +403,13 @@ module .exports = class ScriptEditor extends Interface
                   bracketPairColorization: { enabled: true },
                });
 
+               editor .onDidFocusEditorWidget (() => this .setDeclarations (monaco));
                editor .onDidBlurEditorWidget (() => this .apply ());
 
                editor .viewState = editor .saveViewState ();
 
-               element .on ("contextmenu", (event) => this .showContextMenu ());
+               element .on ("mouseenter", () => this .setDeclarations (monaco))
+               element .on ("contextmenu", () => this .showContextMenu ());
                element .detach ();
 
                // this .debugFindActions (editor)

package/src/Tools/Core/X3DNodeTool.js

@@ -156,7 +156,7 @@ class X3DNodeTool extends X3DBaseTool
             {
                const scene = await this .getBrowser () .createX3DFromURL (new X3D .MFString (protoURL));
 
-               scene .setExecutionContext (null);
+               scene .setExecutionContext (this .getBrowser () .getPrivateScene ());
                scene .setCountPrimitives (false);
 
                for (const externproto of scene .externprotos)

package/src/Undo/Editor.js

@@ -75,7 +75,7 @@ module .exports = class Editor
     * @param {Object} options
     * @returns {string} x3dSyntax
     */
-   static exportX3D (executionContext, objects = [ ], { type = "x3d", importedNodes = false, exportedNodes = false } = { })
+   static async exportX3D (executionContext, objects = [ ], { type = "x3d", importedNodes = false, exportedNodes = false } = { })
    {
       const
          externprotos = new Set (),
@@ -84,7 +84,7 @@ module .exports = class Editor
 
       const
          browser = executionContext .getBrowser (),
-         scene   = browser .createScene ();
+         scene   = await browser .createScene (browser .getProfile ("Core"));
 
       // Determine protos.
 
@@ -220,6 +220,7 @@ module .exports = class Editor
 
       // Dispose scene.
 
+      scene .routes .clear ();
       scene .dispose ();
       nodes .dispose ();
 
@@ -245,7 +246,7 @@ module .exports = class Editor
          externprotos   = new Map (Array .from (executionContext .externprotos, p => [p .getName (), p])),
          protos         = new Map (Array .from (executionContext .protos,       p => [p .getName (), p])),
          rootNodes      = executionContext .rootNodes .copy (),
-         tempScene      = browser .createScene (browser .getProfile ("Core"));
+         tempScene      = await browser .createScene (browser .getProfile ("Core"));
 
       scene .setProfile (browser .getProfile ("Full"));
       scene .updateComponent (browser .getComponent ("X_ITE"));
@@ -398,8 +399,8 @@ module .exports = class Editor
    {
       const
          browser        = executionContext .getBrowser (),
-         scene          = browser .createScene (),
-         x3dSyntax      = this .exportX3D (executionContext, nodes, { importedNodes: true, exportedNodes: true }),
+         scene          = await browser .createScene (browser .getProfile ("Core")),
+         x3dSyntax      = await this .exportX3D (executionContext, nodes, { importedNodes: true, exportedNodes: true }),
          loadUrlObjects = browser .getBrowserOption ("LoadUrlObjects");
 
       browser .setBrowserOption ("LoadUrlObjects", false);
@@ -408,6 +409,7 @@ module .exports = class Editor
 
       await this .importX3D (scene, x3dSyntax, new UndoManager ());
 
+      this .rewriteURLs (scene, scene, executionContext .worldURL, scene .worldURL, new UndoManager ());
       this .inferProfileAndComponents (scene, new UndoManager ());
 
       fs .writeFileSync (filePath, this .getContents (scene, path .extname (filePath)));
@@ -525,7 +527,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             {
                try
                {
-                  const filePath = path .resolve (path .dirname (url .fileURLToPath (oldWorldURL)), url .fileURLToPath (fileURL));
+                  const filePath = url .fileURLToPath (new URL (fileURL, oldWorldURL));
 
                   let relativePath = path .relative (path .dirname (url .fileURLToPath (newWorldURL)), filePath);
 
@@ -537,8 +539,10 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                   newURL .push (encodeURI (relativePath));
                   continue;
                }
-               catch
-               { }
+               catch (error)
+               {
+                  // console .log (error)
+               }
 
                newURL .push (fileURL);
             }
@@ -1350,13 +1354,17 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       const
          browser   = executionContext .getBrowser (),
-         scene     = browser .createScene (),
-         x3dSyntax = this .exportX3D (executionContext, [proto]);
+         scene     = await browser .createScene (browser .getProfile ("Core")),
+         x3dSyntax = await this .exportX3D (executionContext, [proto]);
 
       undoManager .beginUndo (_("Turn Prototype »%s« into Extern Prototype"), proto .getName ());
 
+      scene .setWorldURL (url .pathToFileURL (filePath));
+
       await this .importX3D (scene, x3dSyntax, new UndoManager ());
-      this .rewriteURLs (scene, scene, executionContext .worldURL, url .pathToFileURL (filePath) .href, new UndoManager ());
+
+      this .rewriteURLs (scene, scene, executionContext .worldURL, scene .worldURL, new UndoManager ());
+      this .inferProfileAndComponents (scene, new UndoManager ());
 
       fs .writeFileSync (filePath, this .getContents (scene, path .extname (filePath)));
       scene .dispose ();
@@ -1530,7 +1538,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       const
          numProtos = executionContext .protos .length,
-         x3dSyntax = this .exportX3D (externproto .getInternalScene (), [externproto .getProtoDeclaration ()])
+         x3dSyntax = await this .exportX3D (externproto .getInternalScene (), [externproto .getProtoDeclaration ()])
 
       undoManager .beginUndo (_("Turn Extern Prototype »%s« into Prototype"), externproto .getName ())
 

package/src/assets/html/application.html

@@ -0,0 +1,77 @@
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <!-- Theme -->
+    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/src/assets/themes/default.css"/>
+  </head>
+  <body>
+    <tab-group sortable="true">
+      <style>
+.etabs .nav {
+  height: var(--window-tabs-height);
+  background: var(--background-color);
+  box-shadow: none;
+  border: none;
+  overflow: auto;
+  white-space: nowrap;
+}
+
+.etabs .tab {
+  background: var(--window-tabs-background-color);
+  border-color: var(--border-color) !important;
+  padding: 4px 3px !important;
+  color: var(--window-tabs-text-color);
+  font-family: var(--sans-serif);
+  box-shadow: none;
+}
+
+.etabs .tab:first-child {
+  border-left: 0;
+}
+
+.etabs .tab.active {
+  z-index: 1100;
+  background: var(--background-color);
+  color: var(--window-tabs-highlight-color);
+}
+
+.etabs::before {
+  z-index: 1000;
+  content: "";
+  position: relative;
+  display: block;
+  height: 1px;
+  width: 100%;
+  box-shadow: var(--tabs-shadow);
+}
+
+.etabs .buttons {
+  border-color: var(--border-color);
+}
+
+.etabs .buttons:hover button,
+.etabs .tab-close button:hover {
+  background: none;
+}
+
+.etabs .buttons button:hover,
+.etabs .tab-close:hover button {
+  color: var(--system-gray0);
+}
+
+.etabs .tab-close button {
+  visibility: hidden;
+}
+
+.etabs .tab.active .tab-close button,
+.etabs .tab:hover .tab-close button {
+  visibility: visible;
+}
+
+.etabs .tab-close {
+  margin-left: 4px;
+}
+      </style>
+    </tab-group>
+  </body>
+</html>

package/src/assets/html/window.html

@@ -0,0 +1,38 @@
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/jquery-ui-dist/jquery-ui.min.css"/>
+    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/qtip2/dist/jquery.qtip.min.css"/>
+    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/src/assets/themes/default.css"/>
+    <link rel="stylesheet" data-name="vs/editor/editor.main" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/monaco-editor/min/vs/editor/editor.main.css">
+  </head>
+  <body>
+    <div id="vertical-splitter" class="vertical-splitter">
+      <div class="vertical-splitter-left">
+        <div id="horizontal-splitter" class="horizontal-splitter">
+          <div class="horizontal-splitter-top">
+            <div id="browser-pane">
+              <div id="browser-frame">
+                <x3d-canvas
+                    id="browser"
+                    debug="false"
+                    cache="false"
+                    preserveDrawingBuffer="true"
+                    splashScreen="false"
+                    contextMenu="false"
+                    xrSessionMode="NONE"></x3d-canvas>
+              </div>
+              <div id="secondary-toolbar" class="toolbar vertical-toolbar large-toolbar secondary-toolbar"></div>
+            </div>
+          </div>
+          <div class="horizontal-splitter-bottom">
+            <div id="footer"></div>
+          </div>
+        </div>
+      </div>
+      <div class="vertical-splitter-right">
+        <div id="sidebar" class="sidebar"></div>
+      </div>
+    </div>
+  </body>
+</html>

package/src/assets/themes/default-template.css

@@ -171,7 +171,6 @@ tr.disabled ~ tr > td > div {
 /* Vertical splitter */
 
 .vertical-splitter {
-  overflow: hidden;
   position: absolute;
   box-sizing: border-box;
   inset: 0;
@@ -365,7 +364,6 @@ tr.disabled ~ tr > td > div {
 }
 
 .ui-tabs > .ui-tabs-panel {
-  overflow: hidden;
   box-sizing: border-box;
   position: relative;
   padding: unset;
@@ -380,7 +378,6 @@ tr.disabled ~ tr > td > div {
 
 .tabs-panel {
   position: absolute;
-  overflow: hidden;
   inset: 0;
 }
 
@@ -728,7 +725,6 @@ body.dark .ui-widget .library-list .component {
 /* Footer */
 
 #footer {
-  overflow: hidden;
   position: absolute;
   box-sizing: border-box;
   width: 100%;
@@ -743,7 +739,6 @@ body.dark .ui-widget .library-list .component {
 }
 
 .console {
-  overflow: hidden;
   box-sizing: border-box;
 }
 
@@ -882,7 +877,6 @@ body.dark .ui-widget .library-list .component {
 }
 
 .script-editor .script-editor-left {
-  overflow: hidden;
   position: absolute;
   box-sizing: border-box;
   left: 0;
@@ -928,7 +922,6 @@ body.dark .ui-widget .library-list .component {
 /* Animation Editor */
 
 .animation-editor {
-  overflow: hidden;
   box-sizing: border-box;
 }