From 168b0f8cb9bdcf9d1983aee5c89543bb940790ef Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 14 May 2021 21:28:30 -0400 Subject: graphics: phong: Respect the user defined lights passed to draw-model. --- data/shaders/phong-vert.glsl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/shaders/phong-vert.glsl') diff --git a/data/shaders/phong-vert.glsl b/data/shaders/phong-vert.glsl index 51461fa..9b72eb3 100644 --- a/data/shaders/phong-vert.glsl +++ b/data/shaders/phong-vert.glsl @@ -15,9 +15,11 @@ attribute vec3 normal; #endif #ifdef GLSL120 +varying vec3 fragWorldPos; varying vec3 fragNorm; varying vec2 fragTex; #else +out vec3 fragWorldPos; out vec3 fragNorm; out vec2 fragTex; #endif @@ -27,8 +29,8 @@ uniform mat4 view; uniform mat4 projection; void main() { - gl_Position = projection * view * model * vec4(position, 1.0); - // TODO: Calculate normal matrix on CPU + fragWorldPos = vec3(model * vec4(position, 1.0)); fragNorm = normalize(model * vec4(normal, 1.0)).xyz; fragTex = texcoord; + gl_Position = projection * view * vec4(fragWorldPos, 1.0); } -- cgit v1.2.3