x_ite 5.0.3 → 6.1.0

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

@@ -2,8 +2,8 @@
 precision highp float;
 precision highp int;
 
-uniform bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 uniform x3d_UnlitMaterialParameters x3d_Material;
+uniform bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -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.fs

@@ -10,8 +10,8 @@ precision highp float;
 precision highp int;
 
 uniform int   x3d_GeometryType;
-uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 uniform float x3d_AlphaCutoff;
+uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 uniform int x3d_NumLights;
 uniform x3d_LightSourceParameters x3d_LightSource [x3d_MaxLights];
@@ -59,7 +59,7 @@ getBaseColor ()
    // Get texture color.
 
    #if defined(X3D_BASE_TEXTURE) && !defined(X3D_BASE_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_BaseTexture .textureTransformMapping, x3d_BaseTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_BaseTexture .textureTransformMapping, x3d_BaseTexture .textureCoordinateMapping);
       #if defined(X3D_BASE_TEXTURE_2D)
          return baseParameter * SRGBtoLINEAR (texture2D (x3d_BaseTexture .texture2D, texCoord .st));
       #elif defined(X3D_BASE_TEXTURE_CUBE)
@@ -80,7 +80,7 @@ getEmissiveColor ()
    // Get texture color.
 
    #if defined(X3D_EMISSIVE_TEXTURE) && !defined(X3D_EMISSIVE_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
 
       #if defined(X3D_EMISSIVE_TEXTURE_2D)
          return emissiveParameter * SRGBtoLINEAR (texture2D (x3d_EmissiveTexture .texture2D, texCoord .st)) .rgb;
@@ -104,7 +104,7 @@ getMetallicRoughness ()
    // Get texture color.
 
    #if defined(X3D_METALLIC_ROUGHNESS_TEXTURE) && !defined(X3D_METALLIC_ROUGHNESS_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_MetallicRoughnessTexture .textureTransformMapping, x3d_MetallicRoughnessTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_MetallicRoughnessTexture .textureTransformMapping, x3d_MetallicRoughnessTexture .textureCoordinateMapping);
       // Roughness is stored in the 'g' channel, metallic is stored in the 'b' channel.
       // This layout intentionally reserves the 'r' channel for (optional) occlusion map data
       #if defined(X3D_METALLIC_ROUGHNESS_TEXTURE_2D)
@@ -127,7 +127,7 @@ getOcclusionFactor ()
    // Get texture color.
 
    #if defined(X3D_OCCLUSION_TEXTURE) && !defined(X3D_OCCLUSION_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_OcclusionTexture .textureTransformMapping, x3d_OcclusionTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_OcclusionTexture .textureTransformMapping, x3d_OcclusionTexture .textureCoordinateMapping);
 
       #if defined(X3D_OCCLUSION_TEXTURE_2D)
          return texture2D (x3d_OcclusionTexture .texture2D, texCoord .st) .r;
@@ -325,7 +325,7 @@ main ()
          float G = geometricOcclusion (pbrInputs);
          float D = microfacetDistribution (pbrInputs);
 
-         float attenuationFactor     = di ? 1.0 : 1.0 / max (c [0] + c [1] * dL + c [2] * (dL * dL), 1.0);
+         float attenuationFactor     = di ? 1.0 : 1.0 / max (dot (c, vec3 (1.0, dL, dL * dL)), 1.0);
          float spotFactor            = light .type == x3d_SpotLight ? getSpotFactor (light .cutOffAngle, light .beamWidth, L, d) : 1.0;
          float attenuationSpotFactor = attenuationFactor * spotFactor;
 

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/Phong.fs

@@ -8,8 +8,8 @@ precision highp float;
 precision highp int;
 
 uniform int   x3d_GeometryType;
-uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 uniform float x3d_AlphaCutoff;
+uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 uniform int x3d_NumLights;
 uniform x3d_LightSourceParameters x3d_LightSource [x3d_MaxLights];
@@ -62,7 +62,7 @@ getAmbientColor (in vec3 diffuseColor)
    // Get texture color.
 
    #if defined(X3D_AMBIENT_TEXTURE) && !defined(X3D_AMBIENT_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_AmbientTexture .textureTransformMapping, x3d_AmbientTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_AmbientTexture .textureTransformMapping, x3d_AmbientTexture .textureCoordinateMapping);
 
       #if defined(X3D_AMBIENT_TEXTURE_2D)
          return ambientParameter * texture2D (x3d_AmbientTexture .texture2D, texCoord .st) .rgb;
