Deferred tweaks

Author: einarf

demosys/deferred/renderer.py

@@ -9,9 +9,18 @@
 class PointLight:
     """A point light and its properties"""
     def __init__(self, position, radius):
-        self.position = position
+        self._position = position
         self.radius = radius
-        self.matrix = matrix44.create_from_translation(position)
+        self.matrix = None
+
+    @property
+    def position(self):
+        return self._position
+
+    @position.setter
+    def position(self, pos):
+        self._position = pos
+        self.matrix = matrix44.create_from_translation(pos)
 
 
 class DeferredRenderer:

demosys/deferred/shaders/deferred/combine.glsl

@@ -20,7 +20,7 @@ uniform sampler2D light_buffer;
 in vec2 uv;
 
 void main() {
-    out_color = texture(diffuse_buffer, uv) * (texture(light_buffer, uv) * 0.75 + 0.25);
+    out_color = texture(diffuse_buffer, uv) * (texture(light_buffer, uv));
 }
 
 #endif

demosys/deferred/shaders/deferred/geometry_color.glsl

@@ -0,0 +1,34 @@
+#version 410
+
+#if defined VERTEX_SHADER
+
+in vec3 in_position;
+in vec3 in_normal;
+in vec2 in_uv;
+
+uniform mat4 m_mv;
+uniform mat4 m_proj;
+uniform mat3 m_normal;
+
+out vec3 normal;
+
+void main() {
+    normal = m_normal * in_normal;
+    gl_Position = m_proj * m_mv * vec4(in_position, 1.0);
+}
+
+#elif defined FRAGMENT_SHADER
+
+layout(location=0) out vec4 out_color;
+layout(location=1) out vec3 out_normal;
+
+uniform vec4 color;
+
+in vec3 normal;
+
+void main() {
+    out_normal = normalize(normal);
+    out_color = color;
+}
+
+#endif

demosys/deferred/shaders/deferred/geometry.glsl renamed to demosys/deferred/shaders/deferred/geometry_texture.glsl

@@ -32,7 +32,6 @@ in vec2 uv;
 void main() {
     out_normal = normalize(normal);
     out_color = texture(texture0, uv);
-//    out_color = vec4(1.0);
 }
 
 #endif

demosys/deferred/shaders/deferred/light_point.glsl

@@ -54,8 +54,8 @@ void main() {
     vec3 reflectDir = reflect(-lightDir, normal);
 
     float diffuse = max(dot(normal, lightDir), 0.0);
-//    float spec = pow(max(dot(normal, halfwayDir), 0.0), 32.8);
-    float spec = pow(max(dot(viewDir, reflectDir), 0.0), 4.0);
+//    float spec = pow(max(dot(normal, halfwayDir), 0.0), 32.0);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), 8.0);
 
     float l = diffuse * 0.5 + spec;
     // l *= (1.0 - dist / radius);