sunrize 1.5.13 → 1.6.0

package/src/Tools/SnapTool/SnapTool.x3d

@@ -7,9 +7,9 @@
     <meta name='comment' content='Rise and Shine'/>
     <meta name='created' content='Mon, 12 Oct 2015 11:18:05 GMT'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.5.5, https://create3000.github.io/sunrize/'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.5.14, https://create3000.github.io/sunrize/'/>
     <meta name='identifier' content='file:///home/holger/Projekte/Titania/libtitania-x3d/share/titania/tools/SnapTool.x3dv'/>
-    <meta name='modified' content='Wed, 21 Feb 2024 12:13:47 GMT'/>
+    <meta name='modified' content='Mon, 04 Mar 2024 18:31:11 GMT'/>
   </head>
   <Scene>
     <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
@@ -17,6 +17,7 @@
     <ProtoDeclare name='SnapTool'>
       <ProtoInterface>
         <field accessType='inputOutput' type='SFString' name='type' value='SNAP_TARGET'/>
+        <field accessType='inputOutput' type='SFBool' name='snapToCenter' value='true'/>
         <field accessType='inputOutput' type='SFVec3f' name='position'/>
         <field accessType='inputOutput' type='SFVec3f' name='normal' value='0 0 1'/>
         <field accessType='inputOutput' type='SFBool' name='snapped'/>
@@ -26,7 +27,7 @@
           <IS>
             <connect nodeField='translation' protoField='position'/>
           </IS>
-          <ScreenGroup DEF='Vector_2'>
+          <ScreenGroup DEF='Vector'>
             <Transform
                 rotation='1 0 0 1.5708'>
               <Transform DEF='Cone'
@@ -107,42 +108,42 @@ var zAxis = new SFVec3f (0, 0, 1);
 
 function initialize ()
 {
-	set_type (type, 0);
-	set_normal (normal, 0);
+   set_type (type, 0);
+   set_normal (normal, 0);
 }
 
 function set_type (value, time)
 {
-	if (snapped)
-	{
-		appearance .material = snapMaterial;
-	}
-	else
-	{
-		switch (type)
-		{
-			case "SNAP_SOURCE":
-			{
-				appearance .material = sourceMaterial;
-				break;
-			}
-			default: // "SNAP_TARGET"
-			{
-				appearance .material = targetMaterial;
-				break;
-			}
-		}
-	}
+   if (snapped)
+   {
+      appearance .material = snapMaterial;
+   }
+   else
+   {
+      switch (type)
+      {
+         case "SNAP_SOURCE":
+         {
+            appearance .material = sourceMaterial;
+            break;
+         }
+         default: // "SNAP_TARGET"
+         {
+            appearance .material = targetMaterial;
+            break;
+         }
+      }
+   }
 }
 
 function set_normal (value, time)
 {
-	tool .rotation = new SFRotation (zAxis, value);
+   tool .rotation = new SFRotation (zAxis, value);
 }
 
 function set_snapped (value, time)
 {
-	set_type (type);
+   set_type (type);
 }
 ]]>
         </Script>

package/src/Tools/SnapTool/X3DSnapNodeTool.js

@@ -3,7 +3,6 @@
 const
    X3DActiveLayerNodeTool = require ("../Layering/X3DActiveLayerNodeTool"),
    ActionKeys             = require ("../../Application/ActionKeys"),
-   X3D                    = require ("../../X3D"),
    $                      = require ("jquery");
 
 class X3DSnapNodeTool extends X3DActiveLayerNodeTool
@@ -20,33 +19,21 @@ class X3DSnapNodeTool extends X3DActiveLayerNodeTool
    {
       super .connectTool ();
 
-      X3DSnapNodeTool .addToolInterest (this, () => this .set_transform_tools ());
-
       $(this .getBrowser () .element .shadowRoot) .find ("canvas")
          .on (`mousedown.X3DSnapNodeTool${this .getId ()}`, event => this .onmousedown (event))
          .on (`mouseup.X3DSnapNodeTool${this .getId ()}`,   event => this .onmouseup   (event));
-
-      this .set_transform_tools ();
    }
 
    disconnectTool ()
    {
-      X3DSnapNodeTool .removeToolInterest (this);
-
-      $(this .getBrowser () .element .shadowRoot) .find ("canvas") .off (`.X3DSnapNodeTool${this .getId ()}`);
+      $(this .getBrowser () .element .shadowRoot) .find ("canvas")
+         .off (`.X3DSnapNodeTool${this .getId ()}`);
 
       super .disconnectTool ();
    }
 
