Merge pull request #1219 from seanpaultaylor/next

Fixed colored.vert

gameplay/res/shaders/colored.vert

@@ -47,8 +47,8 @@ uniform mat4 u_inverseTransposeWorldViewMatrix;
 uniform mat4 u_worldViewMatrix;
 #endif
 
-#if (DIRECTION_LIGHT_COUNT > 0)
-uniform vec3 u_directionalLightDirection[DIRECTION_LIGHT_COUNT];
+#if (DIRECTIONAL_LIGHT_COUNT > 0)
+uniform vec3 u_directionalLightDirection[DIRECTIONAL_LIGHT_COUNT];
 #endif
 
 #if (POINT_LIGHT_COUNT > 0) 

samples/character/res/common/scene.material

@@ -27,7 +27,7 @@ material texturedUnlit
     }
 }
 
-material texturedSpecular
+material textured
 {
     technique
     {
@@ -35,7 +35,7 @@ material texturedSpecular
         {
             vertexShader = res/shaders/textured.vert
             fragmentShader = res/shaders/textured.frag
-			defines = DIRECTIONAL_LIGHT_COUNT 1;SPECULAR
+			defines = DIRECTIONAL_LIGHT_COUNT 1
 
             u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
             u_inverseTransposeWorldViewMatrix = INVERSE_TRANSPOSE_WORLD_VIEW_MATRIX
@@ -283,7 +283,7 @@ material lightblue : colored
     }
 }
 
-material basketball : texturedSpecular
+material basketball : textured
 {
     technique
     {

samples/mesh/res/duck.material

@@ -15,7 +15,7 @@ material duck
             u_cameraPosition = CAMERA_WORLD_POSITION
             u_ambientColor = 0.2, 0.2, 0.2
             u_specularExponent = 50
-            u_directionalLightColor[0] = 0.75, 0.75, 0.75
+            u_directionalLightColor[0] = 1.0, 1.0, 1.0
             
             // samplers
             sampler u_diffuseTexture