Incorrect sampler bindings in light pass

Author: einarf

demosys/deferred/renderer.py

@@ -115,7 +115,7 @@ def render_lights(self, camera_matrix, projection):
                     s.uniform_mat4("m_proj", projection.matrix)
                     s.uniform_mat4("m_light", m_light)
                     s.uniform_sampler_2d(0, "g_normal", self.gbuffer.color_buffers[1])
-                    s.uniform_sampler_2d(0, "g_depth", self.gbuffer.depth_buffer)
+                    s.uniform_sampler_2d(1, "g_depth", self.gbuffer.depth_buffer)
                     s.uniform_2f("screensize", self.width, self.height)
                     s.uniform_2f("proj_const", *projection.projection_constants)
                     s.uniform_1f("radius", light_size)

demosys/deferred/shaders/deferred/geometry.glsl

@@ -24,13 +24,13 @@ void main() {
 layout(location=0) out vec4 out_color;
 layout(location=1) out vec3 out_normal;
 
+uniform sampler2D texture0;
+
 in vec3 normal;
 in vec2 uv;
 
-uniform sampler2D texture0;
-
 void main() {
-    out_normal = normal;
+    out_normal = normalize(normal);
     out_color = texture(texture0, uv);
 }
 

demosys/deferred/shaders/deferred/light_point.glsl

@@ -34,23 +34,29 @@ in vec3 vs_lightpos;
 
 void main() {
     vec2 uv = vec2(gl_FragCoord.x / screensize.x, gl_FragCoord.y / screensize.y);
-	vec3 normal = normalize(texture(g_normal, uv).xyz);
+	vec3 N = normalize(texture(g_normal, uv).rgb);
 
 	// View position reconstruct from depth
 	float depth = texture(g_depth, uv).r;
 	vec3 ray = vec3(viewRay.xy / -viewRay.z, -1.0);
 	float linear_depth = proj_const.y  / (depth - proj_const.x);
 	vec3 pos = ray * linear_depth;
 
-    float dist = length(pos - vs_lightpos);
+    // Discard fragments outside the light radius
+    float dist = length(vs_lightpos - pos);
     if (dist > radius) {
-//        out_light = vec4(1.0, 0.0, 0.0, 1.0);
-//        return;
         discard;
     }
 
-//    out_light = vec4(linear_depth);
-    out_light = vec4(1.0 - (dist / radius));
+    vec3 L = normalize(vs_lightpos - pos);
+    vec3 R = reflect(L, N);
+    float ndl = max(dot(N, L), 0.0);
+
+//    out_light = vec4(1.0 - (dist / radius));
+    out_light = vec4(ndl);
+//    out_light = vec4(R, 1.0);
+//    out_light = vec4(N, 1.0);
+//    out_light = vec4(depth);
 }
 
 #endif