-   set_transform_tools ()
-   {
-   }
-
    onmousedown (event, show = false)
    {
-      if ($("#secondary-toolbar .hand") .hasClass ("active"))
-         return;
-
       if (ActionKeys .value !== this .toolModifiers && !show)
          return;
 
@@ -74,6 +61,8 @@ class X3DSnapNodeTool extends X3DActiveLayerNodeTool
    {
       $(this .getBrowser () .element .shadowRoot) .find ("canvas")
          .off (`mousemove.X3DSnapNodeTool${this .getId ()}`);
+
+      this .tool .snapped = false;
    }
 
    onmousemove (event)
@@ -96,6 +85,18 @@ class X3DSnapNodeTool extends X3DActiveLayerNodeTool
 
       this .tool .position = viewMatrix .copy () .inverse () .multVecMatrix (point .copy ());
       this .tool .normal   = viewMatrix .submatrix .transpose () .multVecMatrix (normal .copy ()) .normalize ();
+
+      if (!X3DSnapNodeTool .gridNode ?._visible .getValue ())
+         return;
+
+      if (!X3DSnapNodeTool .gridNode .tool .snapping)
+         return;
+
+      const
+         gridMatrix    = X3DSnapNodeTool .gridNode .getGridMatrix (),
+         invGridMatrix = gridMatrix .copy () .inverse ();
+
+      this .tool .position = gridMatrix .multVecMatrix (X3DSnapNodeTool .gridNode .getSnapPosition (invGridMatrix .multVecMatrix (this .tool .position .getValue () .copy ()), true));
    }
 }
 

package/src/Tools/Sound/SoundTool.x3d

@@ -277,6 +277,7 @@
           <field accessType='inputOutput' type='SFBool' name='selected'/>
           <field accessType='inputOutput' type='SFBool' name='active'/>
           <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='inputOnly' type='SFTime' name='set_minBackTime'/>
           <field accessType='inputOnly' type='SFBool' name='set_minBackActive'/>
@@ -371,8 +372,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)
@@ -386,25 +387,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));
 }
 
 // minBack

package/src/Tools/TextureProjection/X3DTextureProjectorNodeTool.x3d

@@ -7,14 +7,15 @@
     <meta name='comment' content='Rise and Shine'/>
     <meta name='created' content='Fri, 01 Aug 2014 17:41:58 GMT'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.5.12, 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/TextureProjector/X3DTextureProjectorNodeTool.x3d'/>
-    <meta name='modified' content='Mon, 26 Feb 2024 14:04:08 GMT'/>
+    <meta name='modified' content='Fri, 01 Mar 2024 09:56:33 GMT'/>
   </head>
   <Scene>
     <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
     </ExternProtoDeclare>
     <ExternProtoDeclare name='TextureShader' url='"../Shaders/TextureShader.x3d"'>
+      <field accessType='inputOutput' type='SFBool' name='flipY'/>
     </ExternProtoDeclare>
     <ExternProtoDeclare name='BooleanSwitch' url='"../Grouping/BooleanSwitch.x3d"'>
       <field accessType='inputOutput' type='SFBool' name='whichChoice'/>
@@ -169,7 +170,7 @@
           <field accessType='inputOutput' type='SFBool' name='selected'/>
           <field accessType='inputOutput' type='SFVec3f' name='direction'/>
           <field accessType='inputOutput' type='SFVec3f' name='upVector'/>
-          <field accessType='inputOutput' type='SFRotation' name='rotation'/>
+          <field accessType='inputOnly' type='SFRotation' name='set_rotation'/>
           <field accessType='inputOutput' type='MFFloat' name='parallelFieldOfView'/>
           <field accessType='inputOutput' type='SFFloat' name='parallelNearDistance'/>
           <field accessType='inputOutput' type='SFFloat' name='parallelFarDistance'/>
@@ -220,6 +221,7 @@
 
 async function initialize ()
 {
+   this .getValue () .collectCloneCount = () => 0;
    textureAppearance .getValue () .collectCloneCount = () => 0;
 
    const tool = await transform .getValue () .addTool () .getToolInstance ();
@@ -262,9 +264,8 @@ function set_directionAndUpVector (i)
 
    changing [i] = true;
 
-   const rotation = new SFRotation (new SFVec3f (0, 0, 1), direction);
-
-   transform .rotation = straightenHorizon (rotation, upVector .normalize ());
+   transform .rotation = new SFRotation (new SFVec3f (0, 0, 1), direction) 
+      .straighten (upVector);
 }
 
 function set_rotation ()
@@ -281,25 +282,6 @@ function set_rotation ()
    upVector  = transform .rotation .multVec (new SFVec3f (0, 1, 0));
 }
 
-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);
-}
-
 function set_parallelFieldOfView ()
 {
    set_parallel ();
@@ -453,7 +435,18 @@ function set_perspective ()
 
 function set_texture (value)
 {
-   textureAppearance .shaders = value 
+   switch (value ?.getNodeType () .at (-1))
+   {
+      case X3DConstants .ImageTexture:
+      case X3DConstants .MovieTexture:
+         textureShader .flipY = true;
+         break;
+      case X3DConstants .PixelTexture:
+         textureShader .flipY = false;
+         break;
+   }
+
+   textureAppearance .shaders = value
       ? new MFNode (textureShader)
       : new MFNode ();
 }]]>