Merge branch 'greggman-fix-particle-examples'

Conflicts:
	example03/particles-01-noenable.html
	example03/particles-01.html
	example03/particles-02.html
	example03/particles-03.html

Author: daPhyre

example01/index.html

@@ -226,6 +226,7 @@
     }
     document.getElementById("centerOffsetYOutput").value = centerOffsetY;
 
+    requestAnimationFrame(drawScene);
   }
 
 
@@ -246,7 +247,7 @@
 
     gl.clearColor(0.0, 0.0, 0.0, 1.0);
 
-    setInterval(drawScene, 15);
+    drawScene();
   }
 
 

example03/particles-01-noenable.html

@@ -147,7 +147,16 @@
 
   var texture;
   function initTexture() {
+<<<<<<< HEAD
     texture = { id: gl.createTexture() };
+=======
+    texture = gl.createTexture();
+    // Setup a single pixel texture to use while we wait for the image to load.
+    gl.bindTexture(gl.TEXTURE_2D, texture);
+    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE,
+                  new Uint8Array([0, 0, 255, 255]));
+    // Load image asynchronously.
+>>>>>>> greggman-fix-particle-examples
     texture.image = new Image();
     texture.image.onload = function() {
       handleLoadedTexture(texture)
@@ -252,6 +261,7 @@
   function tick() {
     animate();
     drawScene();
+    requestAnimationFrame(tick);
   }
 
 
@@ -263,7 +273,7 @@
 
     gl.clearColor(0.0, 0.0, 0.0, 1.0);
 
-    setInterval(tick, 15);
+    tick();
   }
 
 

example03/particles-01.html

@@ -147,7 +147,16 @@
 
   var texture;
   function initTexture() {
+<<<<<<< HEAD
     texture = { id: gl.createTexture() };
+=======
+    texture = gl.createTexture();
+    // Setup a single pixel texture to use while we wait for the image to load.
+    gl.bindTexture(gl.TEXTURE_2D, texture);
+    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE,
+                  new Uint8Array([0, 0, 255, 255]));
+    // Load image asynchronously.
+>>>>>>> greggman-fix-particle-examples
     texture.image = new Image();
     texture.image.onload = function() {
       handleLoadedTexture(texture)
@@ -252,6 +261,7 @@
   function tick() {
     animate();
     drawScene();
+    requestAnimationFrame(tick);
   }
 
 
@@ -261,12 +271,9 @@
     initTexture();
     initShaders();
 
-    // Hack!
-    gl.enable(0x8642);
-
     gl.clearColor(0.0, 0.0, 0.0, 1.0);
 
-    setInterval(tick, 15);
+    tick();
   }
 
 

example03/particles-02.html

@@ -157,7 +157,16 @@
 
   var texture;
   function initTexture() {
+<<<<<<< HEAD
     texture = { id: gl.createTexture() };
+=======
+    texture = gl.createTexture();
+    // Setup a single pixel texture to use while we wait for the image to load.
+    gl.bindTexture(gl.TEXTURE_2D, texture);
+    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE,
+                  new Uint8Array([0, 0, 255, 255]));
+    // Load image asynchronously.
+>>>>>>> greggman-fix-particle-examples
     texture.image = new Image();
     texture.image.onload = function() {
       handleLoadedTexture(texture)
@@ -314,6 +323,7 @@
   function tick() {
     animate();
     drawScene();
+    requestAnimationFrame(tick);
   }
 
 
@@ -326,7 +336,7 @@
 
     gl.clearColor(0.0, 0.0, 0.0, 1.0);
 
-    setInterval(tick, 15);
+    tick();
   }
 
 

example03/particles-03.html

@@ -157,7 +157,16 @@
 
   var texture;
   function initTexture() {
+<<<<<<< HEAD
     texture = { id: gl.createTexture() };
+=======
+    texture = gl.createTexture();
+    // Setup a single pixel texture to use while we wait for the image to load.
+    gl.bindTexture(gl.TEXTURE_2D, texture);
+    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE,
+                  new Uint8Array([0, 0, 255, 255]));
+    // Load image asynchronously.
+>>>>>>> greggman-fix-particle-examples
     texture.image = new Image();
     texture.image.onload = function() {
       handleLoadedTexture(texture)
@@ -326,6 +335,7 @@
   function tick() {
     animate();
     drawScene();
+    requestAnimationFrame(tick);
   }
 
 
@@ -337,7 +347,7 @@
 
     gl.clearColor(0.0, 0.0, 0.0, 1.0);
 
-    setInterval(tick, 15);
+    tick();
   }