diff -r 99652d00489f -r 95688249c40c scripts/renderer.js --- a/scripts/renderer.js Wed Apr 27 13:35:56 2011 +0200 +++ b/scripts/renderer.js Wed Apr 27 14:14:07 2011 +0200 @@ -73,6 +73,8 @@ this.ambientColourUniform = gl.getUniformLocation(this.program, "uAmbientColour"); this.lightingDirectionUniform = gl.getUniformLocation(this.program, "uLightingDirection"); this.directionalColourUniform = gl.getUniformLocation(this.program, "uDirectionalColour"); + this.pointLightingLocationUniform = gl.getUniformLocation(this.program, "uPointLightingLocation"); + this.pointLightingColourUniform = gl.getUniformLocation(this.program, "uPointLightingColour"); function loadShader(gl, id) { @@ -161,19 +163,23 @@ if (lighting) { - var uni = 0.02; - var ambient = {"r": uni, "g": uni, "b": uni}; - gl.uniform3f(shader.ambientColourUniform, ambient.r, ambient.g, ambient.b); + var uni = 0.00; + gl.uniform3f(shader.ambientColourUniform, uni, uni, uni); - var lightingDir = vec3.create(); - vec3.add(lightingDir, [0.5, -0.5, 0.0]); - vec3.normalize(lightingDir); - vec3.scale(lightingDir, -1); - gl.uniform3fv(shader.lightingDirectionUniform, lightingDir); + var pos = node.pos; + gl.uniform3f(shader.pointLightingLocationUniform, pos[0], pos[1], pos[2]); + uni = .1; + gl.uniform3f(shader.pointLightingColourUniform, uni, uni, uni); + + // var lightingDir = vec3.create(); + // vec3.add(lightingDir, [0.5, -0.5, 0.0]); + // vec3.normalize(lightingDir); + // vec3.scale(lightingDir, -1); + // gl.uniform3fv(shader.lightingDirectionUniform, lightingDir); - uni = 0.9; - var directional = {"r": uni, "g": uni, "b": uni}; - gl.uniform3f(shader.directionalColourUniform, directional.r, directional.g, directional.b); + // uni = 0.9; + // var directional = {"r": uni, "g": uni, "b": uni}; + // gl.uniform3f(shader.directionalColourUniform, directional.r, directional.g, directional.b); } gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, object.indexBuffer);