@@ -85,12 +85,12 @@ getDiffuseColor ()
    // Get texture color.
 
    #if defined(X3D_DIFFUSE_TEXTURE) && !defined(X3D_DIFFUSE_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_DiffuseTexture .textureTransformMapping, x3d_DiffuseTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_DiffuseTexture .textureTransformMapping, x3d_DiffuseTexture .textureCoordinateMapping);
 
       #if defined(X3D_DIFFUSE_TEXTURE_2D)
-         return diffuseParameter * texture2D (x3d_DiffuseTexture .texture2D, texCoord .st) .rgba;
+         return diffuseParameter * texture2D (x3d_DiffuseTexture .texture2D, texCoord .st);
       #elif defined(X3D_DIFFUSE_TEXTURE_CUBE)
-         return diffuseParameter * textureCube (x3d_DiffuseTexture .textureCube, texCoord .stp) .rgba;
+         return diffuseParameter * textureCube (x3d_DiffuseTexture .textureCube, texCoord .stp);
       #endif
    #else
       return getTextureColor (diffuseParameter, vec4 (x3d_Material .specularColor, alpha));
@@ -107,7 +107,7 @@ getSpecularColor ()
    // Get texture color.
 
    #if defined(X3D_SPECULAR_TEXTURE) && !defined(X3D_SPECULAR_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_SpecularTexture .textureTransformMapping, x3d_SpecularTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_SpecularTexture .textureTransformMapping, x3d_SpecularTexture .textureCoordinateMapping);
 
       #if defined(X3D_SPECULAR_TEXTURE_2D)
          return specularParameter * texture2D (x3d_SpecularTexture .texture2D, texCoord .st) .rgb;
@@ -129,7 +129,7 @@ getEmissiveColor ()
    // Get texture color.
 
    #if defined(X3D_EMISSIVE_TEXTURE) && !defined(X3D_EMISSIVE_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
 
       #if defined(X3D_EMISSIVE_TEXTURE_2D)
          return emissiveParameter * texture2D (x3d_EmissiveTexture .texture2D, texCoord .st) .rgb;
@@ -151,7 +151,7 @@ getShininessFactor ()
    // Get texture color.
 
    #if defined(X3D_SHININESS_TEXTURE) && !defined(X3D_SHININESS_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_ShininessTexture .textureTransformMapping, x3d_ShininessTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_ShininessTexture .textureTransformMapping, x3d_ShininessTexture .textureCoordinateMapping);
 
       #if defined(X3D_SHININESS_TEXTURE_2D)
          return shininess * texture2D (x3d_ShininessTexture .texture2D, texCoord .st) .a * 128.0;
@@ -169,7 +169,7 @@ getOcclusionFactor ()
    // Get texture color.
 
    #if defined(X3D_OCCLUSION_TEXTURE) && !defined(X3D_OCCLUSION_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_OcclusionTexture .textureTransformMapping, x3d_OcclusionTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_OcclusionTexture .textureTransformMapping, x3d_OcclusionTexture .textureCoordinateMapping);
 
       #if defined(X3D_OCCLUSION_TEXTURE_2D)
          return texture2D (x3d_OcclusionTexture .texture2D, texCoord .st) .r;
@@ -230,7 +230,7 @@ getMaterialColor ()
          float specularFactor = shininessFactor > 0.0 ? pow (max (dot (N, H), 0.0), shininessFactor) : 1.0;
          vec3  specularTerm   = specularColor * specularFactor;
 
-         float attenuationFactor     = di ? 1.0 : 1.0 / max (c [0] + c [1] * dL + c [2] * (dL * dL), 1.0);
+         float attenuationFactor     = di ? 1.0 : 1.0 / max (dot (c, vec3 (1.0, dL, dL * dL)), 1.0);
          float spotFactor            = light .type == x3d_SpotLight ? getSpotFactor (light .cutOffAngle, light .beamWidth, L, d) : 1.0;
          float attenuationSpotFactor = attenuationFactor * spotFactor;
          vec3  ambientTerm           = light .ambientIntensity * ambientColor;

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

@@ -4,9 +4,9 @@ precision highp int;
 
 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 bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -48,7 +48,7 @@ main ()
    float dL                   = length (vertex);
 
    pointSize  = x3d_PointProperties .pointSizeScaleFactor;
-   pointSize *= 1.0 / (pointSizeAttenuation [0] + pointSizeAttenuation [1] * dL + pointSizeAttenuation [2] * (dL * dL));
+   pointSize /= dot (pointSizeAttenuation, vec3 (1.0, dL, dL * dL));
    pointSize  = clamp (pointSize, pointSizeMinValue, pointSizeMaxValue);
 
    gl_PointSize = pointSize > 1.0 && x3d_NumTextures == 0 ? pointSize + 1.0 : pointSize;

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

