sunrize 1.5.13 → 1.6.0

package/src/Tools/Grouping/X3DTransformNodeTool.x3d

@@ -11,8 +11,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.5.2, https://create3000.github.io/sunrize/'/>
-    <meta name='modified' content='Tue, 20 Feb 2024 13:24:38 GMT'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.5.13, https://create3000.github.io/sunrize/'/>
+    <meta name='modified' content='Tue, 27 Feb 2024 17:59:07 GMT'/>
   </head>
   <Scene>
     <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
@@ -33,6 +33,7 @@
         <field accessType='inputOutput' type='SFString' name='group' value='Transform'/>
         <field accessType='inputOutput' type='SFBool' name='grouping'/>
         <field accessType='inputOutput' type='SFBool' name='undo' value='true'/>
+        <field accessType='inputOutput' type='SFBool' name='active'/>
         <field accessType='inputOutput' type='SFVec3f' name='translation'/>
         <field accessType='inputOutput' type='SFRotation' name='rotation'/>
         <field accessType='inputOutput' type='SFVec3f' name='scale' value='1 1 1'/>
@@ -647,7 +648,7 @@
               </IS>
               <ProtoInstance name='BooleanSwitch' DEF='CenterLine'>
                 <fieldValue name='children'>
-                  <Shape
+                  <Shape DEF='_1'
                       castShadow='false'>
                     <Appearance DEF='CenterLineStyle'>
                       <LineProperties
@@ -1054,6 +1055,7 @@ function set_tool (value)
           <field accessType='inputOutput' type='SFVec3f' name='center'/>
           <field accessType='inputOutput' type='SFString' name='translateMode'/>
           <field accessType='inputOutput' type='SFBool' name='keepCenter'/>
+          <field accessType='outputOnly' type='SFString' name='activeHandle'/>
           <field accessType='initializeOnly' type='SFVec3f' name='initialTranslation'/>
           <field accessType='initializeOnly' type='SFVec3f' name='initialCenter'/>
           <field accessType='initializeOnly' type='SFInt32' name='events'/>
@@ -1064,6 +1066,7 @@ function set_tool (value)
             <connect nodeField='scaleOrientation' protoField='scaleOrientation'/>
             <connect nodeField='center' protoField='center'/>
             <connect nodeField='translateMode' protoField='translateMode'/>
