shadow #61 disabled

Author: andresoviedo

engine/src/main/java/org/andresoviedo/android_3d_model_engine/gui/Rotator.java

@@ -22,7 +22,7 @@ private Rotator(Widget widget) {
             final FloatBuffer vertexBuffer = IOUtils.createFloatBuffer(10 * 3);
             final FloatBuffer colorBuffer = IOUtils.createFloatBuffer(10 * 4);
             // build
-            build(vertexBuffer, colorBuffer, getMaterial().getColor(), widget_dimensions);
+            build(vertexBuffer, colorBuffer, getColor(), widget_dimensions);
             // setup
             setVertexBuffer(vertexBuffer);
             setColorsBuffer(colorBuffer);

engine/src/main/java/org/andresoviedo/android_3d_model_engine/model/Object3DData.java

@@ -144,7 +144,7 @@ protected static class ChangeEvent extends EventObject {
     // defines whether this object matrix can be changed
     private boolean readOnly;
 
-    // fixed size - not dynamic
+    // fixed place
     private boolean pinned;
 
     // defines whether the transformations are relative to it's mass center

engine/src/main/java/org/andresoviedo/android_3d_model_engine/view/ModelRenderer.java

@@ -176,7 +176,7 @@ public class ModelRenderer implements GLSurfaceView.Renderer {
     private boolean fatalException = false;
 
     // shadowing
-    private boolean doShadowing = true;
+    private boolean doShadowing = false;
     private ShadowsRenderer shadowsRenderer;
     final Object3DData plane2 = Plane2.build();
     final Object3DData plane3 = Plane2.build();
@@ -381,17 +381,15 @@ public void onDrawFrame(GL10 unused) {
                 return;
             }
 
-            // FIXME: ground plane
-
-            if (scene.getObjects().size() > 0 && !scene.getObjects().contains(plane2)) {
+            // shadows
+            if (doShadowing && scene.getObjects().size() > 0 && !scene.getObjects().contains(plane2)) {
                 scene.getLightBulb().setLocation(new float[]{25f, 200f, 0f});
                 plane2.setColor(Constants.COLOR_GRAY);
                 plane2.setLocation(new float[]{0f, -50f, 0f});
                 plane2.setPinned(true);
                 scene.addObject(plane2);
             }
 
-
             float[] colorMask = BLENDING_MASK_DEFAULT;
             if (scene.isBlendingEnabled()) {
                 // Enable blending for combining colors when there is transparency
@@ -456,47 +454,36 @@ public void onDrawFrame(GL10 unused) {
             lightPosInWorldSpace[2] = tempVector4[2];
 
             // Calculate position of the light in world space to support lighting
-            doShadowing = false;
-            if (scene.isRotatingLight()) {
-                doShadowing = true;
-            } else {
+            if (!scene.isRotatingLight()) {
                 lightPosInWorldSpace[0] = cameraPosInWorldSpace[0];
                 lightPosInWorldSpace[1] = cameraPosInWorldSpace[1];
                 lightPosInWorldSpace[2] = cameraPosInWorldSpace[2];
-                doShadowing = true;
             }
 
             // render shadow
             if (doShadowing){
                 shadowsRenderer.onPrepareFrame(unused, projectionMatrix, viewMatrix, lightPosInWorldSpace, scene);
             }
 
-
             drawSkyBox(viewMatrix, projectionMatrix, cameraPosInWorldSpace, colorMask);
 
+
             if (scene.isDrawLighting()) {
                 if (scene.isRotatingLight()) {
                     // Draw a point that represents the light bulb
                     basicShader.draw(scene.getLightBulb(), projectionMatrix, viewMatrix, -1, lightPosInWorldSpace, colorMask, cameraPosInWorldSpace, scene.getLightBulb().getDrawMode(), scene.getLightBulb().getDrawSize());
                     //basicShader.draw(Point.build(lightPosInWorldSpace), projectionMatrix, viewMatrix, -1, lightPosInWorldSpace, colorMask, cameraPosInWorldSpace);
                 }
-
-
-                Object3DData data = Line.build(new float[]{lightPosInWorldSpace[0],
-                        lightPosInWorldSpace[1], lightPosInWorldSpace[2], 0, 0, 0}).setId("light_line");
-                basicShader.draw(data, projectionMatrix,
-                        viewMatrix, -1,
-                        lightPosInWorldSpace,
-                        colorMask, cameraPosInWorldSpace, data.getDrawMode(), data.getDrawSize());
             }
 
-            // FIXME: integrate this
+            // render with shadows
             if (doShadowing && scene.getObjects().size() > 0) {
                 // shadowsRenderer.onPrepareFrame(unused, projectionMatrix, viewMatrix, lightPosInWorldSpace, scene);
                 shadowsRenderer.onDrawFrame(unused, projectionMatrix, viewMatrix, lightPosInWorldSpace, scene);
                 return;
             }
 
+            // render
             if (!scene.isStereoscopic()) {
                 this.onDrawFrame(viewMatrix, projectionMatrix, colorMask);
                 if(camera.hasChanged()) camera.setChanged(false);

engine/src/main/res/raw/shader_animated_frag.glsl

@@ -2,9 +2,8 @@ precision highp float;
 
 // data
 uniform mat4 u_MMatrix;
-varying vec3 v_Position;
 uniform vec3 u_cameraPos;
-uniform bool u_Debug;
+varying vec3 v_Position;
 
 // color
 uniform vec4 vColor;
@@ -19,7 +18,7 @@ uniform bool u_Textured;
 uniform sampler2D u_Texture;
 varying vec2 v_TexCoordinate;
 
-// lights
+// light
 uniform bool u_Lighted;
 uniform vec3 u_LightPos;
 varying vec3 v_Normal;
@@ -104,11 +103,6 @@ void main(){
     }
 
     // calculate final color
-    gl_FragColor = color * tex * light * vColorMask;
+    gl_FragColor = color * tex * vColorMask * light;
     gl_FragColor[3] = color[3] * vColorMask[3];
-
-    // debug
-    if (u_Debug){
-        gl_FragColor = vec4(nmap,1.0);
-    }
-}
+}

engine/src/main/res/raw/shader_animated_vert.glsl

@@ -17,22 +17,21 @@ uniform bool u_Coloured;
 attribute vec4 a_Color;
 varying vec4 v_Color;
 
-// textures
+// texture
 uniform bool u_Textured;
 attribute vec2 a_TexCoordinate;
 varying vec2 v_TexCoordinate;
 
-// normals
+// light
 uniform bool u_Lighted;
-//uniform mat3 u_MMatrix_Normal;
 attribute vec3 a_Normal;
 varying vec3 v_Normal;
 
-// normal Map
+// normalMap
 uniform bool u_NormalTextured;
 uniform sampler2D u_NormalTexture;
 
-// emissive Map
+// emissiveMap
 uniform bool u_EmissiveTextured;
 uniform sampler2D u_EmissiveTexture;