From d58cabe6587dd4e90c56815cfda5dcebd2eec88c Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Wed, 30 Nov 2016 11:10:08 +0100 Subject: [PATCH] Shaders --- assets/shaders/shader.frag | 5 ++--- assets/shaders/shader.vert | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/shaders/shader.frag b/assets/shaders/shader.frag index 4b4c256..03bc4fe 100644 --- a/assets/shaders/shader.frag +++ b/assets/shaders/shader.frag @@ -10,11 +10,10 @@ void main() { vec3 ambientFactor = ambientLight; vec3 lambertFactor = max(vec3(0.0,0.0,0.0), dot(directionnalLight, fNormal) * directionnalLightFactor); - - vec4 texel = texture2D(tex, gl_TexCoord[0].xy); vec4 noTexColor = vec4(ambientFactor + lambertFactor, 1.0); - vec4 color = texture2D(tex,gl_TexCoord[0].st); + vec4 color = texture2D(tex, gl_TexCoord[0].st); + vec4 fragColor = noTexColor * color; gl_FragColor = fragColor; diff --git a/assets/shaders/shader.vert b/assets/shaders/shader.vert index 86558ff..e63abfb 100644 --- a/assets/shaders/shader.vert +++ b/assets/shaders/shader.vert @@ -2,7 +2,9 @@ varying vec3 fNormal; varying vec4 fTexCoord; void main() { + fNormal = gl_Normal; gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + }