sunrize 1.7.43 → 1.7.45

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.43",
+  "version": "1.7.45",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -90,7 +90,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^33.3.1",
+    "electron": "^34.0.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.0",
-    "x_ite": "^11.0.4",
+    "x_ite": "^11.0.5",
     "x3d-traverse": "^1.0.9"
   }
 }

package/src/Application/Application.js

@@ -58,16 +58,17 @@ module .exports = class Application
       };
 
       this .config .setDefaultValues ({
-         position: [undefined, undefined],
-         size: [1100, 680],
-         maximized: false,
-         fullscreen: false,
          autoSave: true,
+         browserUpdate: false,
          expandExternProtoDeclarations: true,
-         expandPrototypeInstances: true,
          expandInlineNodes: true,
+         expandPrototypeInstances: true,
+         fullscreen: false,
+         maximized: false,
+         position: [undefined, undefined],
          recentDocuments: [ ],
          recentLocations: [ ],
+         size: [1100, 680],
       });
 
       Template .create (path .join (__dirname, "../assets/html/application-template.html"));
@@ -286,6 +287,17 @@ module .exports = class Application
                      click: () => this .mainWindow .webContents .send ("reload"),
                   },
                   { type: "separator" },
+                  {
+                     label: _("Default Play Button State"),
+                     type: "checkbox",
+                     checked: this .config .browserUpdate,
+                     click: () =>
+                     {
+                        this .config .browserUpdate = !this .config .browserUpdate;
+                        this .mainWindow .webContents .send ("browser-update", this .config .browserUpdate);
+                     },
+                  },
+                  { type: "separator" },
                   {
                      label: _("Save"),
                      accelerator: "CmdOrCtrl+S",

package/src/Application/Dashboard.js

@@ -2,6 +2,7 @@
 
 const
    $         = require ("jquery"),
+   electron  = require ("electron"),
    Interface = require ("./Interface"),
    Editor    = require("../Undo/Editor"),
    _         = require ("./GetText");
@@ -65,18 +66,20 @@ module .exports = class Dashboard extends Interface
          .text ("edit_note")
          .appendTo (this .toolbar)
          .on ("click", () => this .togglePanel (!this .config .file .panel));
+
+      electron .ipcRenderer .on ("browser-update", (event, value) => this .config .global .play = value);
    }
 
    configure ()
    {
       this .config .file .setDefaultValues ({
          pointer: "arrow",
-         play: false,
+         play: this .config .global .play,
          panel: false,
       });
 
       this [this .config .file .pointer] ();
-      this .play (this .config .file .play && !this .isInitialScene);
+      this .play ((this .config .file .play) && !this .isInitialScene);
       this .straighten (this .browser .getBrowserOption ("StraightenHorizon"));
 
       if (this .config .file .panel)

package/src/Application/Document.js

@@ -177,15 +177,7 @@ module .exports = class Document extends Interface
 
       this .browser .updateConcreteNode (require ("../Components/Grouping/StaticGroup"));
 
-      X3D .NurbsSweptSurface .prototype .traverse = function (type, renderObject)
-      {
-         this .getTrajectoryCurve () ?.traverse (type, renderObject);
-      };
-
-      X3D .NurbsSwungSurface .prototype .traverse = function (type, renderObject)
-      {
-         this .getTrajectoryCurve () ?.traverse (type, renderObject);
-      };
+      require ("../Components");
 
       // Restore
 

package/src/Application/Tabs.js

@@ -62,7 +62,8 @@ module .exports = new class Tabs
       $(window) .on ("beforeunload", () => this .close ());
 
       // Forward Actions
-
+      
+      this .forwardToAllTabs ("browser-update");
       this .forwardToAllTabs ("auto-save");
       this .forwardToActiveTab ("export-as");
 

package/src/Components/Geometry2D/Arc2D.js

@@ -0,0 +1,16 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Arc2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const geometry = this .toIndexedLineSet (executionContext,
+      {
+         polyline: true,
+      });
+
+      geometry ._metadata = this ._metadata;
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/ArcClose2D.js

@@ -0,0 +1,14 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .ArcClose2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const geometry = this .toIndexedFaceSet (executionContext, { texCoord: true });
+
+      geometry ._metadata = this ._metadata;
+      geometry ._solid    = this ._solid;
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/Circle2D.js

@@ -0,0 +1,23 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Circle2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         browser  = this .getBrowser (),
+         geometry = browser .getCircle2DOptions () .getGeometry () .copy (executionContext),
+         radius   = this ._radius .getValue ();
+
+      geometry ._metadata = this ._metadata;
+      geometry ._coord    = geometry ._coord .getValue () .copy (executionContext);
+
+      for (const [i, point] of geometry ._coord .point .entries ())
+         geometry ._coord .point [i] = point .multiply (radius);
+
+      geometry ._coord .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/Disk2D.js

@@ -0,0 +1,53 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Disk2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         innerRadius = Math .min (Math .abs (this ._innerRadius .getValue ()), Math .abs (this ._outerRadius .getValue ())),
+         outerRadius = Math .max (Math .abs (this ._innerRadius .getValue ()), Math .abs (this ._outerRadius .getValue ()));
+
+      if (innerRadius === outerRadius)
+      {
+         // Point
+
+         if (outerRadius === 0)
+         {
+            const geometry = executionContext .createNode ("PointSet", false);
+
+            geometry ._coord = executionContext .createNode ("Coordinate", false);
+
+            geometry ._coord .point .push (new X3D .SFVec3f ());
+
+            geometry ._coord .getValue () .setup ();
+            geometry .setup ();
+
+            return geometry;
+         }
+
+         // Circle
+
+         const
+            browser  = this .getBrowser (),
+            geometry = browser .getCircle2DOptions () .getGeometry () .copy (executionContext);
+
+         geometry ._coord = geometry ._coord .getValue () .copy (executionContext);
+
+         for (const [i, point] of geometry ._coord .point .entries ())
+            geometry ._coord .point [i] = point .multiply (outerRadius);
+
+         geometry ._coord .getValue () .setup ();
+         geometry .setup ();
+
+         return geometry;
+      }
+
+      const geometry = this .toIndexedFaceSet (executionContext, { texCoord: true });
+
+      geometry ._metadata = this ._metadata;
+      geometry ._solid    = this ._solid;
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/Polyline2D.js

@@ -0,0 +1,16 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Polyline2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const geometry = this .toIndexedLineSet (executionContext,
+      {
+         polyline: true,
+      });
+
+      geometry ._metadata = this ._metadata;
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/Polypoint2D.js

@@ -0,0 +1,20 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Polypoint2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const geometry = executionContext .createNode ("PointSet", false);
+
+      geometry ._metadata = this ._metadata;
+      geometry ._coord    = executionContext .createNode ("Coordinate", false);
+
+      for (const point of this ._point)
+         geometry ._coord .point .push (new X3D .SFVec3f (... point, 0));
+
+      geometry ._coord .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/Rectangle2D.js

@@ -0,0 +1,27 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Rectangle2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         browser  = this .getBrowser (),
+         geometry = browser .getRectangle2DOptions () .getGeometry () .copy (executionContext),
+         size1_2  = new X3D .SFVec3f (... this ._size .divide (2), 1);
+
+      geometry ._metadata = this ._metadata;
+      geometry ._solid    = this ._solid;
+
+      geometry ._texCoord = geometry ._texCoord .getValue () .copy (executionContext);
+      geometry ._coord    = geometry ._coord    .getValue () .copy (executionContext);
+
+      for (const [i, point] of geometry ._coord .point .entries ())
+         geometry ._coord .point [i] = point .multVec (size1_2);
+
+      geometry ._texCoord .getValue () .setup ();
+      geometry ._coord    .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry2D/TriangleSet2D.js

@@ -0,0 +1,33 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .TriangleSet2D .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         texCoords = this .getTexCoords (),
+         vertices  = this .getVertices (),
+         geometry  = executionContext .createNode ("IndexedFaceSet", false);
+
+      geometry ._metadata = this ._metadata;
+      geometry ._solid    = this ._solid;
+
+      geometry ._texCoord = executionContext .createNode ("TextureCoordinate", false);
+      geometry ._coord    = executionContext .createNode ("Coordinate",        false);
+
+      for (let i = 0, length = vertices .length / 12; i < length; ++ i)
+         geometry ._coordIndex .push (i * 3, i * 3 + 1, i * 3 + 2, -1);
+
+      for (let i = 0, length = vertices .length; i < length; i += 4)
+      {
+         geometry ._texCoord .point .push (new X3D .SFVec2f (texCoords [i], texCoords [i + 1]));
+         geometry ._coord    .point .push (new X3D .SFVec3f (vertices  [i], vertices  [i + 1], 0));
+      }
+
+      geometry ._texCoord .getValue () .setup ();
+      geometry ._coord    .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry3D/Box.js

@@ -0,0 +1,27 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Box .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         browser  = this .getBrowser (),
+         geometry = browser .getBoxOptions () .getGeometry () .copy (executionContext),
+         size1_2  = this ._size .divide (2);
+
+      geometry ._metadata = this ._metadata;
+      geometry ._solid    = this ._solid;
+
+      geometry ._texCoord = geometry ._texCoord .getValue () .copy (executionContext);
+      geometry ._coord    = geometry ._coord    .getValue () .copy (executionContext);
+
+      for (const [i, point] of geometry ._coord .point .entries ())
+         geometry ._coord .point [i] = point .multVec (size1_2);
+
+      geometry ._texCoord .getValue () .setup ();
+      geometry ._coord    .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry3D/Cone.js

@@ -0,0 +1,79 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Cone .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         browser   = this .getBrowser (),
+         geometry  = browser .getConeOptions () .getSideGeometry () .copy (executionContext),
+         radius    = this ._bottomRadius .getValue (),
+         height1_2 = this ._height .getValue () / 2;
+
+      geometry ._metadata    = this ._metadata;
+      geometry ._coordIndex  = [ ];
+      geometry ._normalIndex = [ ];
+      geometry ._solid       = this ._solid;
+      geometry ._creaseAngle = Math .PI;
+
+      geometry ._texCoord = geometry ._texCoord .getValue () .copy (executionContext);
+      geometry ._normal   = null;
+      geometry ._coord    = geometry ._coord    .getValue () .copy (executionContext);
+
+      for (const point of geometry ._coord .point)
+      {
+         point .x *= radius;
+         point .y *= height1_2;
+         point .z *= radius;
+      }
+
+      if (this ._side .getValue ())
+      {
+         const last = geometry ._coord .point .length - 1;
+
+         for (const index of browser .getConeOptions () .getSideGeometry () ._coordIndex)
+         {
+            if (index < 0 || index !== last)
+            {
+               geometry ._coordIndex .push (index);
+            }
+            else
+            {
+               geometry ._coordIndex .push (geometry ._coord .point .length);
+               geometry ._coord .point .push (geometry ._coord .point [index]);
+            }
+         }
+      }
+      else
+      {
+         geometry ._texCoordIndex .length = 0;
+      }
+
+      if (this ._bottom .getValue ())
+      {
+         for (const index of browser .getConeOptions () .getBottomGeometry () ._texCoordIndex)
+            geometry ._texCoordIndex .push (index);
+
+         for (const index of browser .getConeOptions () .getBottomGeometry () ._coordIndex)
+         {
+            if (index < 0)
+            {
+               geometry ._coordIndex .push (-1);
+            }
+            else
+            {
+               geometry ._coordIndex .push (geometry ._coord .point .length);
+               geometry ._coord .point .push (geometry ._coord .point [index]);
+            }
+         }
+      }
+
+      // geometry .optimize ();
+
+      geometry ._texCoord .getValue () .setup ();
+      geometry ._coord    .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry3D/Cylinder.js

@@ -0,0 +1,81 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .Cylinder .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const
+         browser   = this .getBrowser (),
+         geometry  = browser .getCylinderOptions () .getSideGeometry () .copy (executionContext),
+         radius    = this ._radius .getValue (),
+         height1_2 = this ._height .getValue () / 2;
+
+      geometry ._metadata    = this ._metadata;
+      geometry ._normalIndex = [ ];
+      geometry ._solid       = this ._solid;
+      geometry ._creaseAngle = Math .PI;
+
+      geometry ._texCoord = geometry ._texCoord .getValue () .copy (executionContext);
+      geometry ._normal   = null;
+      geometry ._coord    = geometry ._coord .getValue () .copy (executionContext);
+
+      for (const point of geometry ._coord .point)
+      {
+         point .x *= radius;
+         point .y *= height1_2;
+         point .z *= radius;
+      }
+
+      if (!this ._side .getValue ())
+      {
+         geometry ._texCoordIndex .length = 0;
+         geometry ._coordIndex    .length = 0;
+      }
+
+      if (this ._top .getValue ())
+      {
+         for (const index of browser .getCylinderOptions () .getTopGeometry () ._texCoordIndex)
+            geometry ._texCoordIndex .push (index);
+
+         for (const index of browser .getCylinderOptions () .getTopGeometry () ._coordIndex)
+         {
+            if (index < 0)
+            {
+               geometry ._coordIndex .push (-1);
+            }
+            else
+            {
+               geometry ._coordIndex .push (geometry ._coord .point .length);
+               geometry ._coord .point .push (geometry ._coord .point [index]);
+            }
+         }
+      }
+
+      if (this ._bottom .getValue ())
+      {
+         for (const index of browser .getCylinderOptions () .getBottomGeometry () ._texCoordIndex)
+            geometry ._texCoordIndex .push (index);
+
+         for (const index of browser .getCylinderOptions () .getBottomGeometry () ._coordIndex)
+         {
+            if (index < 0)
+            {
+               geometry ._coordIndex .push (-1);
+            }
+            else
+            {
+               geometry ._coordIndex .push (geometry ._coord .point .length);
+               geometry ._coord .point .push (geometry ._coord .point [index]);
+            }
+         }
+      }
+
+      // geometry .optimize ();
+
+      geometry ._texCoord .getValue () .setup ();
+      geometry ._coord    .getValue () .setup ();
+      geometry .setup ();
+
+      return geometry;
+   },
+});

package/src/Components/Geometry3D/ElevationGrid.js

@@ -0,0 +1,23 @@
+const X3D = require ("../../X3D");
+
+Object .assign (X3D .ElevationGrid .prototype,
+{
+   toPrimitive (executionContext = this .getExecutionContext ())
+   {
+      const geometry = this .toIndexedFaceSet (executionContext,
+      {
+         fogCoord: !!this ._fogCoord .getValue (),
+         color: !!this ._color .getValue (),
+         texCoord: true,
+         tangent: !!this ._tangent .getValue (),
+         normal: !!this ._normal .getValue (),
+      });
+
+      geometry ._metadata    = this ._metadata;
+      geometry ._solid       = this ._solid;
+      geometry ._ccw         = this ._ccw;
+      geometry ._creaseAngle = this ._creaseAngle;
+
+      return geometry;
+   },
+});