# HG changeset patch
# User Eugen Sawin <sawine@me73.com>
# Date 1303780016 -7200
# Node ID 3b66f92dbc4d4b6d47549a20bb5561403aadabd0
# Parent  8c2ee41d3727d4e486bb4b199dd86915bdbcdeee
Basic light.

diff -r 8c2ee41d3727 -r 3b66f92dbc4d machine.html
--- a/machine.html	Tue Apr 26 01:48:56 2011 +0200
+++ b/machine.html	Tue Apr 26 03:06:56 2011 +0200
@@ -19,15 +19,14 @@
  
 <script id="vertex-shader" type="x-shader/x-vertex"> 
     attribute vec3 aVertexPosition;
-    attribute vec4 aVertexColour;
     attribute vec3 aVertexNormal;
+    attribute vec4 aVertexColour;    
 
     uniform mat4 uMVMatrix;
     uniform mat4 uPMatrix;
     uniform mat3 uNMatrix;
 
     uniform vec3 uAmbientColour;
-
     uniform vec3 uLightingDirection;
     uniform vec3 uDirectionalColour;
 
@@ -40,6 +39,7 @@
     {
         gl_Position = uPMatrix * uMVMatrix * vec4(aVertexPosition, 1.0);
         vColour = aVertexColour;
+
         if (!uUseLighting)
         {
             vLightWeighting = vec3(1.0, 1.0, 1.0);
diff -r 8c2ee41d3727 -r 3b66f92dbc4d scripts/cube.js
--- a/scripts/cube.js	Tue Apr 26 01:48:56 2011 +0200
+++ b/scripts/cube.js	Tue Apr 26 03:06:56 2011 +0200
@@ -46,19 +46,56 @@
     this.positionBuffer.itemSize = 3;
     this.positionBuffer.numItems = 24;
 
+    this.normalBuffer = gl.createBuffer();
+    gl.bindBuffer(gl.ARRAY_BUFFER, this.normalBuffer);
+    var normals = [// font 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];
+    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(normals), gl.STATIC_DRAW);
+    this.normalBuffer.itemSize = 3;
+    this.normalBuffer.numItems = 24;
+
     this.colourBuffer = gl.createBuffer();
     gl.bindBuffer(gl.ARRAY_BUFFER, this.colourBuffer);
     var alpha = 1.0;
-    var colours = [[1.0, 0.0, 0.0, alpha],
-		   [0.0, 1.0, 0.0, alpha],
-		   [0.0, 0.0, 1.0, alpha],
-		   [1.0, 0.0, 1.0, alpha],
-		   [1.0, 1.0, 0.0, alpha],
-		   [0.0, 1.0, 1.0, alpha]];
+    var uni = [1.0, 1.0, 1.0, alpha];
+    var colours = [[0.0, 0.0, 0.0, alpha],
+		   [0.0, 0.0, 0.0, alpha],
+		   [0.0, 0.0, 0.0, alpha],
+		   [0.0, 0.0, 0.0, alpha],
+		   [0.0, 0.0, 0.0, alpha],
+		   [0.0, 0.0, 0.0, alpha]];
     var unpackedColours = [];
     for (var i in colours)
     {
-	var colour = colours[i];
+	var colour = uni;//colours[i];
 	for (var j = 0; j < 4; j++)
 	{
 	    unpackedColours = unpackedColours.concat(colour);
@@ -80,39 +117,4 @@
     gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, new Uint16Array(indices), gl.STATIC_DRAW);
     this.indexBuffer.itemSize = 1;
     this.indexBuffer.numItems = 36;
-
-    this.normalBuffer = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, this.normalBuffer);
-    var normals = [// font face
-		   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];
-    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(normals), gl.STATIC_DRAW);
-    this.normalBuffer.itemSize = 3;
-    this.normalBuffer.numItems = 24;
 }
\ No newline at end of file
diff -r 8c2ee41d3727 -r 3b66f92dbc4d scripts/machine.js
--- a/scripts/machine.js	Tue Apr 26 01:48:56 2011 +0200
+++ b/scripts/machine.js	Tue Apr 26 03:06:56 2011 +0200
@@ -246,8 +246,6 @@
     }
 }
 
-
-
 function Machine(scene)
 {
     this.scene = scene;
@@ -263,11 +261,6 @@
     this.lastUpdate = time;
 }
 
-
-
-
-
-
 function read(file, handler)
 {
     var request = new XMLHttpRequest();
diff -r 8c2ee41d3727 -r 3b66f92dbc4d scripts/renderer.js
--- a/scripts/renderer.js	Tue Apr 26 01:48:56 2011 +0200
+++ b/scripts/renderer.js	Tue Apr 26 03:06:56 2011 +0200
@@ -22,6 +22,7 @@
     var program = this.shader;
     var pMatrix = this.pMatrix;
     var mvMatrix = this.mvMatrix;
+
     gl.uniformMatrix4fv(program.pMatrixUniform, false, pMatrix);
     gl.uniformMatrix4fv(program.mvMatrixUniform, false, mvMatrix);
     var normalMatrix = mat3.create();
@@ -57,12 +58,12 @@
     gl.useProgram(this.program);
     this.vertexPosition = gl.getAttribLocation(this.program, "aVertexPosition");
     gl.enableVertexAttribArray(this.vertexPosition);
-    
-    this.vertexColour = gl.getAttribLocation(this.program, "aVertexColour");
-    gl.enableVertexAttribArray(this.vertexColour);
 
     this.vertexNormal = gl.getAttribLocation(this.program, "aVertexNormal");
     gl.enableVertexAttribArray(this.vertexNormal);
+    
+    this.vertexColour = gl.getAttribLocation(this.program, "aVertexColour");
+    gl.enableVertexAttribArray(this.vertexColour);    
 
     this.pMatrixUniform = gl.getUniformLocation(this.program, "uPMatrix");
     this.mvMatrixUniform = gl.getUniformLocation(this.program, "uMVMatrix");    
@@ -145,21 +146,21 @@
    
     if (lighting)
     {   
-	var ambient = {"r": 1.0, "g": 1.0, "b": 1.0};
-    	gl.uniform3f(shader.ambientColourUniform, ambient.r, ambient.g, ambient.b);
+	var uni = 0.02;
+	var ambient = {"r": uni, "g": uni, "b": uni};
+   	gl.uniform3f(shader.ambientColourUniform, ambient.r, ambient.g, ambient.b);
 
 	var lightingDir = vec3.create();
-	vec3.add(lightingDir, [0.0, 0.0, -1.0]);
+	vec3.add(lightingDir, [0.0, -1.0, 0.0]);
 	vec3.normalize(lightingDir);
 	vec3.scale(lightingDir, -1);     
 	gl.uniform3fv(shader.lightingDirectionUniform, lightingDir);
 	
-	var directional = ambient;
+	uni = 0.5;
+	var directional =  {"r": uni, "g": uni, "b": uni};
 	gl.uniform3f(shader.directionalColourUniform, directional.r, directional.g, directional.b);
     }
    
-
-    
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, scene.indexBuffer);
     this.context.updateMatrixUniforms();
     gl.drawElements(gl.TRIANGLES, scene.indexBuffer.numItems, gl.UNSIGNED_SHORT, 0);