fixed light

asalga · Jun 28, 2010 · 53632a3 · 53632a3
1 parent 3e0a138
commit 53632a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/demos/acorn/acorn.js b/demos/acorn/acorn.js
@@ -1,8 +1,10 @@
 var ps;
 
-var size = 500;
+var rot = 0;
 var zoomed = 0;
 
+var size = 500;
+
 function zoom(amt){
   zoomed += amt * 2;
   size += amt * 10;
@@ -17,6 +19,7 @@ function render() {
 
   // transform point cloud
   ps.translate(0,0,zoomed);
+  ps.rotateY(rot+=0.01);
 
   // redraw
   ps.clear();

diff --git a/demos/mickey/mickey.js b/demos/mickey/mickey.js
@@ -1,5 +1,6 @@
 var ps;
 var zoomed = 0;
+var rot = 0;
 
 function zoom(amt){
   zoomed += amt * 2;
@@ -9,6 +10,7 @@ function render() {
 
   // transform point cloud
   ps.translate(0,0,zoomed);
+  ps.rotateY(rot+=0.01);
 
   // redraw
   ps.clear();

diff --git a/pointstream.js b/pointstream.js
@@ -48,7 +48,7 @@ function PointStream(){
   // shader matrices  
   var modelView;
   var projection;
-  var model = M4x4.$(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1);
+  var model;
   var normalTransform;
 
   var progObj;
@@ -370,8 +370,10 @@ var fragmentShaderSource =
         vertexAttribPointer(progObj, "aColor", 3, VBOs.colBuffer);
         vertexAttribPointer(progObj, "aNormal", 3, VBOs.normBuffer);
 
-        //normalTransform = M4x4.inverseOrthonormal(modelView);
-        //uniformMatrix(progObj, "normalTransform", false, M4x4.transpose(normalTransform));
+        var mvm = M4x4.mul(modelView, model);
+        normalTransform = M4x4.inverseOrthonormal(mvm);
+        uniformMatrix(progObj, "normalTransform", false, M4x4.transpose(normalTransform));
+
         uniformMatrix(progObj, "model", false, model);
 
         ctx.drawArrays(ctx.POINTS, 0, VBOs.size/3);