x_ite 4.7.12 → 5.0.0

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

@@ -6,7 +6,7 @@ precision highp int;
 uniform int x3d_GeometryType;
 uniform bool x3d_ColorMaterial; 
 uniform float x3d_AlphaCutoff;
-uniform x3d_MaterialParameters x3d_Material;
+uniform x3d_UnlitMaterialParameters x3d_Material;
 varying float fogDepth; 
 varying vec4 color; 
 varying vec3 normal; 
@@ -23,18 +23,19 @@ varying vec4 texCoord1;
 uniform float x3d_LogarithmicFarFactor1_2;
 varying float depth;
 #endif
+uniform mat4 x3d_TextureMatrix [x3d_MaxTextures];
 uniform int x3d_NumTextures;
 uniform int x3d_TextureType [x3d_MaxTextures]; 
 uniform sampler2D x3d_Texture2D [x3d_MaxTextures];
-uniform samplerCube x3d_CubeMapTexture [x3d_MaxTextures];
+uniform samplerCube x3d_TextureCube [x3d_MaxTextures];
 #ifdef X3D_MULTI_TEXTURING
-#define M_PI 3.14159265358979323846
 float rand (vec2 co) { return fract (sin (dot (co.xy, vec2 (12.9898,78.233))) * 43758.5453); }
 float rand (vec2 co, float l) { return rand (vec2 (rand (co), l)); }
 float rand (vec2 co, float l, float t) { return rand (vec2 (rand (co, l), t)); }
 float
 perlin (vec2 p, float dim, float time)
 {
+const float M_PI = 3.14159265358979323846;
 vec2 pos = floor (p * dim);
 vec2 posx = pos + vec2 (1.0, 0.0);
 vec2 posy = pos + vec2 (0.0, 1.0);
@@ -66,6 +67,20 @@ uniform vec3 x3d_ProjectiveTextureLocation [x3d_MaxTextures];
 uniform vec4 x3d_MultiTextureColor;
 uniform x3d_MultiTextureParameters x3d_MultiTexture [x3d_MaxTextures];
 uniform x3d_TextureCoordinateGeneratorParameters x3d_TextureCoordinateGenerator [x3d_MaxTextures];
+mat4
+getTextureMatrix (const in int i)
+{
+mat4 textureMatrix = mat4 (0.0);
+#if x3d_MaxTextures > 0
+if (i == 0)
+textureMatrix = x3d_TextureMatrix [0];
+#endif
+#if x3d_MaxTextures > 1
+else if (i == 1)
+textureMatrix = x3d_TextureMatrix [1];
+#endif
+return textureMatrix;
+}
 vec4
 getTexCoord (const in int i)
 {
@@ -81,12 +96,12 @@ texCoord = texCoord1;
 return texCoord;
 }
 vec4
-getTextureCoordinate (const in x3d_TextureCoordinateGeneratorParameters textureCoordinateGenerator, const in int i)
+getTexCoord (const in x3d_TextureCoordinateGeneratorParameters textureCoordinateGenerator, const in int textureTransformMapping, const in int textureCoordinateMapping)
 {
 int mode = textureCoordinateGenerator .mode;
 if (mode == x3d_None)
 {
-return getTexCoord (i);
+return getTextureMatrix (textureTransformMapping) * getTexCoord (textureCoordinateMapping);
 }
 else if (mode == x3d_Sphere)
 {
@@ -145,7 +160,24 @@ float eta = textureCoordinateGenerator .parameter [0];
 vec3 eye = vec3 (textureCoordinateGenerator .parameter [1], textureCoordinateGenerator .parameter [2], textureCoordinateGenerator .parameter [3]);
 return vec4 (refract (normalize (localVertex - eye), -N, eta), 1.0);
 }
-return getTexCoord (i);
+return getTextureMatrix (textureTransformMapping) * getTexCoord (textureCoordinateMapping);
+}
+vec4
+getTexCoord (const in int textureTransformMapping, const in int textureCoordinateMapping)
+{
+vec4 texCoord;
+#if x3d_MaxTextures > 0
+if (textureCoordinateMapping == 0)
+texCoord = getTexCoord (x3d_TextureCoordinateGenerator [0], textureTransformMapping, textureCoordinateMapping);
+#endif
+#if x3d_MaxTextures > 1
+else if (textureCoordinateMapping == 1)
+texCoord = getTexCoord (x3d_TextureCoordinateGenerator [1], textureTransformMapping, textureCoordinateMapping);
+#endif
+texCoord .stp /= texCoord .q;
+if ((x3d_GeometryType == x3d_Geometry2D) && (gl_FrontFacing == false))
+texCoord .s = 1.0 - texCoord .s;
+return texCoord;
 }
 vec4
 getTexture2D (const in int i, const in vec2 texCoord)
@@ -167,11 +199,11 @@ getTextureCube (const in int i, const in vec3 texCoord)
 vec4 color = vec4 (0.0);
 #if x3d_MaxTextures > 0
 if (i == 0)
-color = textureCube (x3d_CubeMapTexture [0], texCoord);
+color = textureCube (x3d_TextureCube [0], texCoord);
 #endif
 #if x3d_MaxTextures > 1
 else if (i == 1)
-color = textureCube (x3d_CubeMapTexture [1], texCoord);
+color = textureCube (x3d_TextureCube [1], texCoord);
 #endif
 return color;
 }
