summaryrefslogtreecommitdiffstats
path: root/src/extras/shaders/es2/phongalpha.frag
diff options
context:
space:
mode:
Diffstat (limited to 'src/extras/shaders/es2/phongalpha.frag')
-rw-r--r--src/extras/shaders/es2/phongalpha.frag11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/extras/shaders/es2/phongalpha.frag b/src/extras/shaders/es2/phongalpha.frag
index c5ec43049..6378aa184 100644
--- a/src/extras/shaders/es2/phongalpha.frag
+++ b/src/extras/shaders/es2/phongalpha.frag
@@ -1,9 +1,9 @@
#define FP highp
// TODO: Replace with a struct
-uniform FP vec3 ka; // Ambient reflectivity
-uniform FP vec3 kd; // Diffuse reflectivity
-uniform FP vec3 ks; // Specular reflectivity
+uniform FP vec4 ka; // Ambient reflectivity
+uniform FP vec4 kd; // Diffuse reflectivity
+uniform FP vec4 ks; // Specular reflectivity
uniform FP float shininess; // Specular shininess factor
uniform FP float alpha;
@@ -16,7 +16,6 @@ varying FP vec3 worldNormal;
void main()
{
- FP vec3 diffuseColor, specularColor;
- adsModel(worldPosition, worldNormal, eyePosition, shininess, diffuseColor, specularColor);
- gl_FragColor = vec4( ka + kd * diffuseColor + ks * specularColor, alpha );
+ FP vec3 worldView = normalize(eyePosition - worldPosition);
+ gl_FragColor = phongFunction(ka, vec4(kd.rgb, alpha), ks, shininess, worldPosition, worldView, worldNormal);
}