sunrize 2.1.0 → 2.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Sunrize — A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -80,20 +80,20 @@
     "url": "https://patreon.com/X_ITE"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.11.1",
-    "@electron-forge/maker-deb": "^7.11.1",
-    "@electron-forge/maker-dmg": "^7.11.1",
-    "@electron-forge/maker-rpm": "^7.11.1",
-    "@electron-forge/maker-squirrel": "^7.11.1",
-    "@electron-forge/maker-zip": "^7.11.1",
-    "@electron-forge/publisher-github": "^7.11.1",
+    "@electron-forge/cli": "^7.11.2",
+    "@electron-forge/maker-deb": "^7.11.2",
+    "@electron-forge/maker-dmg": "^7.11.2",
+    "@electron-forge/maker-rpm": "^7.11.2",
+    "@electron-forge/maker-squirrel": "^7.11.2",
+    "@electron-forge/maker-zip": "^7.11.2",
+    "@electron-forge/publisher-github": "^7.11.2",
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
     "@vscode/codicons": "^0.0.45",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^42.1.0",
+    "electron": "^42.2.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -102,7 +102,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.44.8",
+    "material-symbols": "^0.44.9",
     "md5": "^2.3.0",
     "mime-types": "^3.0.2",
     "monaco-editor": "^0.55.1",
@@ -112,7 +112,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^4.0.5",
     "update-electron-app": "^3.2.0",
-    "x_ite": "^15.0.2",
+    "x_ite": "^15.0.3",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Tools/Grids/X3DGridNodeTool.js

@@ -185,7 +185,7 @@ class X3DGridNodeTool extends X3DActiveLayerNodeTool
          invGridMatrix = gridMatrix .copy () .inverse ();
 
       const
-         snapMatrix    = new X3D .Matrix4 () .set (gridMatrix .multVecMatrix (this .getSnapPosition (invGridMatrix .multVecMatrix (position .copy ()), true)) .subtract (position)),
+         snapMatrix    = X3D .Matrix4 .fromTransform (gridMatrix .multVecMatrix (this .getSnapPosition (invGridMatrix .multVecMatrix (position .copy ()), true)) .subtract (position)),
          currentMatrix = absoluteMatrix .multRight (snapMatrix) .multRight (transformTool .getModelMatrix () .copy () .inverse ());
 
       transformTool .setUserData (this .#changing, true);
@@ -261,12 +261,12 @@ class X3DGridNodeTool extends X3DActiveLayerNodeTool
             invModelMatrix .multDirMatrix (snapVector .copy ())
          );
 
-      const currentMatrix = new X3D .Matrix4 ()
-         .set (transformTool ._translation      .getValue (),
-               transformTool ._rotation         .getValue () .copy () .multRight (snapRotation),
-               transformTool ._scale            .getValue (),
-               transformTool ._scaleOrientation .getValue (),
-               transformTool ._center           .getValue ());
+      const currentMatrix = X3D .Matrix4
+          .fromTransform (transformTool ._translation      .getValue (),
+                          transformTool ._rotation         .getValue () .copy () .multRight (snapRotation),
+                          transformTool ._scale            .getValue (),
+                          transformTool ._scaleOrientation .getValue (),
+                          transformTool ._center           .getValue ());
 
       transformTool .setUserData (this .#changing, true);
 
@@ -515,8 +515,8 @@ class X3DGridNodeTool extends X3DActiveLayerNodeTool
       if (transformTool .tool .scaleMode === "SCALE_FROM_OPPOSITE_HANDLE")
          distanceFromCenter .subtract (offset);
 
-      const translation = new X3D .Matrix4 ()
-         .set (distanceFromCenter .subtract (scaleMatrix .multDirMatrix (distanceFromCenter .copy ())));
+      const translation = X3D .Matrix4
+         .fromTransform (distanceFromCenter .subtract (scaleMatrix .multDirMatrix (distanceFromCenter .copy ())));
 
       return translation;
    }
@@ -528,8 +528,8 @@ class X3DGridNodeTool extends X3DActiveLayerNodeTool
    {
       const tool = this .tool;
 
-      return new X3D .Matrix4 ()
-         .set (tool .translation .getValue (), tool .rotation .getValue (), tool .scale .getValue ());
+      return X3D .Matrix4
+         .fromTransform (tool .translation .getValue (), tool .rotation .getValue (), tool .scale .getValue ());
    }
 }
 

package/src/Tools/Grouping/X3DTransformNodeTool.js

@@ -189,7 +189,7 @@ class X3DTransformNodeTool extends X3DChildNodeTool
          scale            = new X3D .Vector3 (1, 1, 1),
          scaleOrientation = new X3D .Rotation4 ();
 
