diff options
Diffstat (limited to 'src/extras/shaders/es2/phong.frag')
-rw-r--r-- | src/extras/shaders/es2/phong.frag | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/extras/shaders/es2/phong.frag b/src/extras/shaders/es2/phong.frag index c00f89db0..a2d29c6cc 100644 --- a/src/extras/shaders/es2/phong.frag +++ b/src/extras/shaders/es2/phong.frag @@ -1,8 +1,8 @@ #define FP highp -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 vec3 eyePosition; @@ -14,7 +14,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, 1.0 ); + FP vec3 worldView = normalize(eyePosition - worldPosition); + gl_FragColor = phongFunction(ka, kd, ks, shininess, worldPosition, worldView, worldNormal); } |