added diffusecolortexture sub shader

diff --git a/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/CompositeShader.java b/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/CompositeShader.java
index 2fa2b80..0bc622c 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/CompositeShader.java
+++ b/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/CompositeShader.java
@@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Camera;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.g3d.Renderable;
 import com.badlogic.gdx.graphics.g3d.Shader;
-import com.badlogic.gdx.graphics.g3d.shaders.subshaders.DiffuseTextureShader;
+import com.badlogic.gdx.graphics.g3d.shaders.subshaders.DiffuseColorTextureShader;
 import com.badlogic.gdx.graphics.g3d.shaders.subshaders.SubShader;
 import com.badlogic.gdx.graphics.g3d.shaders.subshaders.TransformShader;
 import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
@@ -33,7 +33,7 @@ public class CompositeShader implements Shader {
        
        public CompositeShader(Renderable renderable) {
                subShaders.add(new TransformShader());
-               subShaders.add(new DiffuseTextureShader());
+               subShaders.add(new DiffuseColorTextureShader());
                init(renderable);
        }
        

diff --git a/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/subshaders/DiffuseColorTextureShader.java b/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/subshaders/DiffuseColorTextureShader.java
new file mode 100644 (file)
index 0000000..c434d65
--- /dev/null
+++ b/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/subshaders/DiffuseColorTextureShader.java
@@ -0,0 +1,77 @@
+package com.badlogic.gdx.graphics.g3d.shaders.subshaders;
+
+import com.badlogic.gdx.graphics.Camera;
+import com.badlogic.gdx.graphics.VertexAttributes.Usage;
+import com.badlogic.gdx.graphics.g3d.Renderable;
+import com.badlogic.gdx.graphics.g3d.materials.Material.Attribute;
+import com.badlogic.gdx.graphics.g3d.materials.ColorAttribute;
+import com.badlogic.gdx.graphics.g3d.materials.TextureAttribute;
+import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
+import com.badlogic.gdx.graphics.glutils.ShaderProgram;
+
+public class DiffuseColorTextureShader extends BaseSubShader {
+       private boolean useVertexColor;
+       private boolean useDiffuseColor;
+       private boolean useDiffuseTexture;
+       
+       @Override
+       public void init (Renderable renderable) {
+               String value = "";
+               
+               // check if we have vertex color
+               if(renderable.mesh.getVertexAttribute(Usage.Color) != null||
+                       renderable.mesh.getVertexAttribute(Usage.ColorPacked) != null) {
+                       vertexVars.addAll(new String[] {
+                               "attribute vec4 " + ShaderProgram.COLOR_ATTRIBUTE + ";",
+                               "varying vec4 v_diffuseColor;"
+                       });
+                       vertexCode.add("v_diffuseColor = " + ShaderProgram.COLOR_ATTRIBUTE + ";");
+                       fragmentVars.add("varying LOWP vec4 v_diffuseColor;");
+                       useVertexColor = true;
+                       value = "v_diffuseColor";
+               }
+               
+               // check if we have a diffuse color
+               if(renderable.material.has(ColorAttribute.Diffuse)) {
+                       fragmentVars.addAll(new String[] {
+                               "uniform LOWP vec4 u_diffuseColor;"
+                       });
+                       useDiffuseColor = true;
+                       value += useVertexColor? " * ": "";
+                       value += "u_diffuseColor";
+               }
+               
+               // check if we have a diffuse texture
+               if(renderable.material.has(TextureAttribute.Diffuse)) {
+                       vertexVars.addAll(new String[] {
+                               "attribute vec2 a_texCoord0;",
+                               "varying vec2 v_texCoords0;"
+                       });
+                       vertexCode.addAll(new String[] {
+                               "v_texCoords0 = a_texCoord0;"
+                       });
+                       fragmentVars.addAll(new String[] {
+                               "uniform sampler2D u_diffuseTexture;",
+                               "varying MED vec2 v_texCoords0;"
+                       });
+                       useDiffuseTexture= true;
+                       value += (useVertexColor || useDiffuseColor)? " * ": "";
+                       value += "texture2D(u_diffuseTexture, v_texCoords0)";
+               }
+               
+               fragmentCode.add("color = color * " + value + ";");
+       }
+
+       @Override
+       public void apply (ShaderProgram program, RenderContext context, Camera camera, Renderable renderable) {
+               if(useDiffuseColor) {
+                       ColorAttribute attribute = (ColorAttribute)renderable.material.get(ColorAttribute.Diffuse);
+                       program.setUniformf("u_diffuseColor", attribute.color);
+               }
+               if(useDiffuseTexture) {
+                       TextureAttribute attribute = (TextureAttribute)renderable.material.get(TextureAttribute.Diffuse);
+                       int unit = context.textureBinder.bind(attribute.textureDescription);
+                       program.setUniformi("u_diffuseTexture", unit);
+               }
+       }
+}

diff --git a/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/subshaders/DiffuseTextureShader.java b/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/subshaders/DiffuseTextureShader.java
deleted file mode 100644 (file)
index 1ba6964..0000000
--- a/gdx/src/com/badlogic/gdx/graphics/g3d/shaders/subshaders/DiffuseTextureShader.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.badlogic.gdx.graphics.g3d.shaders.subshaders;
-
-import com.badlogic.gdx.graphics.Camera;
-import com.badlogic.gdx.graphics.g3d.Renderable;
-import com.badlogic.gdx.graphics.g3d.materials.Material.Attribute;
-import com.badlogic.gdx.graphics.g3d.materials.TextureAttribute;
-import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
-import com.badlogic.gdx.graphics.glutils.ShaderProgram;
-
-public class DiffuseTextureShader extends BaseSubShader {
-       private boolean enabled;
-       
-       @Override
-       public void init (Renderable renderable) {
-               if(renderable.material.has(TextureAttribute.Diffuse)) {
-                       vertexVars.addAll(new String[] {
-                               "attribute vec2 a_texCoord0;",
-                               "varying vec2 v_texCoords0;"
-                       });
-                       vertexCode.addAll(new String[] {
-                               "v_texCoords0 = a_texCoord0;"
-                       });
-                       fragmentVars.addAll(new String[] {
-                               "uniform sampler2D u_diffuseTexture;",
-                               "varying MED vec2 v_texCoords0;"
-                       });
-                       fragmentCode.addAll(new String[] {
-                               "color = texture2D(u_diffuseTexture, v_texCoords0);"
-                       });
-                       enabled = true;
-               }
-       }
-
-       @Override
-       public void apply (ShaderProgram program, RenderContext context, Camera camera, Renderable renderable) {
-               if(enabled) {
-                       TextureAttribute attribute = (TextureAttribute)renderable.material.get(TextureAttribute.Diffuse);
-                       int unit = context.textureBinder.bind(attribute.textureDescription);
-                       program.setUniformi("u_diffuseTexture", unit);
-               }
-       }
-}