-      matrix .get (translation, rotation, scale, scaleOrientation);
+      matrix .getTransform (translation, rotation, scale, scaleOrientation);
 
       if (!this .tool .tools .includes ("TRANSLATE"))
          translation .set (0, 0, 0);
@@ -203,7 +203,7 @@ class X3DTransformNodeTool extends X3DChildNodeTool
          scaleOrientation .set (0, 0, 1, 0);
       }
 
-      matrix .set (translation, rotation, scale, scaleOrientation);
+      matrix .setTransform (translation, rotation, scale, scaleOrientation);
 
       if (keepCenter)
          this .setMatrixKeepCenter (matrix);
@@ -230,7 +230,7 @@ class X3DTransformNodeTool extends X3DChildNodeTool
          scale            = new X3D .Vector3 (1, 1, 1),
          scaleOrientation = new X3D .Rotation4 ();
 
-      matrix .get (translation, rotation, scale, scaleOrientation, center);
+      matrix .getTransform (translation, rotation, scale, scaleOrientation, center);
 
       this ._translation      = translation;
       this ._rotation         = rotation;
@@ -241,13 +241,12 @@ class X3DTransformNodeTool extends X3DChildNodeTool
 
    getCurrentMatrix ()
    {
-      const matrix = new X3D .Matrix4 ();
-
-      matrix .set (this ._translation .getValue (),
-                   this ._rotation .getValue (),
-                   this ._scale .getValue (),
-                   this ._scaleOrientation .getValue (),
-                   this ._center .getValue ());
+      const matrix = X3D .Matrix4
+         .fromTransform (this ._translation .getValue (),
+                         this ._rotation .getValue (),
+                         this ._scale .getValue (),
+                         this ._scaleOrientation .getValue (),
+                         this ._center .getValue ());
 
       return matrix;
    }

package/src/Tools/Grouping/X3DTransformNodeTool.x3d

@@ -1715,7 +1715,7 @@ function scaleTransform (value, centerOffset)
    }
 
    const scaleMatrix = new SFMatrix4f ();
-   scaleMatrix .setTransform (new SFVec3f (), new SFRotation (), value);
+   scaleMatrix .setTransform (null, null, value);
 
    const
       scaledMatrix = initialMatrix .multLeft (scaleMatrix),

package/src/Tools/Layout/LayoutGroupTool.js

@@ -22,7 +22,7 @@ class LayoutGroupTool extends X3DBoundedObjectTool
             if (!this .tool .layoutDisplay)
                this .tool .layoutDisplay = true;
 
