#61 shader refactoring

Author: andresoviedo

README.md

@@ -164,7 +164,7 @@ You may need one of this glasses to view models in 3D virtual reality.
 Documentation
 =============
 
-https://github.com/the3deers/android-3D-model-viewer/wiki
+Working on it...
 
 
 Acknowledgement
@@ -204,12 +204,12 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
-- 3.4.1 (20/09/2022)
-  - (f) bug fixing: lighting, textures, etc
-  - (i) texture loading refactoring
-  - (i) shader refactoring
+- 3.4.1 (23/09/2022)
+  - (f) bug fixing: lighting, textures, etc #176
+  - (i) texture loading refactoring #61
+  - (i) shader refactoring & deduplication #61
 - 3.4.0 (17/09/2022)
-  - (n) GLTF basic support
+  - (n) GLTF basic support #176
 - 3.3.1 (12/09/2022)
   - (f) fixed texture issue + color issue + blending issue. fixed #214
   - (f) fixed texture issue #204

engine/src/main/java/org/andresoviedo/android_3d_model_engine/camera/IsometricCamera.java

@@ -155,10 +155,10 @@ private void rotateWithMatrix(float[] cross) {
         final float[] cross2 = Math3DUtils.crossProduct(posN, cross);
         final double dot = Math3DUtils.dotProduct(axis, cross2);
 
-        Log.v("IsometricCamera", "rotateWithMatrix. dot: " + dot
+        /*Log.v("IsometricCamera", "rotateWithMatrix. dot: " + dot
                 + ", axis: " + Arrays.toString(axis)
                 + ", cross: " + Arrays.toString(cross)
-                + ", angle: " + Math3DUtils.calculateAngleBetween(axis, cross));
+                + ", angle: " + Math3DUtils.calculateAngleBetween(axis, cross));*/
         final double angle = Math.signum(dot) * Math.PI / 2;
 
         final float[] rotMatrix = new float[16];
@@ -177,7 +177,7 @@ private void rotateWithMatrix(float[] cross) {
 
         saveAndAnimate(newPos[0], newPos[1], newPos[2], newUp[0], newUp[1], newUp[2]);
 
-        Log.v("IsometricCamera", "Rotating... action: " + delegate.getAnimation());
+        //Log.v("IsometricCamera", "Rotating... action: " + delegate.getAnimation());
     }
 
     private void saveAndAnimate(float xp, float yp, float zp, float xu, float yu, float zu) {

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

@@ -44,7 +44,7 @@ class GLES20Renderer implements Renderer {
     private static final int TEXTURE_COORDS_PER_VERTEX = 2;
     private static final int COLOR_COORDS_PER_VERTEX = 4;
 
-    private final static float[] DEFAULT_COLOR = {1.0f, 1.0f, 1.0f, 1.0f};
+    private final static float[] DEFAULT_COLOR = {0.0f, 1.0f, 1.0f, 1.0f};
     private final static float[] NO_COLOR_MASK = {1.0f, 1.0f, 1.0f, 1.0f};
 
     // specification
@@ -75,6 +75,10 @@ class GLES20Renderer implements Renderer {
      */
     private static Map<Object, Object> flags = new HashMap<>();
 
+    private boolean texturesEnabled = true;
+    private boolean lightingEnabled = true;
+    private boolean animationEnabled = true;
+
     static GLES20Renderer getInstance(String id, String vertexShaderCode, String fragmentShaderCode) {
         Set<String> shaderFeatures = new HashSet<>();
         testShaderFeature(shaderFeatures, vertexShaderCode, "u_MMatrix");
@@ -83,6 +87,7 @@ static GLES20Renderer getInstance(String id, String vertexShaderCode, String fra
         testShaderFeature(shaderFeatures, vertexShaderCode, "a_Color");
         testShaderFeature(shaderFeatures, vertexShaderCode, "a_TexCoordinate");
         testShaderFeature(shaderFeatures, vertexShaderCode, "u_LightPos");
+        testShaderFeature(shaderFeatures, fragmentShaderCode, "u_LightPos");
         testShaderFeature(shaderFeatures, vertexShaderCode, "in_jointIndices");
         testShaderFeature(shaderFeatures, vertexShaderCode, "in_weights");
         testShaderFeature(shaderFeatures, fragmentShaderCode, "u_TextureCube");
@@ -112,6 +117,18 @@ private GLES20Renderer(String id, String vertexShaderCode, String fragmentShader
         Log.d("GLES20Renderer", "Compiled 3D Drawer (" + id + ") with id " + mProgram);
     }
 
+    public void setTexturesEnabled(boolean texturesEnabled) {
+        this.texturesEnabled = texturesEnabled;
+    }
+
+    public void setLightingEnabled(boolean lightingEnabled) {
+        this.lightingEnabled = lightingEnabled;
+    }
+
+    public void setAnimationEnabled(boolean animationEnabled) {
+        this.animationEnabled = animationEnabled;
+    }
+
     @Override
     public void draw(Object3DData obj, float[] pMatrix, float[] vMatrix, int textureId, float[] lightPosInWorldSpace, float[] colorMask, float[] cameraPos, int drawMode, int drawSize) {
 
@@ -128,6 +145,8 @@ public void draw(Object3DData obj, float[] pMatrix, float[] vMatrix, int texture
             return;
         }
 
+        //setFeatureFlag("u_Debug",false);
+
         // mvp matrix for position + lighting + animation
         if(supportsMMatrix()) {
             setUniformMatrix4(obj.getModelMatrix(), "u_MMatrix");
@@ -146,8 +165,12 @@ public void draw(Object3DData obj, float[] pMatrix, float[] vMatrix, int texture
 
         // pass in color or colors array
         int mColorHandle = -1;
-        if (supportsColors()) {
-            mColorHandle = setVBO("a_Color", obj.getColorsBuffer(), COLOR_COORDS_PER_VERTEX);
+        if (supportsColors()){
+            setFeatureFlag("u_Coloured",false);
+            if (obj.getColorsBuffer() != null) {
+                mColorHandle = setVBO("a_Color", obj.getColorsBuffer(), COLOR_COORDS_PER_VERTEX);
+                setFeatureFlag("u_Coloured", true);
+            }
         } else {
             setUniform4(obj.getColor() != null? obj.getColor() : DEFAULT_COLOR,"vColor");
         }
@@ -158,8 +181,9 @@ public void draw(Object3DData obj, float[] pMatrix, float[] vMatrix, int texture
         // pass in texture UV buffer
         int mTextureHandle = -1;
         if (supportsTextures()) {
-
-            setFeatureFlag("u_Textured", false);
+            setFeatureFlag("u_Textured", texturesEnabled);
+        }
+        if (supportsTextures() && obj.getTextureBuffer() != null) {
 
             // load color map
             if (obj.getMaterial().getTextureId() == -1 &&
@@ -238,19 +262,25 @@ public void draw(Object3DData obj, float[] pMatrix, float[] vMatrix, int texture
         }
 
         // pass in light position for lighting
-        if (lightPosInWorldSpace != null && supportsLighting()) {
+        if (supportsLighting()) {
+            boolean toggle = lightingEnabled && obj.getNormalsBuffer() != null;
+            setFeatureFlag("u_Lighted", toggle);
             setUniform3(lightPosInWorldSpace,"u_LightPos");
             setUniform3(cameraPos,"u_cameraPos");
         }
 
         // pass in joint transformation for animated model
         int in_weightsHandle = -1;
         int in_jointIndicesHandle = -1;
-        if (supportsJoints() && obj instanceof AnimatedModel) {
-            in_weightsHandle = setVBO("in_weights", ((AnimatedModel) obj).getVertexWeights(), COORDS_PER_VERTEX);
-            in_jointIndicesHandle = setVBO("in_jointIndices", ((AnimatedModel) obj).getJointIds(), COORDS_PER_VERTEX);
-            setUniformMatrix4(((AnimatedModel) obj).getBindShapeMatrix(), "u_BindShapeMatrix");
-            setJointTransforms((AnimatedModel) obj);
+        if (supportsJoints()){
+            boolean toggle = this.animationEnabled && obj instanceof AnimatedModel;
+            if(toggle) {
+                in_weightsHandle = setVBO("in_weights", ((AnimatedModel) obj).getVertexWeights(), COORDS_PER_VERTEX);
+                in_jointIndicesHandle = setVBO("in_jointIndices", ((AnimatedModel) obj).getJointIds(), COORDS_PER_VERTEX);
+                setUniformMatrix4(((AnimatedModel) obj).getBindShapeMatrix(), "u_BindShapeMatrix");
+                setJointTransforms((AnimatedModel) obj);
+            }
+            setFeatureFlag("u_Animated", toggle);
         }
 
         // draw mesh
@@ -537,16 +567,28 @@ private void drawObjectElement(Object3DData obj, int drawMode, int drawBufferTyp
             Log.v("GLES20Renderer", "Rendering element " + i + "....  " + element);
         }
 
+        if (element.getMaterial() != null && element.getMaterial().getColor() != null){
+            setUniform4(element.getMaterial().getColor(), "vColor");
+        } else if (obj.getColor() != null){
+            setUniform4(obj.getColor(), "vColor");
+        } else {
+            setUniform4(DEFAULT_COLOR, "vColor");
+        }
+
+        // default is no textured
+        if (supportsColors()){
+            setFeatureFlag("u_Coloured", obj.getColorsBuffer() != null);
+        }
+
         // default is no textured
         if (supportsTextures()){
-            setFeatureFlag("u_Textured", false);
+            setFeatureFlag("u_Textured", obj.getTextureBuffer() != null
+                    && element.getMaterial() != null && element.getMaterial().getTextureId() != -1
+                    && texturesEnabled);
         }
 
         if (element.getMaterial() != null) {
-            if (!supportsColors()) {
-                setUniform4(element.getMaterial().getColor() != null ? element.getMaterial().getColor() :
-                        obj.getColor() != null ? obj.getColor() : DEFAULT_COLOR, "vColor");
-            }
+
             // load color map
             if (element.getMaterial().getTextureId() == -1 &&
                     element.getMaterial().getColorTexture() != null){
@@ -600,17 +642,17 @@ private void drawObjectElement(Object3DData obj, int drawMode, int drawBufferTyp
             }
             if (element.getMaterial().getTextureId() != -1 && supportsTextures()) {
                 setTexture(element.getMaterial().getTextureId(), "u_Texture", 0);
-                setFeatureFlag("u_Textured",true);
+                setFeatureFlag("u_Textured",texturesEnabled);
             }
 
             if (element.getMaterial().getNormalTextureId() != -1 && supportsTextures()) {
                 setTexture(element.getMaterial().getNormalTextureId(), "u_NormalTexture", 1);
-                setFeatureFlag("u_NormalTextured",true);
+                setFeatureFlag("u_NormalTextured",texturesEnabled);
             }
 
             if (element.getMaterial().getEmissiveTextureId() != -1 && supportsTextures()){
                 setTexture(element.getMaterial().getEmissiveTextureId(), "u_EmissiveTexture", 2);
-                setFeatureFlag("u_EmissiveTextured", true);
+                setFeatureFlag("u_EmissiveTextured", texturesEnabled);
             }
         }