sunrize 1.7.45 → 1.7.46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.45",
+  "version": "1.7.46",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -78,19 +78,19 @@
     "url": "https://patreon.com/X_ITE"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.6.0",
-    "@electron-forge/maker-deb": "^7.6.0",
-    "@electron-forge/maker-dmg": "^7.6.0",
-    "@electron-forge/maker-rpm": "^7.6.0",
-    "@electron-forge/maker-squirrel": "^7.6.0",
-    "@electron-forge/maker-zip": "^7.6.0",
-    "@electron-forge/publisher-github": "^7.6.0",
+    "@electron-forge/cli": "^7.6.1",
+    "@electron-forge/maker-deb": "^7.6.1",
+    "@electron-forge/maker-dmg": "^7.6.1",
+    "@electron-forge/maker-rpm": "^7.6.1",
+    "@electron-forge/maker-squirrel": "^7.6.1",
+    "@electron-forge/maker-zip": "^7.6.1",
+    "@electron-forge/publisher-github": "^7.6.1",
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^34.0.0",
+    "electron": "^34.0.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -98,8 +98,8 @@
     "jquery": "^3.7.1",
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
-    "material-icons": "^1.13.12",
-    "material-symbols": "^0.27.2",
+    "material-icons": "^1.13.13",
+    "material-symbols": "^0.28.0",
     "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.1.0",
-    "x_ite": "^11.0.5",
+    "x_ite": "^11.0.6",
     "x3d-traverse": "^1.0.9"
   }
 }

package/src/Components/Geometry3D/IndexedFaceSet.js