-            renderObject .modelViewMatrix .get () .get (null, null, this .#scale);
+            renderObject .modelViewMatrix .get () .getTransform (null, null, this .#scale);
             this .#rectangleScale .set (this .#scale .x, this .#scale .y, this .#scale .x, this .#scale .y);
 
             this .layoutNode .push (type, renderObject);

package/src/Tools/SnapTool/SnapTarget.js

@@ -146,7 +146,7 @@ class SnapTarget extends X3DSnapNodeTool
       // Snap translation.
 
       const
-         snapMatrix    = new X3D .Matrix4 () .set (snapTranslation),
+         snapMatrix    = X3D .Matrix4 .fromTransform (snapTranslation),
          currentMatrix = absoluteMatrix .multRight (snapMatrix) .multRight (transformTool .getModelMatrix () .copy () .inverse ());
 
       transformTool .setUserData (this .#changing, true);
@@ -258,12 +258,12 @@ class SnapTarget extends X3DSnapNodeTool
 
       // Snap rotation.
 
-      const currentMatrix = new X3D .Matrix4 ()
-         .set (transformTool ._translation      .getValue (),
-               transformTool ._rotation         .getValue () .copy () .multRight (snapRotation),
-               transformTool ._scale            .getValue (),
-               transformTool ._scaleOrientation .getValue (),
-               transformTool ._center           .getValue ());
+      const currentMatrix = X3D .Matrix4
+         .fromTransform (transformTool ._translation      .getValue (),
+                         transformTool ._rotation         .getValue () .copy () .multRight (snapRotation),
+                         transformTool ._scale            .getValue (),
+                         transformTool ._scaleOrientation .getValue (),
+                         transformTool ._center           .getValue ());
 
       transformTool .setUserData (this .#changing, true);
 
@@ -402,7 +402,7 @@ class SnapTarget extends X3DSnapNodeTool
 
             const
                center     = subAABBox .center,
-               snapMatrix = new X3D .Matrix4 () .set (null, null, snapScale, null, center);
+               snapMatrix = X3D .Matrix4 .fromTransform (null, null, snapScale, null, center);
 
             snapMatrix .multRight (transformTool .getCurrentMatrix ());
 
@@ -443,7 +443,7 @@ class SnapTarget extends X3DSnapNodeTool
             const
                subAABBoxAxes = subAABBox .getAxes (SnapTarget .#axes),
                center        = subAABBoxAxes [axis] .multiply (-sgn) .add (subAABBox .center),
-               snapMatrix    = new X3D .Matrix4 () .set (null, null, snapScale, null, center);
+               snapMatrix    = X3D .Matrix4 .fromTransform (null, null, snapScale, null, center);
 
             snapMatrix .multRight (transformTool .getCurrentMatrix ());
 
@@ -546,7 +546,7 @@ class SnapTarget extends X3DSnapNodeTool
             const
                snapScale  = new X3D .Vector3 (aRatio, aRatio, aRatio),
                center     = subAABBox .center,
-               snapMatrix = new X3D .Matrix4 () .set (null, null, snapScale, null, center);
+               snapMatrix = X3D .Matrix4 .fromTransform (null, null, snapScale, null, center);
 
             snapMatrix .multRight (transformTool .getCurrentMatrix ());
 
@@ -606,7 +606,7 @@ class SnapTarget extends X3DSnapNodeTool
                snapScale       = new X3D .Vector3 (aRatio, aRatio, aRatio),
                subAABBoxPoints = subAABBox .getPoints (SnapTarget .#points),
                center          = subAABBoxPoints [SnapTarget .#oppositePoints [handle]],
-               snapMatrix      = new X3D .Matrix4 () .set (null, null, snapScale, null, center);
+               snapMatrix      = X3D .Matrix4 .fromTransform (null, null, snapScale, null, center);
 
             snapMatrix .multRight (transformTool .getCurrentMatrix ());
 

package/src/Undo/Editor.js

@@ -2495,11 +2495,11 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
          scale            = new X3D .Vector3 (1, 1, 1),
          scaleOrientation = new X3D .Rotation4 ();
 
-      matrix .get (translation,
-                   rotation,
-                   scale,
-                   scaleOrientation,
-                   center);
+      matrix .getTransform (translation,
+                            rotation,
+                            scale,
+                            scaleOrientation,
+                            center);
 
       this .roundToIntegerIfAlmostEqual (translation);
       this .roundToIntegerIfAlmostEqual (rotation);
@@ -2682,7 +2682,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             center      = (moveCenter ? bboxCenter .copy () : (sourcePosition ?.copy () ?? bboxCenter .copy () .add (axis))) .subtract (modelMatrices [0] .origin),
             translation = targetPosition .copy () .subtract (center),
             rotation    = new X3D .Rotation4 (sourceNormal ?? axis, targetNormal .copy () .negate ()),
-            snapMatrix  = new X3D .Matrix4 () .set (translation, rotation, null, null, center);
+            snapMatrix  = X3D .Matrix4 .fromTransform (translation, rotation, null, null, center);
 
          const
             invModelMatrix        = modelMatrices [0] .copy () .inverse (),
@@ -3395,7 +3395,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             {
                const rotation = new X3D .Rotation4 ();
 
-               modelMatrix .get (null, rotation);
+               modelMatrix .getTransform (null, rotation);
 
                const
                   position         = modelMatrix .multVecMatrix (node .getPosition () .copy ()),
@@ -3413,7 +3413,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             {
                const rotation = new X3D .Rotation4 ();
 
-               modelMatrix .get (null, rotation);
+               modelMatrix .getTransform (null, rotation);
 
                const
                   position    = modelMatrix .multVecMatrix (node ._position .getValue () .copy ()),
@@ -3440,7 +3440,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
                const rotation = new X3D .Rotation4 ();
 
-               modelMatrix .get (null, rotation);
+               modelMatrix .getTransform (null, rotation);
 
                if (node ._direction)
                {
@@ -3464,7 +3464,8 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             }
             case X3D .X3DConstants .X3DEnvironmentalSensorNode:
             {
-               const matrix = new X3D .Matrix4 () .set (node ._center .getValue (), null, node ._size .getValue ());
+               const matrix = X3D .Matrix4
+                  .fromTransform (node ._center .getValue (), null, node ._size .getValue ());
 
                modelMatrix .multLeft (matrix);
 
@@ -3472,7 +3473,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                   center = new X3D .Vector3 (),
                   size   = new X3D .Vector3 ();
 
-               modelMatrix .get (center, null, size);
+               modelMatrix .getTransform (center, null, size);
 
                this .roundToIntegerIfAlmostEqual (center);
                this .roundToIntegerIfAlmostEqual (size);