sunrize 1.2.7 → 1.3.0

package/src/Tools/Geometry3D/ConeTool.js

@@ -0,0 +1,151 @@
+"use strict";
+
+const
+   X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool"),
+   ToolColors          = require ("../Core/ToolColors"),
+   X3D                 = require ("../../X3D"),
+   _                   = require ("../../Application/GetText");
+
+class ConeTool extends X3DGeometryNodeTool
+{
+   #transformNode = null;
+   #changing      = [false, false];
+
+   async initializeTool ()
+   {
+      await super .initializeTool ("CUSTOM");
+
+      // Transform Tool
+
+      const
+         transformNode = this .getToolScene () .createNode ("Transform"),
+         transformTool = await transformNode .getValue () .addTool () .getToolInstance ();
+
+      this .#transformNode = transformNode;
+
+      transformNode .scale .addInterest ("set_scale", this);
+      transformNode .scale .addFieldInterest (this .tool .size);
+      transformTool .getField ("isActive") .addInterest ("handleUndo", this);
+
+      transformNode .bboxSize      = new X3D .Vector3 (2, 2, 2);
+      transformTool .group         = this .getTypeName ();
+      transformTool .undo          = false;
+      transformTool .tools         = ["SCALE"];
+      transformTool .keys          = ["SHIFT"];
+      transformTool .connectedAxes = ["XZ", "ZX"];
+      transformTool .centerDisplay = false;
+      transformTool .centerTool    = false;
+      transformTool .bboxColor     = ToolColors .BLUE;
+
+      this .tool .group       = this .getTypeName ();
+      this .tool .undo        = true;
+      this .tool .addChildren = new X3D .MFNode (transformNode);
+
+      // Connections
+
+      this .node ._height       .addInterest ("set_height",       this);
+      this .node ._bottomRadius .addInterest ("set_bottomRadius", this);
+
+      this .node ._side                      .addInterest ("set_optionNode", this);
+      this .node ._bottom                    .addInterest ("set_optionNode", this);
+      this .getBrowser () .getConeOptions () .addInterest ("set_optionNode", this);
+
+      this .set_height_and_bottomRadius ();
+      this .set_optionNode ();
+   }
+
+   disposeTool ()
+   {
+      this .node ._height       .removeInterest ("set_height",       this);
+      this .node ._bottomRadius .removeInterest ("set_bottomRadius", this);
+
+      this .node ._side                      .removeInterest ("set_optionNode", this);
+      this .node ._bottom                    .removeInterest ("set_optionNode", this);
+      this .getBrowser () .getConeOptions () .removeInterest ("set_optionNode", this);
+
+      super .disposeTool ();
+   }
+
+   getTransformTool ()
+   {
+      return this .#transformNode .getValue () .getTool ();
+   }
+
+   set_scale (scale)
+   {
+      if (this .#changing .includes (true))
+      {
+         this .#changing .fill (false);
+         return;
+      }
+
+      this .#changing .fill (true);
+
+      this .node ._height       = Math .abs (scale .y) * 2;
+      this .node ._bottomRadius = scale .abs () .dot (new X3D .SFVec3f (1, 0, 1)) / 2;
+   }
+
+   set_height ()
+   {
+      this .set_height_and_bottomRadius (0);
+   }
+
+   set_bottomRadius ()
+   {
+      this .set_height_and_bottomRadius (1);
+   }
+
+   set_height_and_bottomRadius (i)
+   {
+      if (this .#changing [i])
+      {
+         this .#changing [i] = false;
+         return;
+      }
+
+      this .#changing [i] = true;
+
+      const
+         y = Math .abs (this .node ._height .getValue () / 2),
+         r = Math .abs (this .node ._bottomRadius .getValue ());
+
+      this .#transformNode .scale = new X3D .Vector3 (r, y, r);
+   }
+
+   set_optionNode ()
+   {
+      const
+         optionNode = this .getBrowser () .getConeOptions (),
+         dimension  = optionNode ._dimension .getValue (),
+         coordIndex = [ ];
+
+      if (this .node ._side .getValue ())
+         coordIndex .push (... optionNode .getSideGeometry () ._coordIndex);
+
+      if (this .node ._bottom .getValue ())
+      {
+         coordIndex .push (... optionNode .getBottomGeometry () ._coordIndex);
+         coordIndex .splice (-1, 0, coordIndex .at (-dimension - 1));
+      }
+
+      this .tool .set_linesCoordIndex = coordIndex;
+      this .tool .linesCoord          = optionNode .getSideGeometry () ._coord;
+
+      this .addExternalNode (optionNode .getSideGeometry () ._coord);
+   }
+
+   beginUndo ()
+   {
+      this .undoSaveInitialValues (["height", "bottomRadius"]);
+   }
+
+   getUndoDescription (activeTool, name)
+   {
+      if (name)
+         return _ ("Resize Node %s »%s«");
+
+      return _ ("Resize Node %s");
+   }
+}
+
+module .exports = ConeTool;

package/src/Tools/Geometry3D/CylinderTool.js

@@ -0,0 +1,159 @@
+"use strict";
+
+const
+   X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool"),
+   ToolColors          = require ("../Core/ToolColors"),
+   X3D                 = require ("../../X3D"),
+   _                   = require ("../../Application/GetText");
+
+class CylinderTool extends X3DGeometryNodeTool
+{
+   #transformNode = null;
+   #changing      = [false, false];
+
+   async initializeTool ()
+   {
+      await super .initializeTool ("CUSTOM");
+
+      // Transform Tool
+
+      const
+         transformNode = this .getToolScene () .createNode ("Transform"),
+         transformTool = await transformNode .getValue () .addTool () .getToolInstance ();
+
+      this .#transformNode = transformNode;
+
+      transformNode .scale .addInterest ("set_scale", this);
+      transformNode .scale .addFieldInterest (this .tool .size);
+      transformTool .getField ("isActive") .addInterest ("handleUndo", this);
+
+      transformNode .bboxSize      = new X3D .Vector3 (2, 2, 2);
+      transformTool .group         = this .getTypeName ();
+      transformTool .undo          = false;
+      transformTool .tools         = ["SCALE"];
+      transformTool .keys          = ["SHIFT"];
+      transformTool .connectedAxes = ["XZ", "ZX"];
+      transformTool .centerDisplay = false;
+      transformTool .centerTool    = false;
+      transformTool .bboxColor     = ToolColors .BLUE;
+
+      this .tool .group       = this .getTypeName ();
+      this .tool .undo        = true;
+      this .tool .addChildren = new X3D .MFNode (transformNode);
+
+      // Connections
+
+      this .node ._height .addInterest ("set_height", this);
+      this .node ._radius .addInterest ("set_radius", this);
+
+      this .node ._side                          .addInterest ("set_optionNode", this);
+      this .node ._bottom                        .addInterest ("set_optionNode", this);
+      this .node ._top                           .addInterest ("set_optionNode", this);
+      this .getBrowser () .getCylinderOptions () .addInterest ("set_optionNode", this);
+
+      this .set_height_and_radius ();
+      this .set_optionNode ();
+   }
+
+   disposeTool ()
+   {
+      this .node ._height .removeInterest ("set_height", this);
+      this .node ._radius .removeInterest ("set_radius", this);
+
+      this .node ._side                          .removeInterest ("set_optionNode", this);
+      this .node ._bottom                        .removeInterest ("set_optionNode", this);
+      this .node ._top                           .removeInterest ("set_optionNode", this);
+      this .getBrowser () .getCylinderOptions () .removeInterest ("set_optionNode", this);
+
+      super .disposeTool ();
+   }
+
+   getTransformTool ()
+   {
+      return this .#transformNode .getValue () .getTool ();
+   }
+
+   set_scale (scale)
+   {
+      if (this .#changing .includes (true))
+      {
+         this .#changing .fill (false);
+         return;
+      }
+
+      this .#changing .fill (true);
+
+      this .node ._height = Math .abs (scale .y) * 2;
+      this .node ._radius = scale .abs () .dot (new X3D .SFVec3f (1, 0, 1)) / 2;
+   }
+
+   set_height ()
+   {
+      this .set_height_and_radius (0);
+   }
+
+   set_radius ()
+   {
+      this .set_height_and_radius (1);
+   }
+
+   set_height_and_radius (i)
+   {
+      if (this .#changing [i])
+      {
+         this .#changing [i] = false;
+         return;
+      }
+
+      this .#changing [i] = true;
+
+      const
+         y = Math .abs (this .node ._height .getValue () / 2),
+         r = Math .abs (this .node ._radius .getValue ());
+
+      this .#transformNode .scale = new X3D .Vector3 (r, y, r);
+   }
+
+   set_optionNode ()
+   {
+      const
+         optionNode = this .getBrowser () .getCylinderOptions (),
+         dimension  = optionNode ._dimension .getValue (),
+         coordIndex = [ ];
+
+      if (this .node ._side .getValue ())
+         coordIndex .push (... optionNode .getSideGeometry () ._coordIndex);
+
+      if (this .node ._bottom .getValue ())
+      {
+         coordIndex .push (... optionNode .getBottomGeometry () ._coordIndex);
+         coordIndex .splice (-1, 0, coordIndex .at (-dimension - 1));
+      }
+
+      if (this .node ._top .getValue ())
+      {
+         coordIndex .push (... optionNode .getTopGeometry () ._coordIndex);
+         coordIndex .splice (-1, 0, coordIndex .at (-dimension - 1));
+      }
+
+      this .tool .set_linesCoordIndex = coordIndex;
+      this .tool .linesCoord          = optionNode .getSideGeometry () ._coord;
+
+      this .addExternalNode (optionNode .getSideGeometry () ._coord);
+   }
+
+   beginUndo ()
+   {
+      this .undoSaveInitialValues (["height", "radius"]);
+   }
+
+   getUndoDescription (activeTool, name)
+   {
+      if (name)
+         return _ ("Resize Node %s »%s«");
+
+      return _ ("Resize Node %s");
+   }
+}
+
+module .exports = CylinderTool;

package/src/Tools/Geometry3D/ElevationGridTool.js

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

package/src/Tools/Geometry3D/ExtrusionTool.js

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

package/src/Tools/Geometry3D/IndexedFaceSetTool.js

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

package/src/Tools/Geometry3D/SphereTool.js

@@ -0,0 +1,116 @@
+"use strict";
+
+const
+   X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool"),
+   ToolColors          = require ("../Core/ToolColors"),
+   X3D                 = require ("../../X3D"),
+   _                   = require ("../../Application/GetText");
+
+class SphereTool extends X3DGeometryNodeTool
+{
+   #transformNode = null;
+   #changing      = false;
+
+   async initializeTool ()
+   {
+      await super .initializeTool ("CUSTOM");
+
+      // Transform Tool
+
+      const
+         transformNode = this .getToolScene () .createNode ("Transform"),
+         transformTool = await transformNode .getValue () .addTool () .getToolInstance ();
+
+      this .#transformNode = transformNode;
+
+      transformNode .scale .addInterest ("set_scale", this);
+      transformNode .scale .addFieldInterest (this .tool .size);
+      transformTool .getField ("isActive") .addInterest ("handleUndo", this);
+
+      transformNode .bboxSize      = new X3D .Vector3 (2, 2, 2);
+      transformTool .group         = this .getTypeName ();
+      transformTool .undo          = false;
+      transformTool .tools         = ["SCALE"];
+      transformTool .keys          = [ ];
+      transformTool .connectedAxes = ["XY", "XZ", "YX", "YZ", "ZX", "ZY"];
+      transformTool .centerDisplay = false;
+      transformTool .centerTool    = false;
+      transformTool .bboxColor     = ToolColors .BLUE;
+
+      this .tool .group       = this .getTypeName ();
+      this .tool .undo        = true;
+      this .tool .addChildren = new X3D .MFNode (transformNode);
+
+      // Connections
+
+      this .node ._radius                      .addInterest ("set_radius",     this);
+      this .getBrowser () .getSphereOptions () .addInterest ("set_optionNode", this);
+
+      this .set_radius (this .node ._radius);
+      this .set_optionNode (this .getBrowser () .getSphereOptions ());
+   }
+
+   disposeTool ()
+   {
+      this .node ._radius                      .removeInterest ("set_radius",     this);
+      this .getBrowser () .getSphereOptions () .removeInterest ("set_optionNode", this);
+
+      super .disposeTool ();
+   }
+
+   getTransformTool ()
+   {
+      return this .#transformNode .getValue () .getTool ();
+   }
+
+   set_scale (scale)
+   {
+      if (this .#changing)
+      {
+         this .#changing = false;
+         return;
+      }
+
+      this .#changing = true;
+
+      this .node ._radius = scale .abs () .dot (new X3D .SFVec3f (1, 1, 1)) / 3;
+   }
+
+   set_radius (radius)
+   {
+      if (this .#changing)
+      {
+         this .#changing = false;
+         return;
+      }
+
+      this .#changing = true;
+
+      const r = Math .abs (radius .getValue ());
+
+      this .#transformNode .scale = new X3D .Vector3 (r, r, r);
+   }
+
+   set_optionNode (optionNode)
+   {
+      this .tool .set_linesCoordIndex = optionNode .getGeometry () ._coordIndex;
+      this .tool .linesCoord          = optionNode .getGeometry () ._coord;
+
+      this .addExternalNode (optionNode .getGeometry () ._coord);
+   }
+
+   beginUndo ()
+   {
+      this .undoSaveInitialValues (["radius"]);
+   }
+
+   getUndoDescription (activeTool, name)
+   {
+      if (name)
+         return _ ("Resize Node %s »%s«");
+
+      return _ ("Resize Node %s");
+   }
+}
+
+module .exports = SphereTool;

package/src/Tools/Geospatial/GeoElevationGridTool.js

@@ -0,0 +1,15 @@
+"use strict";
+
+const X3DGeometryNodeTool = require ("../Rendering/X3DGeometryNodeTool");
+
+class GeoElevationGridTool extends X3DGeometryNodeTool
+{
+   async initializeTool ()
+   {
+      await super .initializeTool ();
+
+      this .tool .linewidthScaleFactor = 1;
+   }
+}
+
+module .exports = GeoElevationGridTool;

package/src/Tools/Grouping/X3DBoundedObjectTool.x3d

@@ -9,8 +9,8 @@
     <meta name='comment' content='Rise and Shine'/>
     <meta name='created' content='Fri, 29 Aug 2014 13:13:27 GMT'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.1.9, https://create3000.github.io/sunrize/'/>
-    <meta name='modified' content='Tue, 21 Nov 2023 18:32:21 GMT'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.2.7, https://create3000.github.io/sunrize/'/>
+    <meta name='modified' content='Tue, 28 Nov 2023 22:34:13 GMT'/>
   </head>
   <Scene>
     <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
@@ -54,6 +54,8 @@
                     <connect nodeField='emissiveColor' protoField='bboxColor'/>
                   </IS>
                 </UnlitMaterial>
+                <DepthMode
+                    polygonOffset='-1 -1'/>
               </Appearance>
               <IndexedLineSet
                   coordIndex='0, 1, 2, 3, 0, -1, 4, 5, 6, 7, 4, -1, 0, 4, -1, 3, 7, -1, 1, 5, -1, 2, 6, -1'>
@@ -423,6 +425,7 @@ function eventsProcessed ()
       </ProtoBody>
     </ProtoDeclare>
     <ProtoInstance name='Tool'>
+      <fieldValue name='bboxDisplay' value='true'/>
       <fieldValue name='bboxSize' value='2 3 4'/>
     </ProtoInstance>
   </Scene>

package/src/Tools/Grouping/X3DTransformNodeTool.js

@@ -4,7 +4,6 @@ const
    X3DChildNodeTool = require ("../Core/X3DChildNodeTool"),
    X3D              = require ("../../X3D"),
    Editor           = require ("../../Undo/Editor"),
-   UndoManager      = require ("../../Undo/UndoManager"),
    ActionKeys       = require ("../../Application/ActionKeys"),
    _                = require ("../../Application/GetText");
 
@@ -50,7 +49,10 @@ class X3DTransformNodeTool extends X3DChildNodeTool
 
    set_keys__ (keys)
    {
-      if (!this .tool .keys)
+      if ((keys & ActionKeys .Option) && !this .tool .keys .includes ("OPTION"))
+         return;
+
+      if ((keys & ActionKeys .Shift) && !this .tool .keys .includes ("SHIFT"))
          return;
 
       if (this .tool .tools .includes ("TRANSLATE"))