+            <connect nodeField='activeHandle' protoField='activeHandle'/>
           </IS>
 <![CDATA[ecmascript:
 
@@ -1184,7 +1187,7 @@ function set_zTranslation (value)
 
 function translate (value)
 {
-   // Prevent accidentially move.
+   // Prevent accidentally move.
    if (events)
    {
       -- events;
@@ -1302,7 +1305,7 @@ function rotate (value)
 {
    if (events)
    {
-      // Prevent accidentially move.
+      // Prevent accidentally move.
       -- events;
       return;
    }
@@ -1632,18 +1635,18 @@ function scaleTransformAxis (axis, value, sgn)
 
 function connectAxes (axis, vector, offset)
 {
-	for (const connectedAxis of connectedAxes)
-	{
-		const
-			lhs = connectedAxis [0] .toLowerCase (),
-			rhs = connectedAxis [1] .toLowerCase ();
+   for (const connectedAxis of connectedAxes)
+   {
+      const
+         lhs = connectedAxis [0] .toLowerCase (),
+         rhs = connectedAxis [1] .toLowerCase ();
 
-		if (rhs !== axis)
+      if (rhs !== axis)
          continue;
 
-		vector [lhs] = vector [rhs];
-		offset [lhs] = offset [rhs];
-	}
+      vector [lhs] = vector [rhs];
+      offset [lhs] = offset [rhs];
+   }
 }
 
 function scaleTransformUniform (value, sgn, centerOffset, axis)
@@ -1675,7 +1678,7 @@ function scaleTransform (value, centerOffset)
 {
    if (events)
    {
-      // Prevent accidentially move.
+      // Prevent accidentally move.
       -- events;
       return;
    }
@@ -1735,6 +1738,7 @@ function translate (scaledMatrix, distanceFromCenter)
           <field accessType='inputOutput' type='SFVec3f' name='center'/>
           <field accessType='inputOutput' type='SFVec3f' name='bboxCenter'/>
           <field accessType='outputOnly' type='SFBool' name='keepCenter'/>
+          <field accessType='outputOnly' type='SFString' name='activeHandle'/>
           <field accessType='outputOnly' type='SFString' name='activeTool'/>
           <field accessType='outputOnly' type='SFBool' name='isActive'/>
           <field accessType='initializeOnly' type='SFMatrix4f' name='initialMatrix'/>
@@ -1755,6 +1759,7 @@ function translate (scaledMatrix, distanceFromCenter)
             <connect nodeField='center' protoField='center'/>
             <connect nodeField='bboxCenter' protoField='bboxCenter'/>
             <connect nodeField='keepCenter' protoField='keepCenter'/>
+            <connect nodeField='activeHandle' protoField='activeHandle'/>
             <connect nodeField='activeTool' protoField='activeTool'/>
             <connect nodeField='isActive' protoField='isActive'/>
           </IS>

package/src/Tools/Layering/X3DActiveLayerNodeTool.js

@@ -12,6 +12,8 @@ class X3DActiveLayerNodeTool extends X3DChildNodeTool
    {
       const node = executionContext .createNode ("Group", false);
 
+      node ._visible = false;
+
       node .setup ();
 
       super (node);
@@ -21,17 +23,17 @@ class X3DActiveLayerNodeTool extends X3DChildNodeTool
    {
       await super .initializeTool (... args);
 
-      this .getBrowser () .getActiveLayer () .addInterest ("set_activeLayer", this);
+      this .getBrowser () ._activeLayer .addInterest ("set_activeLayer", this);
 
       this ._visible .addInterest ("set_visible", this);
 
-      this .set_activeLayer ();
       this .set_visible ();
+      this .set_activeLayer ();
    }
 
    disposeTool ()
    {
-      this .getBrowser () .getActiveLayer () .removeInterest ("set_activeLayer", this);
+      this .getBrowser () ._activeLayer .removeInterest ("set_activeLayer", this);
 
       this .disconnectTool ();
       this .removeFromLayer (this .toolLayerNode);
@@ -39,13 +41,22 @@ class X3DActiveLayerNodeTool extends X3DChildNodeTool
       super .disposeTool ();
    }
 
+   set_visible ()
+   {
+      if (this ._visible .getValue ())
+         this .connectTool ();
+      else
+         this .disconnectTool ();
+   }
+
    set_activeLayer ()
    {
       this .removeFromLayer (this .toolLayerNode);
 
       this .toolLayerNode = this .getBrowser () .getActiveLayer ();
 
-      this .addToLayer (this .toolLayerNode)
+      this .addToLayer (this .toolLayerNode);
+      this .configureTool ();
    }
 
    addToLayer (layerNode)
@@ -67,27 +78,11 @@ class X3DActiveLayerNodeTool extends X3DChildNodeTool
          layerNode .getGroups () ._children .splice (index, 1);
    }
 
-   set_visible ()
-   {
-      if (this ._visible .getValue ())
-         this .connectTool ();
-      else
-         this .disconnectTool ();
-   }
-
    connectTool () { }
 
    disconnectTool () { }
 
-   getModelMatrix ()
-   {
-      const layoutGroupNode = X3D .X3DCast (X3D .X3DConstants .LayoutGroup, this .toolLayerNode .getGroups () ._children [0]);
-
-      if (layoutGroupNode)
-         return layoutGroupNode .getMatrix ();
-
-      return new X3D .Matrix4 ();
-   }
+   configureTool () { }
 }
 
 module .exports = X3DActiveLayerNodeTool;

package/src/Tools/Lighting/DirectionalLightTool.js

@@ -4,18 +4,49 @@ const X3DLightNodeTool = require ("./X3DLightNodeTool");
 
 class DirectionalLightTool extends X3DLightNodeTool
 {
+   #changing = false;
+
    async initializeTool ()
    {
       await super .initializeTool ();
 
+      this .tool .getField ("location") .addInterest ("set_location", this);
       this .tool .getField ("direction") .addReference (this .node ._direction);
 
+      this .addMetaDataCallback (this, "DirectionalLight/location", this .set_meta_location .bind (this));
+      this .getMetaData ("DirectionalLight/location", this .tool .location);
+
       this .tool .type = 0;
    }
 
+   disposeTool ()
+   {
+      this .removeMetaDataCallback (this, "DirectionalLight/location");
+
+      super .disposeTool ();
+   }
+
    beginUndo ()
    {
-      this .undoSaveInitialValues (["direction"]);
+      this .undoSaveInitialValues (["location", "direction"]);
+   }
+
+   set_location ()
+   {
+      this .#changing = true;
+
+      this .setMetaData ("DirectionalLight/location", this .tool .location);
+   }
+
+   set_meta_location ()
+   {
+      if (this .#changing)
+      {
+         this .#changing = false;
+         return;
+      }
+
+      this .getMetaData ("DirectionalLight/location", this .tool .location);
    }
 }
 

package/src/Tools/Lighting/X3DLightNodeTool.x3d

@@ -234,6 +234,7 @@
           <field accessType='inputOutput' type='SFFloat' name='emissiveStrength' value='0.67'/>
           <field accessType='inputOutput' type='SFFloat' name='intensity'/>
           <field accessType='inputOutput' type='SFVec3f' name='direction'/>
+          <field accessType='initializeOnly' type='SFVec3f' name='upVector' value='0 1 0'/>
           <field accessType='inputOnly' type='SFRotation' name='set_rotation'/>
           <field accessType='inputOutput' type='SFFloat' name='beamWidth'/>
           <field accessType='inputOutput' type='SFFloat' name='cutOffAngle'/>
@@ -338,8 +339,8 @@ function set_direction (value)
 
    changing = true;
 
-   transform .rotation = straightenHorizon (new SFRotation (new SFVec3f (0, 0, 1), value),
-                                            new SFVec3f (0, 1, 0));
+   transform .rotation = new SFRotation (new SFVec3f (0, 0, 1), value)
+      .straighten (upVector);
 }
 
 function set_rotation (value)
@@ -353,25 +354,7 @@ function set_rotation (value)
    changing = true;
 
    direction = transform .rotation .multVec (new SFVec3f (0, 0, 1));
-}
-
-function straightenHorizon (orientation, upVector)
-{
-   const
-      localXAxis = orientation .multVec (new SFVec3f (-1, 0, 0)),
-      localZAxis = orientation .multVec (new SFVec3f (0, 0, 1)),
-      vector     = localZAxis .cross (upVector);
-
-   // If viewer looks along the up vector.
-   if (Math .abs (localZAxis .dot (upVector)) >= 1)
-      return orientation;
-
-   if (Math .abs (vector .dot (localXAxis)) >= 1)
-      return orientation;
-
-   const rotation = new SFRotation (localXAxis, vector);
-
-   return orientation .multiply (rotation);
+   upVector  = transform .rotation .multVec (new SFVec3f (0, 1, 0));
 }
 
 function set_beamWidth ()

package/src/Tools/Shaders/TextureShader.x3d

@@ -6,15 +6,22 @@
     <meta name='comment' content='Rise and Shine'/>
     <meta name='created' content='Sun, 03 Aug 2014 14:00:40 GMT'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.0.11, https://create3000.github.io/sunrize/'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.5.13, https://create3000.github.io/sunrize/'/>
     <meta name='identifier' content='file:///Users/holger/Desktop/X_ITE/sunrize/src/sunrize/Tools/Shaders/TextureShader.x3d'/>
-    <meta name='modified' content='Thu, 16 Mar 2023 12:32:57 GMT'/>
+    <meta name='modified' content='Tue, 27 Feb 2024 11:40:36 GMT'/>
   </head>
   <Scene>
     <ProtoDeclare name='TextureShader'>
+      <ProtoInterface>
+        <field accessType='inputOutput' type='SFBool' name='flipY'/>
+      </ProtoInterface>
       <ProtoBody>
         <ComposedShader DEF='TextureShader'
             language='GLSL'>
+          <field accessType='inputOutput' type='SFBool' name='flipY'/>
+          <IS>
+            <connect nodeField='flipY' protoField='flipY'/>
+          </IS>
           <ShaderPart DEF='TextureVertexShader'>
 <![CDATA[data:text/plain,#version 300 es
 
@@ -46,6 +53,7 @@ precision highp float;
 
 uniform x3d_UnlitMaterialParameters x3d_Material;
 uniform sampler2D x3d_Texture2D [1];
+uniform bool flipY;
 
 in vec4 texCoord;
 
@@ -54,7 +62,12 @@ out vec4 x3d_FragColor;
 void
 main ()
 {
-   x3d_FragColor     = texture (x3d_Texture2D [0], texCoord .st / texCoord .q);
+   vec2 tc = texCoord .st / texCoord .q;
+
+   if (flipY)
+      tc .t = 1.0 - tc .t;
+
+   x3d_FragColor     = texture (x3d_Texture2D [0], tc);
    x3d_FragColor .a *= 1.0 - x3d_Material .transparency;
 }
 ]]>

package/src/Tools/SnapTool/{SnapSourceTool.js → SnapSource.js}

@@ -4,14 +4,9 @@ const
    X3DSnapNodeTool = require ("./X3DSnapNodeTool"),
    ActionKeys      = require ("../../Application/ActionKeys");
 
-class SnapSourceTool extends X3DSnapNodeTool
+class SnapSource extends X3DSnapNodeTool
 {
    toolModifiers = ActionKeys .Option;
-   
-   constructor (executionContext)
-   {
-      super (executionContext);
-   }
 
    async initializeTool ()
    {
@@ -21,4 +16,4 @@ class SnapSourceTool extends X3DSnapNodeTool
    }
 }
 
-module .exports = SnapSourceTool;
+module .exports = SnapSource;