@@ -7,8 +7,8 @@ precision highp float;
 precision highp int;
 
 uniform int   x3d_GeometryType;
-uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 uniform float x3d_AlphaCutoff;
+uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 uniform x3d_UnlitMaterialParameters x3d_Material;
 
@@ -52,12 +52,12 @@ getEmissiveColor ()
    // Get texture color.
 
    #if defined(X3D_EMISSIVE_TEXTURE) && !defined(X3D_EMISSIVE_TEXTURE_3D)
-      vec4 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
 
       #if defined(X3D_EMISSIVE_TEXTURE_2D)
-         return emissiveParameter * texture2D (x3d_EmissiveTexture .texture2D, texCoord .st) .rgba;
+         return emissiveParameter * texture2D (x3d_EmissiveTexture .texture2D, texCoord .st);
       #elif defined(X3D_EMISSIVE_TEXTURE_CUBE)
-         return emissiveParameter * textureCube (x3d_EmissiveTexture .textureCube, texCoord .stp) .rgba;
+         return emissiveParameter * textureCube (x3d_EmissiveTexture .textureCube, texCoord .stp);
       #endif
    #else
       return getTextureColor (emissiveParameter, vec4 (vec3 (1.0), alpha));

package/src/assets/shaders/webgl1/include/Normal.glsl

@@ -27,7 +27,7 @@ getNormalVector ()
    // Get normal vector.
 
    #if defined(X3D_NORMAL_TEXTURE) && !defined(X3D_NORMAL_TEXTURE_3D)
-      vec4 texCoord    = getTexCoord (x3d_NormalTexture .textureTransformMapping, x3d_NormalTexture .textureCoordinateMapping);
+      vec3 texCoord    = getTexCoord (x3d_NormalTexture .textureTransformMapping, x3d_NormalTexture .textureCoordinateMapping);
       vec3 normalScale = vec3 (vec2 (x3d_Material .normalScale), 1.0);
       mat3 tbn         = getTBNMatrix (texCoord .st);
 

package/src/assets/shaders/webgl1/include/Texture.glsl

@@ -134,7 +134,7 @@ getTexCoord (const in x3d_TextureCoordinateGeneratorParameters textureCoordinate
    return getTextureMatrix (textureTransformMapping) * getTexCoord (textureCoordinateMapping);
 }
 