@@ -183,7 +215,7 @@ for (int i = 0; i < x3d_MaxTextures; ++ i)
 {
 if (i == x3d_NumTextures)
 break;
-vec4 texCoord = getTextureCoordinate (x3d_TextureCoordinateGenerator [i], i);
+vec4 texCoord = getTexCoord (x3d_TextureCoordinateGenerator [i], i, i);
 vec4 textureColor = vec4 (1.0);
 texCoord .stp /= texCoord .q;
 if ((x3d_GeometryType == x3d_Geometry2D) && (gl_FrontFacing == false))
@@ -192,7 +224,7 @@ if (x3d_TextureType [i] == x3d_TextureType2D)
 {
 textureColor = getTexture2D (i, texCoord .st);
 }
-else if (x3d_TextureType [i] == x3d_TextureTypeCubeMapTexture)
+else if (x3d_TextureType [i] == x3d_TextureTypeCube)
 {
 textureColor = getTextureCube (i, texCoord .stp);
 }
@@ -423,14 +455,19 @@ currentColor *= getProjectiveTexture (i, texCoord .st);
 }
 return currentColor;
 }
-#else
+#else 
 vec4
 getProjectiveTextureColor (in vec4 currentColor)
 {
 return currentColor;
 }
-#endif
-#else
+#endif 
+#else 
+vec4
+getTexCoord (const in int textureTransformMapping, const in int textureCoordinateMapping)
+{
+return texCoord0;
+}
 vec4
 getTextureColor (const in vec4 diffuseColor, const in vec4 specularColor)
 {
@@ -443,9 +480,9 @@ if (x3d_TextureType [0] == x3d_TextureType2D)
 {
 textureColor = texture2D (x3d_Texture2D [0], texCoord .st);
 }
-else if (x3d_TextureType [0] == x3d_TextureTypeCubeMapTexture)
+else if (x3d_TextureType [0] == x3d_TextureTypeCube)
 {
-textureColor = textureCube (x3d_CubeMapTexture [0], texCoord .stp);
+textureColor = textureCube (x3d_TextureCube [0], texCoord .stp);
 }
 return diffuseColor * textureColor;
 }
@@ -454,7 +491,7 @@ getProjectiveTextureColor (in vec4 currentColor)
 {
 return currentColor;
 }
-#endif
+#endif 
 uniform x3d_FillPropertiesParameters x3d_FillProperties;
 vec4
 getHatchColor (vec4 color)
@@ -506,11 +543,29 @@ if (dot (vertex, x3d_ClipPlane [i] .xyz) - x3d_ClipPlane [i] .w < 0.0)
 discard;
 }
 }
