x_ite 5.0.2 → 6.0.0

package/docs/tutorials/Naming-nodes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Naming Nodes
 
 ## Motivation

package/docs/tutorials/Providing-information-about-your-world.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Providing Information About Your World
 
 ## Motivation

package/docs/tutorials/Sensing-the-viewer.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Sensing the Viewer
 
 ## Motivation

package/docs/tutorials/Sensing-viewer-actions.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Sensing Viewer Actions
 
 ## Motivation

package/docs/tutorials/Transforming-Shapes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Transforming Shapes
 
 ## Motivation

package/docs/tutorials/Writing-program-scripts-with-ECMAScript.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Writing Program Scripts with ECMAScript
 
 ## Motivation

package/docs/tutorials/index.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Tutorials
 
 ## Overview

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "x_ite",
-	"version": "5.0.2",
-	"revision": "1147",
+	"version": "6.0.0",
+	"revision": "1154",
 	"description": "X_ITE X3D Browser, a framework for integrating and manipulating X3D and VRML scenes in HTML.",
 	"main": "dist/x_ite.js",
 	"repository": {
@@ -52,11 +52,10 @@
 		"ammojs": "^0.0.2",
 		"CharLS.js": "^2.0.1",
 		"css-element-queries": "^1.2.3",
-		"dicom-parser": "^1.8.13",
-		"jpeg-js": "^0.4.3",
+		"dicom-parser": "^1.8.19",
+		"jpeg-js": "^0.4.4",
 		"jpeg-lossless-decoder-js": "^2.0.4",
-		"jquery": "^3.6.0",
-		"jquery-contextmenu": "^2.9.2",
+		"jquery": "^3.6.1",
 		"jquery-mousewheel": "^3.1.13",
 		"jquery.fullscreen": "^0.6.0",
 		"libtess": "^1.2.2",
@@ -66,7 +65,7 @@
 		"require": "^2.4.20",
 		"requirejs": "^2.3.6",
 		"requirejs-text": "^2.0.16",
-		"terser": "^5.12.1"
+		"terser": "^5.15.1"
 	},
 	"scripts": {
 		"lint": "jshint **",

package/src/assets/components/geometry2d.js

@@ -87,6 +87,6 @@ function (Components,
       abstractTypes:
       {
       },
-      browser: X3DGeometry2DContext,
+      context: X3DGeometry2DContext,
    });
 });

package/src/assets/components/key-device-sensor.js

@@ -72,6 +72,6 @@ function (Components,
       {
          X3DKeyDeviceSensorNode: X3DKeyDeviceSensorNode,
       },
-      browser: X3DKeyDeviceSensorContext,
+      context: X3DKeyDeviceSensorContext,
    });
 });

package/src/assets/components/layout.js

@@ -81,6 +81,6 @@ function (Components,
       {
          X3DLayoutNode: X3DLayoutNode,
       },
-      browser: X3DLayoutContext,
+      context: X3DLayoutContext,
    });
 });

package/src/assets/components/particle-systems.js

@@ -99,6 +99,6 @@ function (Components,
          X3DParticleEmitterNode:      X3DParticleEmitterNode,
          X3DParticlePhysicsModelNode: X3DParticlePhysicsModelNode,
       },
-      browser: X3DParticleSystemsContext,
+      context: X3DParticleSystemsContext,
    });
 });

package/src/assets/components/volume-rendering.js

@@ -113,6 +113,6 @@ function (Components,
          X3DVolumeDataNode:                  X3DVolumeDataNode,
          X3DVolumeRenderStyleNode:           X3DVolumeRenderStyleNode,
       },
-      browser: X3DVolumeRenderingContext,
+      context: X3DVolumeRenderingContext,
    });
 });

package/src/assets/shaders/Types.glsl

@@ -45,6 +45,7 @@ struct x3d_LinePropertiesParameters
 {
    bool          applied;
    mediump float linewidthScaleFactor;
+   mediump float lineStippleScale;
    sampler2D     linetype;
 };
 
