#61 shader refactoring

Author: andresoviedo

README.md

@@ -207,6 +207,7 @@ ChangeLog
 - 3.4.1 (20/09/2022)
   - (f) bug fixing: lighting, textures, etc
   - (i) texture loading refactoring
+  - (i) shader refactoring
 - 3.4.0 (17/09/2022)
   - (n) GLTF basic support
 - 3.3.1 (12/09/2022)

engine/src/main/java/org/andresoviedo/android_3d_model_engine/drawer/RendererFactory.java

@@ -35,7 +35,7 @@ public class RendererFactory {
      * shader code loaded from raw resources
      * resources are cached on activity thread
      */
-    private Map<String, String> shadersCode = new HashMap<>();
+    private Map<Integer, String> shadersIds = new HashMap<>();
     /**
      * list of opengl drawers
      */
@@ -51,9 +51,9 @@ public RendererFactory(Context context) throws IllegalAccessException, IOExcepti
             int shaderResId = fields[count].getInt(fields[count]);
             byte[] shaderBytes = IOUtils.read(context.getResources().openRawResource(shaderResId));
             String shaderCode = new String(shaderBytes);
-            shadersCode.put(shaderId, shaderCode);
+            shadersIds.put(shaderResId, shaderCode);
         }
-        Log.i("RendererFactory", "Shaders loaded: " + shadersCode.size());
+        Log.i("RendererFactory", "Shaders loaded: " + shadersIds.size());
     }
 
     public Renderer getDrawer(Object3DData obj, boolean usingSkyBox, boolean usingTextures, boolean usingLights, boolean usingAnimation, boolean drawColors) {
@@ -72,15 +72,10 @@ public Renderer getDrawer(Object3DData obj, boolean usingSkyBox, boolean usingTe
         if (drawer != null) return drawer;
 
         // build drawer
-        String vertexShaderCode = shadersCode.get(shader.vertexShaderCode);
-        String fragmentShaderCode = shadersCode.get(shader.fragmentShaderCode);
-        if (vertexShaderCode == null || fragmentShaderCode == null) {
-            Log.e("RendererFactory", "Shaders not found for " + shader.id);
-            return null;
-        }
+        String vertexShaderCode;
 
         // experimental: inject glPointSize
-        vertexShaderCode = vertexShaderCode.replace("void main(){", "void main(){\n\tgl_PointSize = 5.0;");
+        vertexShaderCode = shadersIds.get(shader.vertexShaderResourceId).replace("void main(){", "void main(){\n\tgl_PointSize = 5.0;");
 
         // use opengl constant to dynamically set up array size in shaders. That should be >=120
         vertexShaderCode = vertexShaderCode.replace("const int MAX_JOINTS = 60;","const int MAX_JOINTS = gl_MaxVertexUniformVectors > 60 ? 60 : gl_MaxVertexUniformVectors;");
@@ -91,7 +86,7 @@ public Renderer getDrawer(Object3DData obj, boolean usingSkyBox, boolean usingTe
         Log.v("RendererFactory", "---------- Fragment shader ----------\n");
         Log.v("RendererFactory", fragmentShaderCode);
         Log.v("RendererFactory", "-------------------------------------\n");*/
-        drawer = GLES20Renderer.getInstance(shader.id, vertexShaderCode, fragmentShaderCode);
+        drawer = GLES20Renderer.getInstance(shader.id, vertexShaderCode, shadersIds.get(shader.fragmentShaderResourceId));
 
         // cache drawer
         drawers.put(shader, drawer);

engine/src/main/java/org/andresoviedo/android_3d_model_engine/drawer/Shader.java

@@ -1,33 +1,35 @@
 package org.andresoviedo.android_3d_model_engine.drawer;
 
 
+import org.andresoviedo.android_3d_model_engine.R;
+
 public enum Shader {
 
-    SKYBOX("skybox_", "shader_skybox_vert", "shader_skybox_frag"),
-    ANIM_LIGHT_TEXTURE_COLORS("anim_light_texture_colors_", "shader_anim_light_texture_colors_vert", "shader_anim_light_texture_colors_frag"),
-    ANIM_LIGHT_TEXTURE("anim_light_texture_", "shader_anim_light_texture_vert", "shader_anim_light_texture_frag"),
-    ANIM_LIGHT_COLORS("anim_light_colors_", "shader_anim_light_colors_vert", "shader_anim_light_colors_frag"),
-    ANIM_LIGHT("anim_light_", "shader_anim_light_vert", "shader_anim_light_frag"),
-    ANIM_TEXTURE_COLORS("anim_texture_colors_", "shader_anim_texture_colors_vert", "shader_anim_texture_colors_frag"),
-    ANIM_TEXTURE("anim_texture_", "shader_anim_texture_vert", "shader_anim_texture_frag"),
-    ANIM_COLORS("anim_colors_", "shader_anim_colors_vert", "shader_anim_colors_frag"),
-    ANIM("anim_", "shader_anim_vert", "shader_anim_frag"),
-    LIGHT_TEXTURE_COLORS("light_texture_colors_", "shader_light_texture_colors_vert", "shader_light_texture_colors_frag"),
-    LIGHT_TEXTURE("light_texture_", "shader_light_texture_vert", "shader_light_texture_frag"),
-    LIGHT_COLORS("light_colors_", "shader_light_colors_vert", "shader_light_colors_frag"),
-    LIGHT("light_", "shader_light_vert", "shader_light_frag"),
-    TEXTURE_COLORS("texture_colors_", "shader_texture_colors_vert", "shader_texture_colors_frag"),
-    TEXTURE("texture_", "shader_texture_vert", "shader_texture_frag"),
-    COLORS("colors_", "shader_colors_vert", "shader_colors_frag"),
-    SHADER("default", "shader_vert", "shader_frag");
+    SKYBOX("skybox_", R.raw.shader_skybox_vert, R.raw.shader_skybox_frag),
+    ANIM_LIGHT_TEXTURE_COLORS("anim_light_texture_colors_", R.raw.shader_anim_light_texture_colors_vert, R.raw.shader_anim_light_texture_colors_frag),
+    ANIM_LIGHT_TEXTURE("anim_light_texture_", R.raw.shader_anim_light_texture_vert, R.raw.shader_anim_light_texture_frag),
+    ANIM_LIGHT_COLORS("anim_light_colors_", R.raw.shader_anim_light_colors_vert, R.raw.shader_anim_light_colors_frag),
+    ANIM_LIGHT("anim_light_", R.raw.shader_anim_light_vert, R.raw.shader_anim_light_frag),
+    ANIM_TEXTURE_COLORS("anim_texture_colors_", R.raw.shader_anim_texture_colors_vert, R.raw.shader_anim_texture_colors_frag),
+    ANIM_TEXTURE("anim_texture_", R.raw.shader_anim_texture_vert, R.raw.shader_anim_texture_frag),
+    ANIM_COLORS("anim_colors_", R.raw.shader_anim_colors_vert, R.raw.shader_anim_colors_frag),
+    ANIM("anim_", R.raw.shader_anim_vert, R.raw.shader_anim_frag),
+    LIGHT_TEXTURE_COLORS("light_texture_colors_", R.raw.shader_light_texture_colors_vert, R.raw.shader_light_texture_colors_frag),
+    LIGHT_TEXTURE("light_texture_", R.raw.shader_light_texture_vert, R.raw.shader_light_texture_frag),
+    LIGHT_COLORS("light_colors_", R.raw.shader_light_colors_vert, R.raw.shader_light_colors_frag),
+    LIGHT("light_", R.raw.shader_light_vert, R.raw.shader_light_frag),
+    TEXTURE_COLORS("texture_colors_", R.raw.shader_texture_colors_vert, R.raw.shader_texture_colors_frag),
+    TEXTURE("texture_", R.raw.shader_texture_vert, R.raw.shader_texture_frag),
+    COLORS("colors_", R.raw.shader_colors_vert, R.raw.shader_colors_frag),
+    SHADER("default", R.raw.shader_vert, R.raw.shader_frag);
 
     String id;
-    String vertexShaderCode;
-    String fragmentShaderCode;
+    int vertexShaderResourceId = -1;
+    int fragmentShaderResourceId = -1;
 
-    Shader (String id, String vertexShaderCode, String fragmentShaderCode){
+    Shader (String id, int vertexShaderCode, int fragmentShaderCode){
         this.id = id;
-        this.vertexShaderCode = vertexShaderCode;
-        this.fragmentShaderCode = fragmentShaderCode;
+        this.vertexShaderResourceId = vertexShaderCode;
+        this.fragmentShaderResourceId = fragmentShaderCode;
     }
 }

engine/src/main/res/raw/shader_anim_colors_frag

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

engine/src/main/res/raw/shader_anim_light_frag renamed to engine/src/main/res/raw/shader_anim_colors_frag.glsl

@@ -1,3 +1,5 @@
+precision highp float;
+
 const int MAX_JOINTS = 60;
 //const int MAX_WEIGHTS = 3;
 

engine/src/main/res/raw/shader_anim_colors_vert renamed to engine/src/main/res/raw/shader_anim_colors_vert.glsl

@@ -1,9 +1,11 @@
-precision mediump float;
-
-// colors
-uniform vec4 vColorMask;
-uniform vec4 vColor;
-
-void main(){
-    gl_FragColor = vColor * vColorMask;
+precision highp float;
+
+precision mediump float;
+
+// colors
+uniform vec4 vColorMask;
+uniform vec4 vColor;
+
+void main(){
+    gl_FragColor = vColor * vColorMask;
 }

engine/src/main/res/raw/shader_anim_frag renamed to engine/src/main/res/raw/shader_anim_frag.glsl

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

engine/src/main/res/raw/shader_light_colors_frag renamed to engine/src/main/res/raw/shader_anim_light_colors_frag.glsl

@@ -1,3 +1,5 @@
+precision highp float;
+
 const int MAX_JOINTS = 60;
 //const int MAX_WEIGHTS = 3;
 

engine/src/main/res/raw/shader_anim_light_colors_vert renamed to engine/src/main/res/raw/shader_anim_light_colors_vert.glsl

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