+#ifdef X3D_MATERIAL_TEXTURES
+uniform x3d_EmissiveTextureParameters x3d_EmissiveTexture;
+#endif
 vec4
-getMaterialColor ()
+getEmissiveColor ()
 {
 float alpha = 1.0 - x3d_Material .transparency;
-return getTextureColor (x3d_ColorMaterial ? vec4 (color .rgb, color .a * alpha) : vec4 (x3d_Material .emissiveColor, alpha), vec4 (1.0));
+vec4 emissiveParameter = x3d_ColorMaterial ? vec4 (color .rgb, color .a * alpha) : vec4 (x3d_Material .emissiveColor, alpha);
+#if defined(X3D_EMISSIVE_TEXTURE) && !defined(X3D_EMISSIVE_TEXTURE_3D)
+vec4 texCoord = getTexCoord (x3d_EmissiveTexture .textureTransformMapping, x3d_EmissiveTexture .textureCoordinateMapping);
+#if defined(X3D_EMISSIVE_TEXTURE_2D)
+return emissiveParameter * texture2D (x3d_EmissiveTexture .texture2D, texCoord .st) .rgba;
+#elif defined(X3D_EMISSIVE_TEXTURE_CUBE)
+return emissiveParameter * textureCube (x3d_EmissiveTexture .textureCube, texCoord .stp) .rgba;
+#endif
+#else
+return getTextureColor (emissiveParameter, vec4 (vec3 (1.0), alpha));
+#endif
+}
+vec4
+getMaterialColor ()
+{
+return getEmissiveColor ();
 }
 void
 main ()

package/dist/assets/shaders/webgl1/Unlit.vs

@@ -1,6 +1,5 @@
 precision highp float;
 precision highp int;
-uniform mat4 x3d_TextureMatrix [x3d_MaxTextures];
 uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -40,10 +39,10 @@ vertex = position .xyz;
 localNormal = x3d_Normal;
 localVertex = x3d_Vertex .xyz;
 #if x3d_MaxTextures > 0
-texCoord0 = x3d_TextureMatrix [0] * x3d_TexCoord0;
+texCoord0 = x3d_TexCoord0;
 #endif
 #if x3d_MaxTextures > 1
-texCoord1 = x3d_TextureMatrix [1] * x3d_TexCoord1;
+texCoord1 = x3d_TexCoord1;
 #endif
 gl_Position = x3d_ProjectionMatrix * position;
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER

package/dist/assets/shaders/webgl2/Gouraud.fs

@@ -23,19 +23,20 @@ in float depth;
 #endif
 out vec4 x3d_FragColor;
 precision highp sampler3D;
+uniform mat4 x3d_TextureMatrix [x3d_MaxTextures];
 uniform int x3d_NumTextures;
 uniform int x3d_TextureType [x3d_MaxTextures]; 
 uniform sampler2D x3d_Texture2D [x3d_MaxTextures];
 uniform sampler3D x3d_Texture3D [x3d_MaxTextures];
-uniform samplerCube x3d_CubeMapTexture [x3d_MaxTextures];
+uniform samplerCube x3d_TextureCube [x3d_MaxTextures];
 #ifdef X3D_MULTI_TEXTURING
