machine.html
changeset 37 97af0c060479
parent 36 a828c4cde5b3
     1.1 --- a/machine.html	Sat Apr 30 04:05:47 2011 +0200
     1.2 +++ b/machine.html	Sat Apr 30 04:16:57 2011 +0200
     1.3 @@ -46,15 +46,16 @@
     1.4              lightWeighting = uAmbientColour + uPointLightingSpecularColour * specularLightWeighting
     1.5                               + uPointLightingDiffuseColour * diffuseLightWeighting;
     1.6          }  
     1.7 +        vec4 colour;
     1.8          if (uUseTexture)
     1.9          {
    1.10 -            vec4 colour = texture2D(uSampler, vec2(vTextureCoord.s, vTextureCoord.t));
    1.11 -            gl_FragColor = vec4(colour.rgb * lightWeighting, colour.a);
    1.12 +            colour = texture2D(uSampler, vec2(vTextureCoord.s, vTextureCoord.t));
    1.13          }
    1.14          else
    1.15          {
    1.16 -            gl_FragColor = vec4(vColour.rgb * lightWeighting, vColour.a);
    1.17 +            colour  = vColour;
    1.18          }
    1.19 +        gl_FragColor = vec4(colour.rgb * lightWeighting, colour.a);
    1.20      }
    1.21  </script> 
    1.22