diff options
Diffstat (limited to 'src/extras/shaders/gl3/phong.frag')
-rw-r--r-- | src/extras/shaders/gl3/phong.frag | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/extras/shaders/gl3/phong.frag b/src/extras/shaders/gl3/phong.frag index a4d7e0969..49e0ce1dd 100644 --- a/src/extras/shaders/gl3/phong.frag +++ b/src/extras/shaders/gl3/phong.frag @@ -1,8 +1,8 @@ #version 150 core -uniform vec3 ka; // Ambient reflectivity -uniform vec3 kd; // Diffuse reflectivity -uniform vec3 ks; // Specular reflectivity +uniform vec4 ka; // Ambient reflectivity +uniform vec4 kd; // Diffuse reflectivity +uniform vec4 ks; // Specular reflectivity uniform float shininess; // Specular shininess factor uniform vec3 eyePosition; @@ -16,7 +16,6 @@ out vec4 fragColor; void main() { - vec3 diffuseColor, specularColor; - adsModel(worldPosition, worldNormal, eyePosition, shininess, diffuseColor, specularColor); - fragColor = vec4( ka + kd * diffuseColor + ks * specularColor, 1.0 ); + vec3 worldView = normalize(eyePosition - worldPosition); + fragColor = phongFunction(ka, kd, ks, shininess, worldPosition, worldView, worldNormal); } |