-#define M_PI 3.14159265358979323846
 float rand (vec2 co) { return fract (sin (dot (co.xy, vec2 (12.9898,78.233))) * 43758.5453); }
 float rand (vec2 co, float l) { return rand (vec2 (rand (co), l)); }
 float rand (vec2 co, float l, float t) { return rand (vec2 (rand (co, l), t)); }
 float
 perlin (vec2 p, float dim, float time)
 {
+const float M_PI = 3.14159265358979323846;
 vec2 pos = floor (p * dim);
 vec2 posx = pos + vec2 (1.0, 0.0);
 vec2 posy = pos + vec2 (0.0, 1.0);
@@ -63,7 +64,7 @@ uniform int x3d_NumProjectiveTextures;
 uniform sampler2D x3d_ProjectiveTexture [x3d_MaxTextures];
 uniform mat4 x3d_ProjectiveTextureMatrix [x3d_MaxTextures];
 uniform vec3 x3d_ProjectiveTextureLocation [x3d_MaxTextures];
-#endif
+#endif 
 uniform vec4 x3d_MultiTextureColor;
 uniform x3d_MultiTextureParameters x3d_MultiTexture [x3d_MaxTextures];
 uniform x3d_TextureCoordinateGeneratorParameters x3d_TextureCoordinateGenerator [x3d_MaxTextures];
@@ -91,14 +92,14 @@ return vec4 (0.0);
 }
 }
 vec4
-getTextureCoordinate (const in x3d_TextureCoordinateGeneratorParameters textureCoordinateGenerator, const in int i)
+getTexCoord (const in x3d_TextureCoordinateGeneratorParameters textureCoordinateGenerator, const in int textureTransformMapping, const in int textureCoordinateMapping)
 {
 int mode = textureCoordinateGenerator .mode;
 switch (mode)
 {
 case x3d_None:
 {
-return getTexCoord (i);
+return x3d_TextureMatrix [textureTransformMapping] * getTexCoord (textureCoordinateMapping);
 }
 case x3d_Sphere:
 {
@@ -159,9 +160,18 @@ return vec4 (refract (normalize (localVertex - eye), -N, eta), 1.0);
 }
 default:
 {
-return getTexCoord (i);
+return x3d_TextureMatrix [textureTransformMapping] * getTexCoord (textureCoordinateMapping);
+}
 }
 }
+vec4
+getTexCoord (const in int textureTransformMapping, const in int textureCoordinateMapping)
+{
+vec4 texCoord = getTexCoord (x3d_TextureCoordinateGenerator [textureCoordinateMapping], textureTransformMapping, textureCoordinateMapping);
+texCoord .stp /= texCoord .q;
+if ((x3d_GeometryType == x3d_Geometry2D) && (gl_FrontFacing == false))
+texCoord .s = 1.0 - texCoord .s;
+return texCoord;
 }
 vec4
 getTexture2D (const in int i, const in vec2 texCoord)
@@ -217,13 +227,13 @@ switch (i)
 #if x3d_MaxTextures > 0
 case 0:
 {
-return texture (x3d_CubeMapTexture [0], texCoord);
+return texture (x3d_TextureCube [0], texCoord);
 }
 #endif
 #if x3d_MaxTextures > 1
 case 1:
 {
-return texture (x3d_CubeMapTexture [1], texCoord);
+return texture (x3d_TextureCube [1], texCoord);
 }
 #endif
 default:
@@ -240,11 +250,8 @@ for (int i = 0; i < x3d_MaxTextures; ++ i)
 {
 if (i == x3d_NumTextures)
 break;
-vec4 texCoord = getTextureCoordinate (x3d_TextureCoordinateGenerator [i], i);
+vec4 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;
 switch (x3d_TextureType [i])
 {
 case x3d_TextureType2D:
@@ -257,7 +264,7 @@ case x3d_TextureType3D:
 textureColor = getTexture3D (i, texCoord .stp);
 break;
 }
-case x3d_TextureTypeCubeMapTexture:
+case x3d_TextureTypeCube:
 {
 textureColor = getTextureCube (i, texCoord .stp);
 break;
@@ -558,14 +565,19 @@ currentColor *= getProjectiveTexture (i, texCoord .st);
 }
 return currentColor;
 }
-#else
+#else 
 vec4
 getProjectiveTextureColor (in vec4 currentColor)
 {
 return currentColor;
 }
-#endif
-#else
+#endif 
+#else 
+vec4
+getTexCoord (const in int textureTransformMapping, const in int textureCoordinateMapping)
+{
+return texCoord0;
+}
 vec4
 getTextureColor (const in vec4 diffuseColor, const in vec4 specularColor)
 {
@@ -586,9 +598,9 @@ case x3d_TextureType3D:
 textureColor = texture (x3d_Texture3D [0], texCoord .stp);
 break;
 }