@@ -270,12 +271,3 @@ struct x3d_TextureCoordinateGeneratorParameters
 };
 
 //uniform x3d_TextureCoordinateGeneratorParameters x3d_TextureCoordinateGenerator [x3d_MaxTextures];
-
-struct x3d_ParticleParameters
-{
-   mediump int   id;
-   mediump int   life;
-   mediump float elapsedTime;
-};
-
-//uniform x3d_ParticleParameters x3d_Particle;

package/src/assets/shaders/webgl1/Line.fs

@@ -10,14 +10,9 @@ uniform float x3d_AlphaCutoff;
 uniform x3d_LinePropertiesParameters x3d_LineProperties;
 uniform ivec4 x3d_Viewport;
 
-varying float fogDepth; // fog depth
-varying vec4  color;    // color
-varying vec3  vertex;   // point on geometry
-
-#ifdef X_ITE
-varying vec3 startPosition;  // line stipple start
-varying vec3 vertexPosition; // current line stipple position
-#endif
+varying float fogDepth;    // fog depth
+varying vec4  color;       // color
+varying vec3  vertex;      // point on geometry
 
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
 uniform float x3d_LogarithmicFarFactor1_2;
@@ -27,31 +22,11 @@ varying float depth;
 #pragma X3D include "include/Fog.glsl"
 #pragma X3D include "include/ClipPlanes.glsl"
 
