texture rendering issue. fixes #204

Author: andresoviedo

README.md

@@ -197,6 +197,7 @@ ChangeLog
 
 - 3.3.1 (12/09/2022)
   - (f) fixed texture issue + color issue + blending issue. fixed #214
+  - (f) fixed texture issue #204
 - 3.3.0 (23/06/2022)
   - (n) interactive object orientation
   - (n) isometric, orthographic and free camera view

app/build/outputs/apk/release/app-release.apk

@@ -1,19 +1,22 @@
 precision mediump float;
 
 // colors
-uniform vec4 vColorMask;
 varying vec4 v_Color;
+uniform vec4 vColorMask;
 
 // texture
 uniform bool u_Textured;
 uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = v_Color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = v_Color;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = v_Color * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = v_Color[3];
+    gl_FragColor[3] = color[3];
 }

engine/src/main/res/raw/shader_anim_light_texture_colors_frag

@@ -10,10 +10,13 @@ uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = v_Color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = v_Color;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = v_Color * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = v_Color[3];
+    gl_FragColor[3] = color[3];
 }

engine/src/main/res/raw/shader_anim_light_texture_frag

@@ -1,19 +1,22 @@
 precision mediump float;
 
 // colors
-uniform vec4 vColorMask;
 varying vec4 v_Color;
+uniform vec4 vColorMask;
 
 // texture
 uniform bool u_Textured;
 uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = v_Color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = v_Color;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = v_Color * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = v_Color[3];
+    gl_FragColor[3] = color[3];
 }

engine/src/main/res/raw/shader_anim_texture_colors_frag

@@ -10,10 +10,13 @@ uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = vColor * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = vColor;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = vColor * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = vColor[3];
+    gl_FragColor[3] = color[3];
 }

engine/src/main/res/raw/shader_anim_texture_frag

@@ -1,8 +1,8 @@
 precision mediump float;
 
 // colors
-uniform vec4 vColorMask;
 varying vec4 v_Color;
+uniform vec4 vColorMask;
 
 void main(){
     gl_FragColor = v_Color * vColorMask;

engine/src/main/res/raw/shader_light_colors_frag

@@ -1,19 +1,22 @@
 precision mediump float;
 
 // colors
-uniform vec4 vColorMask;
 varying vec4 v_Color;
+uniform vec4 vColorMask;
 
 // texture
 uniform bool u_Textured;
 uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = v_Color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = v_Color;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = v_Color * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = v_Color[3];
+    gl_FragColor[3] = color[3];
 }

engine/src/main/res/raw/shader_light_texture_colors_frag

@@ -10,10 +10,13 @@ uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = v_Color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = v_Color;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = v_Color * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = v_Color[3];
+    gl_FragColor[3] = color[3];
 }

engine/src/main/res/raw/shader_light_texture_frag

@@ -1,19 +1,22 @@
 precision mediump float;
 
 // colors
-uniform vec4 vColorMask;
 varying vec4 v_Color;
+uniform vec4 vColorMask;
 
 // texture
 uniform bool u_Textured;
 uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
 void main(){
-    if (u_Textured){
-        gl_FragColor = v_Color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    vec4 color = v_Color;
+    if (u_Textured && length(vec3(color)) > 0.0){
+        gl_FragColor = color * texture2D(u_Texture, v_TexCoordinate) * vColorMask;
+    } else if (u_Textured){
+        gl_FragColor = texture2D(u_Texture, v_TexCoordinate) * vColorMask;
     } else {
-        gl_FragColor = v_Color * vColorMask;
+        gl_FragColor = color * vColorMask;
     }
-    gl_FragColor[3] = v_Color[3];
+    gl_FragColor[3] = color[3];
 }