Added a light shader example

rhulha · rhulha · commit 77f5ac1d8d1f · 2014-06-04T18:57:12.000+02:00
diff --git a/example/icosahedron.dart b/example/icosahedron.dart
@@ -15,7 +15,7 @@ void main() {
     FlyingCamera fc = new FlyingCamera(camera); // W,A,S,D keys fly
     chronosGL.addAnimatable('flyingCamera', fc);
     
-    MeshData md = chronosGL.getUtils().createIcosahedron(3);;
+    MeshData md = chronosGL.getUtils().createIcosahedron(3);
     md.texture = blockTex.texture;
     Mesh m = md.createMesh();
     chronosGL.programBasic.add(m);
diff --git a/example/light.dart b/example/light.dart
@@ -0,0 +1,48 @@
+import 'package:ChronosGL/chronos_gl.dart';
+
+class RotateMesh extends Animatable {
+  Mesh m;
+  RotateMesh(this.m);
+  
+  void animate(double time) {
+    m.rollLeft(time*0.001);
+    m.lookLeft(time*0.001);
+  }
+}
+
+
+void main() {
+  
+  ChronosGL chronosGL = new ChronosGL('#webgl-canvas');
+
+  Camera camera = chronosGL.getCamera();
+  TextureCache textureCache = chronosGL.getTextureCache();
+  TextureWrapper blockTex = textureCache.add("gradient.jpg");
+  TextureWrapper partiTex = textureCache.add("particle.bmp");
+  
+  textureCache.loadAllThenExecute(() {
+    camera.setPos( 0.0, 0.0, 56.0 );
+    
+    FlyingCamera fc = new FlyingCamera(camera); // W,A,S,D keys fly
+    chronosGL.addAnimatable('flyingCamera', fc);
+    
+    MeshData md = chronosGL.getUtils().createCube();
+    for( int i=0; i<md.vertices.length;i++) {
+      md.vertices[i] = md.vertices[i]*10;
+    }
+    Mesh m = md.createMesh();
+    m.setPos(0.0, 0.0, -150.0);
+    m.lookUp(1.0);
+    m.lookLeft(0.7);
+    
+    chronosGL.animatables['rotate_cube'] = new RotateMesh(m);
+    
+    ShaderProgram prg = chronosGL.createProgram('Light', chronosGL.getShaderLib().createLightShader());
+    prg.add(m);
+    
+    chronosGL.getUtils().addParticles(2000, partiTex.texture);
+    
+    chronosGL.run();
+  });
+  
+}
diff --git a/example/light.html b/example/light.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>light</title>
+  </head>
+  <body style="height:100%; margin: 0; padding: 0">
+    
+    
+    <canvas id="webgl-canvas" style="border: none; cursor:crosshair; width:100%; height: 100%; display:block;"></canvas>
+
+    <script type="application/dart" src="light.dart"></script>
+    <script src="packages/browser/dart.js"></script>
+  </body>
+</html>
diff --git a/lib/src/shader_lib.dart b/lib/src/shader_lib.dart
@@ -78,19 +78,19 @@ class ShaderLib {
         vec3 ambientColor = vec3(0.0,0.0,0.0);
         vec3 directionalColor = vec3(1.0,1.0,1.0);
 
-        vec3 pointLightLocation = vec3( 4, 0, 10);
+        vec3 pointLightLocation = vec3( 40, 0, 100);
         
         varying vec3 vLightWeighting;
         varying vec3 vNormal;
 
         void main(void) {
           gl_Position = uPMatrix * uMVMatrix * vec4(aVertexPosition, 1.0);
+          vNormal = (uMVMatrix * vec4(aNormal, 0.0)).xyz;
 
           vec3 lightDir = normalize(pointLightLocation - aVertexPosition.xyz);
 
-          float directionalLightWeighting = max(dot(aNormal, normalize(lightDir)), 0.0);
+          float directionalLightWeighting = max(dot(vNormal, normalize(lightDir)), 0.0);
           vLightWeighting = ambientColor + directionalColor * directionalLightWeighting;
-          vNormal = aNormal;
         }
         """;
     
diff --git a/lib/src/shapes/cube.dart b/lib/src/shapes/cube.dart
@@ -37,6 +37,41 @@ MeshData createCubeInternal( [Texture texture]) {
                            -1.0, -1.0,  1.0,
                            -1.0,  1.0,  1.0,
                            -1.0,  1.0, -1.0];
+  List<double> normals = [// Front face
+                              0.0,  0.0,  1.0,
+                              0.0,  0.0,  1.0,
+                              0.0,  0.0,  1.0,
+                              0.0,  0.0,  1.0,
+
+                             // Back face
+                              0.0,  0.0, -1.0,
+                              0.0,  0.0, -1.0,
+                              0.0,  0.0, -1.0,
+                              0.0,  0.0, -1.0,
+
+                             // Top face
+                              0.0,  1.0,  0.0,
+                              0.0,  1.0,  0.0,
+                              0.0,  1.0,  0.0,
+                              0.0,  1.0,  0.0,
+
+                             // Bottom face
+                              0.0, -1.0,  0.0,
+                              0.0, -1.0,  0.0,
+                              0.0, -1.0,  0.0,
+                              0.0, -1.0,  0.0,
+
+                             // Right face
+                              1.0,  0.0,  0.0,
+                              1.0,  0.0,  0.0,
+                              1.0,  0.0,  0.0,
+                              1.0,  0.0,  0.0,
+
+                             // Left face
+                             -1.0,  0.0,  0.0,
+                             -1.0,  0.0,  0.0,
+                             -1.0,  0.0,  0.0,
+                             -1.0,  0.0,  0.0,];
   List<double> uvs = [// Front face
                       0.0, 0.0,
                       1.0, 0.0,
@@ -81,6 +116,6 @@ MeshData createCubeInternal( [Texture texture]) {
                            20, 21, 22,   20, 22, 23  // Left face
                            ];
 
-  return new MeshData(vertices : new Float32List.fromList(vertices), textureCoords : new Float32List.fromList(uvs), vertexIndices : new Uint16List.fromList(vertIndices), texture : texture); 
+  return new MeshData(vertices : new Float32List.fromList(vertices), normals : new Float32List.fromList(normals), textureCoords : new Float32List.fromList(uvs), vertexIndices : new Uint16List.fromList(vertIndices), texture : texture); 
   
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: ChronosGL
-version: 1.0.2
+version: 1.0.3
 author: rhulha <java4life@gmail.com>
 description: A simple, minimal and elegant scene graph for WebGL written in Dart
 homepage: https://github.com/rhulha/ChronosGL
