Make the default example a bit less ugly

Author: einarf

TODO.md

@@ -1,6 +1,7 @@
 
 ## TODO
 
+- Split up README into several files
 - Properly verify all settings
 - Write documentation (readthedocs)
 - CLI tool creating new projects and effects.

demosys/opengl/shader.py

@@ -230,7 +230,7 @@ def compile(self):
         message = GL.glGetShaderInfoLog(self.shader)
         if message:
             self.print()
-            raise ShaderError("Failed to compile {} {}: {}".format(self.type_name(), self.name, message))
+            raise ShaderError("Failed to compile {} {}: {}".format(self.type_name(), self.name, message.decode()))
 
     def print(self):
         print("---[ START {} ]---".format(self.name))

demosys_test/cube/effect.py

@@ -1,4 +1,4 @@
-# import math
+import math
 from demosys.effects import effect
 from demosys.opengl import geometry, FBO
 # from pyrr import Vector3
@@ -18,7 +18,7 @@ def init(self):
         self.cube = geometry.cube(4.0, 4.0, 4.0)
         v = 100.0
         r = (-v, v)
-        self.points = geometry.points_random_3d(100_000, range_x=r, range_y=r, range_z=r, seed=7656456)
+        self.points = geometry.points_random_3d(50_000, range_x=r, range_y=r, range_z=r, seed=7656456)
         self.quad = geometry.quad_fs()
         self.fbo = FBO.create(512, 512, depth=True)
 
@@ -44,7 +44,7 @@ def draw(self, time, target):
         self.fbo.release()
 
         # Test camera
-        self.sys_camera.set_projection(near=1, far=1000)
+        self.sys_camera.set_projection(near=0.1, far=1000)
         # self.sys_camera.set_position(10.0, 0.0, 10.0)
         # self.sys_camera.set_position(math.sin(time) * 10,
         #                                  math.sin(time * 10),
@@ -58,6 +58,8 @@ def draw(self, time, target):
         self.cube_shader2.uniform_mat4("ModelViewM", view_m)
         self.cube_shader2.uniform_mat3("NormalM", normal_m)
         self.cube_shader2.uniform_sampler_2d(0, "texture0", self.fbo.color_buffers[0])
+        self.cube_shader2.uniform_1f("time", time)
+        self.cube_shader2.uniform_3f("lightpos", 0.0, 0.0, 0.0)
         self.points.draw(mode=GL.GL_POINTS)
 
         GL.glClearColor(0.5, 0.5, 0.5, 1)

demosys_test/cube/shaders/cube/cube_texture_light.glsl

@@ -23,15 +23,36 @@ uniform float time;
 
 in vec3 normal;
 in vec2 uv0;
+in vec3 lightdir;
+in vec3 eyepos;
+
 
 void main()
 {
+    vec4 diffuse = vec4(0.5, 0.5, 0.5, 1.0);
+    vec4 ambient = vec4(0.2, 0.2, 0.2, 1.0);
+    vec4 specular = vec4(1.0, 1.0, 1.0, 1.0);
+    float shininess = 0.5;
+
     vec4 c = texture(texture0, uv0);
-    vec3 dir = vec3(0.0, 0.0, 1.0);
-    float d = dot(dir, normal);
-    fragColor = c * d;
+    vec4 spec = vec4(0.0);
+
+    vec3 n = normalize(normal);
+    vec3 l = normalize(lightdir);
+    vec3 e = normalize(eyepos);
+
+    float intensity = max(dot(n,l), 0.0);
+    if (intensity > 0.0) {
+        vec3 h = normalize(l + e);
+        float intSpec = max(dot(h, n), 0.0);
+        spec = specular * pow(intSpec, shininess);
+    }
+    float att = clamp(1.0 - length(eyepos)/200.0, 0.0, 1.0);
+    att *= att;
+    fragColor = c * max(intensity * diffuse + spec, ambient) * att;
 }
 
+
 #elif defined GEOMETRY_SHADER
 
 layout (points) in;
@@ -40,9 +61,13 @@ layout (triangle_strip, max_vertices = 24) out; // 4 vertices per side of the cu
 uniform mat4 ProjM;
 uniform mat4 ModelViewM;
 uniform mat3 NormalM;
+uniform vec3 lightpos;
+uniform float time;
 
 out vec2 uv0;
 out vec3 normal;
+out vec3 lightdir;
+out vec3 eyepos;
 
 // Define the 8 corners of a cube (back plane, front plane (counter clockwise))
 vec3 cube_corners[8] = vec3[]  (
@@ -58,7 +83,9 @@ vec3 cube_corners[8] = vec3[]  (
 
 #define EMIT_V(POS, UV, NORMAL) \
 	uv0 = UV; \
-	normal = NormalM * NORMAL; \
+	normal = normalize(NormalM * NORMAL); \
+	lightdir = lightpos - POS.xyz; \
+	eyepos = -POS.xyz; \
 	gl_Position = ProjM * vec4(POS, 1.0); \
 	EmitVertex()
 
@@ -78,6 +105,10 @@ void main()
 	for(i = 0; i < 8; i++)
 	{
 		vec3 pos = point.xyz + cube_corners[i] * 0.5;
+		pos.y += sin(time + length(gl_in[0].gl_Position.xyz));
+		pos.x += cos(time + gl_in[0].gl_Position.x);
+		pos.z += cos(time + gl_in[0].gl_Position.z);
+
 		corners[i] = (ModelViewM * vec4(pos, 1.0)).xyz;
 	}
 	EMIT_QUAD(3, 2, 0, 1, vec3( 0.0,  0.0, -1.0)); // back