-vec4
+vec3
 getTexCoord (const in int textureTransformMapping, const in int textureCoordinateMapping)
 {
    vec4 texCoord;
@@ -154,7 +154,7 @@ getTexCoord (const in int textureTransformMapping, const in int textureCoordinat
    if ((x3d_GeometryType == x3d_Geometry2D) && (gl_FrontFacing == false))
       texCoord .s = 1.0 - texCoord .s;
 
-   return texCoord;
+   return texCoord .stp;
 }
 
 vec4
@@ -205,14 +205,9 @@ getTextureColor (const in vec4 diffuseColor, const in vec4 specularColor)
 
       // Get texture color.
 
-      vec4 texCoord     = getTexCoord (x3d_TextureCoordinateGenerator [i], i, i);
+      vec3 texCoord     = getTexCoord (i, i);
       vec4 textureColor = vec4 (1.0);
 
-      texCoord .stp /= texCoord .q;
-
-      if ((x3d_GeometryType == x3d_Geometry2D) && (gl_FrontFacing == false))
-         texCoord .s = 1.0 - texCoord .s;
-
       if (x3d_TextureType [i] == x3d_TextureType2D)
       {
          textureColor = getTexture2D (i, texCoord .st);

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.fs

@@ -4,8 +4,8 @@ precision highp float;
 precision highp int;
 
 uniform int   x3d_GeometryType;  // true if a X3DMaterialNode is attached, otherwise false
-uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 uniform float x3d_AlphaCutoff;
+uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 in float fogDepth;    // fog depth
 in vec4  frontColor;  // color

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

@@ -2,17 +2,18 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
 
-uniform bool x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
-
 uniform int x3d_NumLights;
 uniform x3d_LightSourceParameters x3d_LightSource [x3d_MaxLights];
 uniform x3d_MaterialParameters x3d_Material;
 
+uniform bool x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
+
 in float x3d_FogDepth;
 in vec4  x3d_Color;
 in vec3  x3d_Normal;
@@ -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
@@ -88,7 +90,7 @@ getMaterialColor (const in vec3 N,
          float specularFactor = material .shininess > 0.0 ? pow (max (dot (N, H), 0.0), material .shininess * 128.0) : 1.0;
          vec3  specularTerm   = material .specularColor * specularFactor;
 
-         float attenuationFactor     = di ? 1.0 : 1.0 / max (c [0] + c [1] * dL + c [2] * (dL * dL), 1.0);
+         float attenuationFactor     = di ? 1.0 : 1.0 / max (dot (c, vec3 (1.0, dL, dL * dL)), 1.0);
          float spotFactor            = light .type == x3d_SpotLight ? getSpotFactor (light .cutOffAngle, light .beamWidth, L, d) : 1.0;
          float attenuationSpotFactor = attenuationFactor * spotFactor;
          vec3  ambientTerm           = light .ambientIntensity * ambientColor;
@@ -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,49 +2,45 @@
 
 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;
+uniform bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 
 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 direction  = normalize (projected1 .xy - projected0 .xy);
+   vec2 offset     = vec2 (-direction .y, direction .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.fs

@@ -8,8 +8,8 @@ precision highp int;
 out vec4 x3d_FragColor;
 
 uniform int   x3d_GeometryType;
-uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 uniform float x3d_AlphaCutoff;
+uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 uniform int x3d_NumLights;
 uniform x3d_LightSourceParameters x3d_LightSource [x3d_MaxLights];
@@ -57,7 +57,7 @@ getBaseColor ()
    // Get texture color.
 
    #if defined(X3D_BASE_TEXTURE)
-      vec4 texCoord = getTexCoord (x3d_BaseTexture .textureTransformMapping, x3d_BaseTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_BaseTexture .textureTransformMapping, x3d_BaseTexture .textureCoordinateMapping);
       #if defined(X3D_BASE_TEXTURE_2D)
          return baseParameter * SRGBtoLINEAR (texture (x3d_BaseTexture .texture2D, texCoord .st));
       #elif defined(X3D_BASE_TEXTURE_3D)
@@ -80,7 +80,7 @@ getEmissiveColor ()
    // Get texture color.
 
    #if defined(X3D_EMISSIVE_TEXTURE)
-      vec4 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
 
       #if defined(X3D_EMISSIVE_TEXTURE_2D)
          return emissiveParameter * SRGBtoLINEAR (texture (x3d_EmissiveTexture .texture2D, texCoord .st)) .rgb;
@@ -106,7 +106,7 @@ getMetallicRoughness ()
    // Get texture color.
 
    #if defined(X3D_METALLIC_ROUGHNESS_TEXTURE)
-      vec4 texCoord = getTexCoord (x3d_MetallicRoughnessTexture .textureTransformMapping, x3d_MetallicRoughnessTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_MetallicRoughnessTexture .textureTransformMapping, x3d_MetallicRoughnessTexture .textureCoordinateMapping);
       // Roughness is stored in the 'g' channel, metallic is stored in the 'b' channel.
       // This layout intentionally reserves the 'r' channel for (optional) occlusion map data
       #if defined(X3D_METALLIC_ROUGHNESS_TEXTURE_2D)
@@ -131,7 +131,7 @@ getOcclusionFactor ()
    // Get texture color.
 
    #if defined(X3D_OCCLUSION_TEXTURE)
-      vec4 texCoord = getTexCoord (x3d_OcclusionTexture .textureTransformMapping, x3d_OcclusionTexture .textureCoordinateMapping);
+      vec3 texCoord = getTexCoord (x3d_OcclusionTexture .textureTransformMapping, x3d_OcclusionTexture .textureCoordinateMapping);
 
       #if defined(X3D_OCCLUSION_TEXTURE_2D)
          return texture (x3d_OcclusionTexture .texture2D, texCoord .st) .r;
@@ -331,7 +331,7 @@ main ()
          float G = geometricOcclusion (pbrInputs);
          float D = microfacetDistribution (pbrInputs);
 
-         float attenuationFactor     = di ? 1.0 : 1.0 / max (c [0] + c [1] * dL + c [2] * (dL * dL), 1.0);
+         float attenuationFactor     = di ? 1.0 : 1.0 / max (dot (c, vec3 (1.0, dL, dL * dL)), 1.0);
          float spotFactor            = light .type == x3d_SpotLight ? getSpotFactor (light .cutOffAngle, light .beamWidth, L, d) : 1.0;
          float attenuationSpotFactor = attenuationFactor * spotFactor;