1.1 --- a/machine.html	Wed Apr 27 13:35:56 2011 +0200
     1.2 +++ b/machine.html	Wed Apr 27 14:14:07 2011 +0200
     1.3 @@ -32,6 +32,8 @@
     1.4      uniform vec3 uAmbientColour;
     1.5      uniform vec3 uLightingDirection;
     1.6      uniform vec3 uDirectionalColour;
     1.7 +    uniform vec3 uPointLightingLocation;
     1.8 +    uniform vec3 uPointLightingColour;
     1.9  
    1.10      uniform bool uUseLighting;
    1.11  
    1.12 @@ -40,7 +42,8 @@
    1.13   
    1.14      void main(void) 
    1.15      {
    1.16 -        gl_Position = uPMatrix * uMVMatrix * vec4(aVertexPosition, 1.0);
    1.17 +        vec4 mvPosition = uMVMatrix * vec4(aVertexPosition, 1.0);
    1.18 +        gl_Position = uPMatrix * mvPosition;
    1.19          vColour = aVertexColour;
    1.20  
    1.21          if (!uUseLighting)
    1.22 @@ -49,9 +52,14 @@
    1.23          }
    1.24          else
    1.25          {
    1.26 +            //vec3 transformedNormal = uNMatrix * aVertexNormal;
    1.27 +            //float directionalLightWeighting = max(dot(transformedNormal, uLightingDirection), 0.0);
    1.28 +            //vLightWeighting = uAmbientColour + uDirectionalColour * directionalLightWeighting;
    1.29 +
    1.30 +            vec3 lightDirection = normalize(uPointLightingLocation - mvPosition.xyz);
    1.31              vec3 transformedNormal = uNMatrix * aVertexNormal;
    1.32 -            float directionalLightWeighting = max(dot(transformedNormal, uLightingDirection), 0.0);
    1.33 -            vLightWeighting = uAmbientColour + uDirectionalColour * directionalLightWeighting;
    1.34 +            float directionalLightWeighting = max(dot(transformedNormal, lightDirection), 0.0);
    1.35 +            vLightWeighting = uAmbientColour + uPointLightingColour * directionalLightWeighting;
    1.36          }
    1.37      }
    1.38  </script>