-case x3d_TextureTypeCubeMapTexture:
+case x3d_TextureTypeCube:
 {
-textureColor = texture (x3d_CubeMapTexture [0], texCoord .stp);
+textureColor = texture (x3d_TextureCube [0], texCoord .stp);
 break;
 }
 }
@@ -599,7 +611,7 @@ getProjectiveTextureColor (in vec4 currentColor)
 {
 return currentColor;
 }
-#endif
+#endif 
 uniform x3d_FillPropertiesParameters x3d_FillProperties;
 vec4
 getHatchColor (vec4 color)

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

@@ -1,7 +1,6 @@
 #version 300 es
 precision highp float;
 precision highp int;
-uniform mat4 x3d_TextureMatrix [x3d_MaxTextures];
 uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -51,9 +50,9 @@ const in vec3 vertex,
 const in x3d_MaterialParameters material)
 {
 vec3 V = normalize (-vertex); 
-vec3 diffuseFactor = x3d_ColorMaterial ? x3d_Color .rgb : material .diffuseColor;
 float alpha = (1.0 - material .transparency) * (x3d_ColorMaterial ? x3d_Color .a : 1.0);
-vec3 ambientTerm = diffuseFactor * material .ambientIntensity;
+vec3 diffuseColor = x3d_ColorMaterial ? x3d_Color .rgb : material .diffuseColor;
+vec3 ambientColor = diffuseColor * material .ambientIntensity;
 vec3 finalColor = vec3 (0.0);
 for (int i = 0; i < x3d_MaxLights; ++ i)
 {
@@ -70,15 +69,15 @@ vec3 c = light .attenuation;
 vec3 L = di ? -d : normalize (vL); 
 vec3 H = normalize (L + V); 
 float lightAngle = max (dot (N, L), 0.0); 
-vec3 diffuseTerm = diffuseFactor * lightAngle;
+vec3 diffuseTerm = diffuseColor * lightAngle;
 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 spotFactor = light .type == x3d_SpotLight ? getSpotFactor (light .cutOffAngle, light .beamWidth, L, d) : 1.0;
 float attenuationSpotFactor = attenuationFactor * spotFactor;
-vec3 ambientColor = light .ambientIntensity * ambientTerm;
-vec3 diffuseSpecularColor = light .intensity * (diffuseTerm + specularTerm);
-finalColor += attenuationSpotFactor * light .color * (ambientColor + diffuseSpecularColor);
+vec3 ambientTerm = light .ambientIntensity * ambientColor;
+vec3 diffuseSpecularTerm = light .intensity * (diffuseTerm + specularTerm);
+finalColor += attenuationSpotFactor * light .color * (ambientTerm + diffuseSpecularTerm);
 }
 }
 finalColor += material .emissiveColor;
@@ -94,10 +93,10 @@ normal = normalize (x3d_NormalMatrix * x3d_Normal);
 localNormal = x3d_Normal;
 localVertex = x3d_Vertex .xyz;
 #if x3d_MaxTextures > 0
-texCoord0 = x3d_TextureMatrix [0] * x3d_TexCoord0;
+texCoord0 = x3d_TexCoord0;
 #endif
 #if x3d_MaxTextures > 1
-texCoord1 = x3d_TextureMatrix [1] * x3d_TexCoord1;
+texCoord1 = x3d_TexCoord1;
 #endif
 gl_Position = x3d_ProjectionMatrix * position;
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER

package/dist/assets/shaders/webgl2/{Wireframe.vs → Line.vs}

@@ -2,7 +2,7 @@
 precision highp float;
 precision highp int;
 uniform bool x3d_ColorMaterial; 
-uniform x3d_MaterialParameters x3d_Material;
+uniform x3d_UnlitMaterialParameters x3d_Material;
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
 in float x3d_FogDepth;