1 files changed, 5 insertions, 8 deletions
diff --git a/src/extras/shaders/gl3/diffusespecularmap.frag b/src/extras/shaders/gl3/diffusespecularmap.frag
index fb809393a..00ef124bb 100644
--- a/src/extras/shaders/gl3/diffusespecularmap.frag
+++ b/src/extras/shaders/gl3/diffusespecularmap.frag
@@ -1,7 +1,7 @@
 #version 150 core
 
 // TODO: Replace with a struct
-uniform vec3 ka;            // Ambient reflectivity
+uniform vec4 ka;            // Ambient reflectivity
 uniform float shininess;    // Specular shininess factor
 
 uniform vec3 eyePosition;
@@ -19,11 +19,8 @@ out vec4 fragColor;
 
 void main()
 {
-    vec3 diffuseTextureColor = texture( diffuseTexture, texCoord ).rgb;
-    vec3 specularTextureColor = texture( specularTexture, texCoord ).rgb;
-
-    vec3 diffuseColor, specularColor;
-    adsModel(worldPosition, worldNormal, eyePosition, shininess, diffuseColor, specularColor);
-
-    fragColor = vec4( diffuseTextureColor * ( ka + diffuseColor ) + specularTextureColor * specularColor, 1.0 );
+    vec4 diffuseTextureColor = texture( diffuseTexture, texCoord );
+    vec4 specularTextureColor = texture( specularTexture, texCoord );
+    vec3 worldView = normalize(eyePosition - worldPosition);
+    fragColor = phongFunction(ka, diffuseTextureColor, specularTextureColor, shininess, worldPosition, worldView, worldNormal);
 }