@@ -2,6 +2,49 @@ const X3D = require ("../../X3D");
 
 Object .assign (X3D .IndexedFaceSet .prototype,
 {
+   toIndexedTriangleSet (executionContext = this .getExecutionContext ())
+   {
+      const geometry = executionContext .createNode ("IndexedTriangleSet", false);
+
+      geometry ._metadata        = this ._metadata;
+      geometry ._solid           = this ._solid;
+      geometry ._ccw             = this ._ccw;
+      geometry ._colorPerVertex  = this ._colorPerVertex;
+      geometry ._normalPerVertex = this ._normalPerVertex;
+      geometry ._attrib          = this ._attrib;
+      geometry ._fogCoord        = this ._fogCoord;
+      geometry ._coord           = this ._coord;
+
+      if (!this ._colorIndex .length || this ._colorIndex .equals (this ._coordIndex))
+      {
+         geometry ._color = this ._color;
+      }
+
+      if (!this ._texCoordIndex .length || this ._texCoordIndex .equals (this ._coordIndex))
+      {
+         geometry ._texCoord = this ._texCoord;
+      }
+
+      if (!this ._normalIndex .length || this ._normalIndex .equals (this ._coordIndex))
+      {
+         geometry ._tangent = this ._tangent;
+         geometry ._normal  = this ._normal;
+      }
+
+      const polygons = this .triangulate ();
+
+      for (const { triangles } of polygons)
+      {
+         for (const i of triangles)
+         {
+            geometry ._index .push (this ._coordIndex [i]);
+         }
+      }
+
+      geometry .setup ();
+
+      return geometry;
+   },
    toPrimitive (executionContext = this .getExecutionContext ())
    {
       const geometry = executionContext .createNode ("IndexedLineSet", false);
@@ -16,7 +59,10 @@ Object .assign (X3D .IndexedFaceSet .prototype,
       if (this ._normalPerVertex .getValue ())
       {
          if (!this ._normalIndex .length || this ._normalIndex .equals (this ._coordIndex))
-            geometry ._normal = this ._normal;
+         {
+            geometry ._tangent = this ._tangent;
+            geometry ._normal  = this ._normal;
+         }
       }
 
       // The coord index must end with -1!

package/src/Components/Rendering/X3DGeometryNode.js

@@ -2,6 +2,12 @@ const X3D = require ("../../X3D");
 
 Object .assign (X3D .X3DGeometryNode .prototype,
 {
+   /**
+    * Converts any line geometry to IndexedLineSet.
+    * @param {X3D .X3DExecutionContext} executionContext
+    * @param {object} options
+    * @returns
+    */
    toIndexedLineSet (executionContext = this .getExecutionContext (), options = { })
    {
       const geometry = executionContext .createNode ("IndexedLineSet", false);
@@ -53,6 +59,12 @@ Object .assign (X3D .X3DGeometryNode .prototype,
 
       return geometry;
    },
+   /**
+    * Converts any polygon geometry to IndexedFaceSet.
+    * @param {X3D .X3DExecutionContext} executionContext
+    * @param {object} options
+    * @returns
+    */
    toIndexedFaceSet (executionContext = this .getExecutionContext (), options = { })
    {
       const geometry = executionContext .createNode ("IndexedFaceSet", false);

package/src/Editors/OutlineEditor.js

@@ -392,14 +392,23 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                   }
                   case X3D .X3DConstants .X3DGeometryNode:
                   {
-                     if (!node .toPrimitive)
-                        continue;
+                     if (node .toIndexedTriangleSet)
+                     {
+                        menu .push (
+                        {
+                           label: _("Convert Node to IndexedTriangleSet"),
+                           args: ["toIndexedTriangleSet", element .attr ("id"), executionContext .getId (), node .getId ()],
+                        });
+                     }
 
-                     menu .push (
+                     if (node .toPrimitive)
                      {
-                        label: _("Convert Node to Next Lower Geometry Type"),
-                        args: ["toPrimitive", element .attr ("id"), executionContext .getId (), node .getId ()],
-                     });
+                        menu .push (
+                        {
+                           label: _("Convert Node to Next Lower Geometry Type"),
+                           args: ["toPrimitive", element .attr ("id"), executionContext .getId (), node .getId ()],
+                        });
+                     }
 
                      continue;
                   }
@@ -1716,12 +1725,36 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
                if (normalPerVertex)
                {
-                  for (const [i, index] of coordIndex .entries ())
+                  const creaseAngle = X3D .Algorithm .clamp (node ._creaseAngle .getValue (), 0, Math .PI);
+
+                  if (Math .abs (creaseAngle - Math .PI) < 0.1)
                   {
-                     if (index < 0)
-                        continue;
+                     for (const [i, index] of coordIndex .entries ())
+                     {
+                        if (index < 0)
+                           continue;
+
+                        vector [index] = normals [i];
+                     }
+                  }
+                  else
+                  {
+                     const normalIndex = new X3D .MFInt32 ();
+
+                     for (const [i, index] of coordIndex .entries ())
+                     {
+                        if (index < 0)
+                        {
+                           normalIndex .push (-1);
+                        }
+                        else
+                        {
+                           normalIndex .push (vector .length);
+                           vector .push (normals [i]);
+                        }
+                     }
 
-                     vector [index] = normals [i];
+                     Editor .setFieldValue (executionContext, node, node ._normalIndex, normalIndex);
                   }
                }
                else
@@ -1823,6 +1856,45 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
+   toIndexedTriangleSet (id, executionContextId, nodeId)
+   {
+      const
+         element            = $(`#${id}`),
+         executionContext   = this .objects .get (executionContextId),
+         parentFieldElement = element .closest (".field, .scene", this .sceneGraph),
+         parentNodeElement  = parentFieldElement .closest (".node, .proto, .scene", this .sceneGraph),
+         parentNode         = this .getNode (parentNodeElement),
+         parentField        = parentFieldElement .hasClass ("scene") ? parentNode .rootNodes : this .getField (parentFieldElement),
+         node               = this .objects .get (nodeId),
+         primitive          = node .toIndexedTriangleSet (executionContext),
+         index              = parseInt (element .attr ("index"));
+
+      UndoManager .shared .beginUndo (_("Convert Node to IndexedTriangleSet"));
+
+      if (node .getName ())
+         Editor .updateNamedNode (executionContext, executionContext .getUniqueName (node .getName ()), primitive);
+
+      switch (parentField .getType ())
+      {
+         case X3D .X3DConstants .SFNode:
+         {
+            Editor .setFieldValue (executionContext, parentNode, parentField, primitive);
+            break;
+         }
+         case X3D .X3DConstants .MFNode:
+         {
+            Editor .removeValueFromArray (executionContext, parentNode, parentField, index);
+            Editor .insertValueIntoArray (executionContext, parentNode, parentField, index, primitive);
+            break;
+         }
+      }
+
+      UndoManager .shared .endUndo ();
+
+      if (element .hasClass ("selected"))
+         require ("../Application/Selection") .add (primitive);
+   }
+
    toPrimitive (id, executionContextId, nodeId)
    {
       const

package/src/Editors/ScriptEditor.js

@@ -174,8 +174,8 @@ module .exports = class ScriptEditor extends Interface
             }
          }
 
-         if (this .monaco)
-            this .monaco .viewState = this .monaco .saveViewState ();
+         if (this .editor)
+            this .editor .viewState = this .editor .saveViewState ();
       }
 
       this .node = node;
@@ -186,12 +186,12 @@ module .exports = class ScriptEditor extends Interface
 
          this .nodeName .renameNodeInput (this .node);
          this .applyButton .show ();
-         this .editor ?.detach ();
+         this .monaco ?.detach ();
 
-         this .editor = editor .element .appendTo (this .verticalSplitterRight);
-         this .monaco = editor .editor;
+         this .monaco = editor .element .appendTo (this .verticalSplitterRight);
+         this .editor = editor .editor;
 
-         this .monaco .restoreViewState (this .monaco .viewState);
+         this .editor .restoreViewState (this .editor .viewState);
 
          this .node ._url       .addFieldCallback (this, this .set_url       .bind (this));
          this .node ._loadState .addFieldCallback (this, this .set_loadState .bind (this, editor .monaco));
@@ -228,10 +228,10 @@ module .exports = class ScriptEditor extends Interface
       {
          this .nodeName .renameNodeInput (null, null);
          this .applyButton .hide ();
-         this .editor ?.detach ();
+         this .monaco ?.detach ();
 
-         this .editor = null;
          this .monaco = null;
+         this .editor = null;
       }
    }
 
@@ -406,6 +406,17 @@ module .exports = class ScriptEditor extends Interface
                editor .onDidFocusEditorWidget (() => this .setDeclarations (monaco));
                editor .onDidBlurEditorWidget (() => this .apply ());
 
+               editor .onKeyDown ((event) =>
+               {
+                  const { keyCode, ctrlKey, metaKey } = event;
+
+                  if (keyCode === 52 && (metaKey || ctrlKey))
+                  {
+                     event .preventDefault ();
+                     this .paste ();
+                  }
+               });
+
                editor .viewState = editor .saveViewState ();
 
                element .on ("mouseenter", () => this .setDeclarations (monaco))
@@ -467,15 +478,15 @@ module .exports = class ScriptEditor extends Interface
          { type: "separator" },
          {
             label: _("Cut"),
-            args: ["execCommand", "cut"],
+            args: ["cutOrCopy", true],
          },
          {
             label: _("Copy"),
-            args: ["execCommand", "copy"],
+            args: ["cutOrCopy", false],
          },
          {
             label: _("Paste"),
-            args: ["execCommand", "paste"],
+            args: ["paste"],
          },
          { type: "separator" },
          {
@@ -489,7 +500,7 @@ module .exports = class ScriptEditor extends Interface
 
    runAction (id)
    {
-      this .monaco .getAction (id) .run ();
+      this .editor .getAction (id) .run ();
    }
 
    debugFindActions (editor = this .editor)
@@ -541,9 +552,60 @@ module .exports = class ScriptEditor extends Interface
       }
    }
 
-   execCommand (command)
+   // execCommand (command)
+   // {
+   //    document .execCommand (command);
+   // }
+
+   cutOrCopy (cut)
+   {
+      this .editor .focus ();
+
+      // Get the current selection in the editor.
+      const selection = this .editor .getSelection ();
+
+      if (!selection || selection .isEmpty ())
+      {
+        navigator .clipboard .writeText ("");
+        return;
+      }
+
+      // Get the text from that selection.
+      const data = this .editor .getModel () ?.getValueInRange (selection);
+
+      // Set the clipboard contents.
+      navigator .clipboard .writeText (data || "");
+
+      if (!cut)
+         return;
+
+      // This is a cut operation, so replace the selection with an empty string.
+      this .editor .executeEdits ("clipboard", [{
+         range: selection,
+         text: "",
+         forceMoveMarkers: true,
+      }]);
+   }
+
+   async paste ()
    {
-      document .execCommand (command);
+      this .editor .focus ();
+
+      // Get the current clipboard contents
+      const text = await navigator .clipboard .readText ();
+
+      // Get the current selection in the editor.
+      const selection = this .editor .getSelection ();
+
+      if (!selection)
+        return;
+
+      // Replace the current contents with the text from the clipboard.
+      this .editor .executeEdits ("clipboard", [{
+        range: selection,
+        text: text,
+        forceMoveMarkers: true,
+      }]);
    }
 
    create ()
@@ -649,11 +711,11 @@ main ()
       if (!this .node)
          return;
 
-      if (!this .monaco)
+      if (!this .editor)
          return;
 
       const
-         string = this .monaco .getModel () .getValue (),
+         string = this .editor .getModel () .getValue (),
          value  = this .node ._url .toSpliced (0, 1, Editor .encodeURI (string));
 
       if (this .node ._url .equals (value))
@@ -666,7 +728,7 @@ main ()
 
    set_url ()
    {
-      this .monaco .getModel () .setValue (Editor .decodeURI (this .node ._url [0]));
+      this .editor .getModel () .setValue (Editor .decodeURI (this .node ._url [0]));
    }
 
    set_loadState (monaco)