# HG changeset patch
# User Eugen Sawin <sawine@me73.com>
# Date 1304129817 -7200
# Node ID 97af0c06047975a226231b21c63dc6717f6a735e
# Parent  a828c4cde5b3bd34f3179dea029e1e12c7328723
Added mipmapping.

diff -r a828c4cde5b3 -r 97af0c060479 machine.html
--- a/machine.html	Sat Apr 30 04:05:47 2011 +0200
+++ b/machine.html	Sat Apr 30 04:16:57 2011 +0200
@@ -46,15 +46,16 @@
             lightWeighting = uAmbientColour + uPointLightingSpecularColour * specularLightWeighting
                              + uPointLightingDiffuseColour * diffuseLightWeighting;
         }  
+        vec4 colour;
         if (uUseTexture)
         {
-            vec4 colour = texture2D(uSampler, vec2(vTextureCoord.s, vTextureCoord.t));
-            gl_FragColor = vec4(colour.rgb * lightWeighting, colour.a);
+            colour = texture2D(uSampler, vec2(vTextureCoord.s, vTextureCoord.t));
         }
         else
         {
-            gl_FragColor = vec4(vColour.rgb * lightWeighting, vColour.a);
+            colour  = vColour;
         }
+        gl_FragColor = vec4(colour.rgb * lightWeighting, colour.a);
     }
 </script> 
  
diff -r a828c4cde5b3 -r 97af0c060479 scripts/machine.js
--- a/scripts/machine.js	Sat Apr 30 04:05:47 2011 +0200
+++ b/scripts/machine.js	Sat Apr 30 04:16:57 2011 +0200
@@ -58,8 +58,9 @@
     gl.bindTexture(gl.TEXTURE_2D, texture.hnd);
     gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, texture.image);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR_MIPMAP_NEAREST);
+    gl.generateMipmap(gl.TEXTURE_2D);
     gl.bindTexture(gl.TEXTURE_2D, null);
 }