-#ifdef X_ITE
-void
-stipple ()
-{
-   if (x3d_LineProperties .applied)
-   {
-      vec2  direction = (vertexPosition .xy - startPosition .xy) * vec2 (x3d_Viewport .zw) * 0.5;
-      float distance  = length (direction) / 16.0;
-      float color     = texture2D (x3d_LineProperties .linetype, vec2 (distance, distance)) .a;
-
-      if (color == 0.0)
-         discard;
-   }
-}
-#endif
-
 void
 main ()
 {
    clip ();
 
-   #ifdef X_ITE
-   stipple ();
-   #endif
-
    vec4 finalColor = vec4 (0.0);
 
    finalColor .rgb = getFogColor (color .rgb);

package/src/assets/shaders/webgl1/Line.vs

@@ -12,15 +12,9 @@ attribute float x3d_FogDepth;
 attribute vec4  x3d_Color;
 attribute vec4  x3d_Vertex;
 
-varying float fogDepth; // fog depth
-varying vec4  color;    // color
-varying vec3  vertex;   // point on geometry
-
-#ifdef X_ITE
-attribute vec4 x3d_TexCoord0;
-varying   vec3 startPosition;  // line stipple start
-varying   vec3 vertexPosition; // current line stipple position
-#endif
+varying float fogDepth;    // fog depth
+varying vec4  color;       // color
+varying vec3  vertex;      // point on geometry
 
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
 varying float depth;
@@ -31,19 +25,11 @@ main ()
 {
    vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
 
-   fogDepth = x3d_FogDepth;
-   vertex   = position .xyz;
+   fogDepth    = x3d_FogDepth;
+   vertex      = position .xyz;
 
    gl_Position = x3d_ProjectionMatrix * position;
 
-   #ifdef X_ITE
-   // Line Stipple
-   vec4 start = x3d_ProjectionMatrix * x3d_ModelViewMatrix * x3d_TexCoord0;
-
-   startPosition  = start .xyz / start .w;
-   vertexPosition = gl_Position .xyz / gl_Position .w;
-   #endif
-
    #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
    depth = 1.0 + gl_Position .w;
    #endif

package/src/assets/shaders/webgl1/PBR.vs

@@ -31,7 +31,7 @@ main ()
    vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
 
    vertex      = position .xyz;
-   normal      = normalize (x3d_NormalMatrix * x3d_Normal);
+   normal      = x3d_NormalMatrix * x3d_Normal;
    texCoord0   = x3d_TexCoord0;
    texCoord1   = x3d_TexCoord1;
    color       = x3d_Color;

package/src/assets/shaders/webgl1/Point.vs

@@ -6,7 +6,6 @@ uniform x3d_PointPropertiesParameters x3d_PointProperties;
 
 uniform bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 uniform x3d_UnlitMaterialParameters x3d_Material;
-uniform int x3d_NumTextures;
 
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -48,10 +47,10 @@ main ()
    float dL                   = length (vertex);
 
    pointSize  = x3d_PointProperties .pointSizeScaleFactor;
-   pointSize *= 1.0 / (pointSizeAttenuation [0] + pointSizeAttenuation [1] * dL + pointSizeAttenuation [2] * (dL * dL));
+   pointSize /= pointSizeAttenuation [0] + pointSizeAttenuation [1] * dL + pointSizeAttenuation [2] * (dL * dL);
    pointSize  = clamp (pointSize, pointSizeMinValue, pointSizeMaxValue);
 
-   gl_PointSize = pointSize > 1.0 && x3d_NumTextures == 0 ? pointSize + 1.0 : pointSize;
+   gl_PointSize = pointSize > 1.0 ? pointSize + 1.0 : pointSize;
 
    // Determine color.
 

package/src/assets/shaders/webgl2/Depth.vs

@@ -2,6 +2,7 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -10,10 +11,12 @@ in vec4 x3d_Vertex;
 
 out vec3 vertex; // point on geometry
 
+#pragma X3D include "include/Particle.glsl"
+
 void
 main ()
 {
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
    vertex = position .xyz;
 

package/src/assets/shaders/webgl2/Gouraud.vs

@@ -2,6 +2,7 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
@@ -46,6 +47,7 @@ out vec4  texCoord1;   // texCoord1
 out float depth;
 #endif
 
+#pragma X3D include "include/Particle.glsl"
 #pragma X3D include "include/SpotFactor.glsl"
 
 vec4
@@ -106,7 +108,7 @@ getMaterialColor (const in vec3 N,
 void
 main ()
 {
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
    fogDepth    = x3d_FogDepth;
    vertex      = position .xyz;
@@ -115,11 +117,11 @@ main ()
    localVertex = x3d_Vertex .xyz;
 
    #if x3d_MaxTextures > 0
-   texCoord0 = x3d_TexCoord0;
+   texCoord0 = getTexCoord (x3d_TexCoord0);
    #endif
 
    #if x3d_MaxTextures > 1
-   texCoord1 = x3d_TexCoord1;
+   texCoord1 = getTexCoord (x3d_TexCoord1);
    #endif
 
    gl_Position = x3d_ProjectionMatrix * position;

package/src/assets/shaders/webgl2/Line.fs

@@ -7,14 +7,12 @@ uniform float x3d_AlphaCutoff;
 uniform x3d_LinePropertiesParameters x3d_LineProperties;
 uniform ivec4 x3d_Viewport;
 
-in float fogDepth; // fog depth
-in vec4  color;    // color
-in vec3  vertex;   // point on geometry
-
-#ifdef X_ITE
-in vec3 startPosition;  // line stipple start
-in vec3 vertexPosition; // current line stipple position
-#endif
+flat in float lengthSoFar; // in px, stipple support
+flat in vec2  startPoint;  // in px, stipple support
+in vec2       midPoint;    // in px, stipple support
+in float      fogDepth;    // fog depth
+in vec4       color;       // color
+in vec3       vertex;      // point on geometry
 
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
 uniform float x3d_LogarithmicFarFactor1_2;
@@ -25,31 +23,27 @@ out vec4 x3d_FragColor;
 
 #pragma X3D include "include/Fog.glsl"
 #pragma X3D include "include/ClipPlanes.glsl"
+#pragma X3D include "include/Line2.glsl"
 
-#ifdef X_ITE
 void
 stipple ()
 {
    if (x3d_LineProperties .applied)
    {
-      vec2  direction = (vertexPosition .xy - startPosition .xy) * vec2 (x3d_Viewport .zw) * 0.5;
-      float distance  = length (direction) / 16.0;
-      float color     = texture (x3d_LineProperties .linetype, vec2 (distance, distance)) .a;
+      vec2  point = closest_point (line2 (startPoint, midPoint), gl_FragCoord .xy);
+      float s     = (lengthSoFar + length (point - startPoint)) * x3d_LineProperties .lineStippleScale;
+      float alpha = texture (x3d_LineProperties .linetype, vec2 (s, 0.5)) .a;
 
-      if (color == 0.0)
+      if (alpha != 1.0)
          discard;
    }
 }
-#endif
 
 void
 main ()
 {
    clip ();
-
-   #ifdef X_ITE
    stipple ();
-   #endif
 
    vec4 finalColor = vec4 (0.0);
 

package/src/assets/shaders/webgl2/Line.vs

@@ -2,6 +2,7 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 uniform x3d_UnlitMaterialParameters x3d_Material;
@@ -10,41 +11,36 @@ uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
 
 in float x3d_FogDepth;
+in vec4  x3d_TexCoord0;
 in vec4  x3d_Color;
 in vec4  x3d_Vertex;
 
-out float fogDepth; // fog depth
-out vec4  color;    // color
-out vec3  vertex;   // point on geometry
-
-#ifdef X_ITE
-in  vec4 x3d_TexCoord0;
-out vec3 startPosition;  // line stipple start
-out vec3 vertexPosition; // current line stipple position
-#endif
+flat out float lengthSoFar; // in px, stipple support
+flat out vec2  startPoint;  // in px, stipple support
+out vec2       midPoint;    // in px, stipple support
+out float      fogDepth;    // fog depth
+out vec4       color;       // color
+out vec3       vertex;      // point on geometry
 
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
 out float depth;
 #endif
 
+#pragma X3D include "include/Particle.glsl"
+
 void
 main ()
 {
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
-   fogDepth = x3d_FogDepth;
-   vertex   = position .xyz;
+   lengthSoFar = x3d_TexCoord0 .z;
+   startPoint  = x3d_TexCoord0 .xy;
+   midPoint    = x3d_TexCoord0 .xy;
+   fogDepth    = x3d_FogDepth;
+   vertex      = position .xyz;
 
    gl_Position = x3d_ProjectionMatrix * position;
 
-   #ifdef X_ITE
-   // Line Stipple
-   vec4 start = x3d_ProjectionMatrix * x3d_ModelViewMatrix * x3d_TexCoord0;
-
-   startPosition  = start .xyz / start .w;
-   vertexPosition = gl_Position .xyz / gl_Position .w;
-   #endif
-
    #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
    depth = 1.0 + gl_Position .w;
    #endif

package/src/assets/shaders/webgl2/LineTransform.fs

@@ -0,0 +1,6 @@
+#version 300 es
+
+precision highp float;
+
+void
+main () { }

package/src/assets/shaders/webgl2/LineTransform.vs

@@ -0,0 +1,77 @@
+#version 300 es
+
+precision highp float;
+
+uniform vec4  viewport;
+uniform mat4  modelViewProjectionMatrix;
+uniform mat4  invModelViewProjectionMatrix;
+uniform float scale;
+
+in float x3d_FogDepth0; in vec4 x3d_Color0; in vec4 x3d_TexCoord0; in vec4 x3d_Vertex0;
+in float x3d_FogDepth1; in vec4 x3d_Color1; in vec4 x3d_TexCoord1; in vec4 x3d_Vertex1;
+
+out float fogDepth0; out vec4 color0; out vec4 texCoord0; out vec4 vertex0;
+out float fogDepth1; out vec4 color1; out vec4 texCoord1; out vec4 vertex1;
+out float fogDepth2; out vec4 color2; out vec4 texCoord2; out vec4 vertex2;
+
+vec3
+projectPoint (const in vec4 point, const in mat4 modelViewProjectionMatrix, const in vec4 viewport)
+{
+   vec4 vin = modelViewProjectionMatrix * point;
+
+   vin .xyz = vin .xyz / (2.0 * vin .w) + 0.5;
+
+   return vec3 (vin .xy * viewport .zw + viewport .xy, vin .z);
+}
+
+vec4
+unProjectPoint (const in vec3 win, const in mat4 invModelViewProjection, const in vec4 viewport)
+{
+   vec4 vin = vec4 ((win .xy - viewport .xy) / viewport .zw * 2.0 - 1.0, 2.0 * win .z - 1.0, 1.0);
+
+   vin = invModelViewProjection * vin;
+
+   return vec4 (vin .xyz / vin .w, 1.0);
+}
+
+void
+main ()
+{
+   vec3 projected0 = projectPoint (x3d_Vertex0, modelViewProjectionMatrix, viewport);
+   vec3 projected1 = projectPoint (x3d_Vertex1, modelViewProjectionMatrix, viewport);
+   vec2 normal     = normalize (projected1 .xy - projected0 .xy);
+   vec2 offset     = vec2 (-normal .y, normal .x) * scale;
+
+   // 0 - 3
+   // | \ |
+   // 1 - 2
+
+   if (gl_InstanceID == 0)
+   {
+      vec2 pq0 = projected0 .xy + offset;
+      vec2 pq1 = projected0 .xy - offset;
+      vec2 pq2 = projected1 .xy - offset;
+
+      vec4 p0 = unProjectPoint (vec3 (pq0 .xy, projected0 .z), invModelViewProjectionMatrix, viewport);
+      vec4 p1 = unProjectPoint (vec3 (pq1 .xy, projected0 .z), invModelViewProjectionMatrix, viewport);
+      vec4 p2 = unProjectPoint (vec3 (pq2 .xy, projected1 .z), invModelViewProjectionMatrix, viewport);
+
+      fogDepth0 = x3d_FogDepth0; color0 = x3d_Color0; texCoord0 = x3d_TexCoord0; vertex0 = p0;
+      fogDepth1 = x3d_FogDepth0; color1 = x3d_Color0; texCoord1 = x3d_TexCoord0; vertex1 = p1;
+      fogDepth2 = x3d_FogDepth1; color2 = x3d_Color1; texCoord2 = x3d_TexCoord1; vertex2 = p2;
+   }
+   else
+   {
+      vec2 pq0 = projected0 .xy + offset;
+      vec2 pq2 = projected1 .xy - offset;
+      vec2 pq3 = projected1 .xy + offset;
+
+      vec4 p0 = unProjectPoint (vec3 (pq0 .xy, projected0 .z), invModelViewProjectionMatrix, viewport);
+      vec4 p2 = unProjectPoint (vec3 (pq2 .xy, projected1 .z), invModelViewProjectionMatrix, viewport);
+      vec4 p3 = unProjectPoint (vec3 (pq3 .xy, projected1 .z), invModelViewProjectionMatrix, viewport);
+
+      fogDepth0 = x3d_FogDepth0; color0 = x3d_Color0; texCoord0 = x3d_TexCoord0; vertex0 = p0;
+      fogDepth1 = x3d_FogDepth1; color1 = x3d_Color1; texCoord1 = x3d_TexCoord1; vertex1 = p2;
+      fogDepth2 = x3d_FogDepth1; color2 = x3d_Color1; texCoord2 = x3d_TexCoord1; vertex2 = p3;
+   }
+}

package/src/assets/shaders/webgl2/PBR.vs

@@ -4,16 +4,17 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
 uniform mat3 x3d_NormalMatrix;
 
-in vec4 x3d_Vertex;
-in vec3 x3d_Normal;
+in vec4 x3d_Color;
 in vec4 x3d_TexCoord0;
 in vec4 x3d_TexCoord1;
-in vec4 x3d_Color;
+in vec3 x3d_Normal;
+in vec4 x3d_Vertex;
 
 out vec3 vertex;
 out vec3 normal;
@@ -27,15 +28,17 @@ out vec3 localVertex; // point on geometry in local coordinates
 out float depth;
 #endif
 
+#pragma X3D include "include/Particle.glsl"
+
 void
 main ()
 {
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
    vertex      = position .xyz;
-   normal      = normalize (x3d_NormalMatrix * x3d_Normal);
-   texCoord0   = x3d_TexCoord0;
-   texCoord1   = x3d_TexCoord1;
+   normal      = x3d_NormalMatrix * x3d_Normal;
+   texCoord0   = getTexCoord (x3d_TexCoord0);
+   texCoord1   = getTexCoord (x3d_TexCoord1);
    color       = x3d_Color;
    localNormal = x3d_Normal;
    localVertex = x3d_Vertex .xyz;