Merge pull request tparisi#5 from greggman/fix-textures

daPhyre · daPhyre · commit f009846d71c2 · 2014-01-21T18:46:13.000-08:00
Fix all image to texture loading to not generate warnings
diff --git a/example01/index.html b/example01/index.html
@@ -212,7 +212,7 @@
 
     gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
 
-    gl.deleteBuffer(plotPositionBuffer)
+    gl.deleteBuffer(plotPositionBuffer.id);
 
     zoom *= 1.02;
     document.getElementById("zoomOutput").value = zoom;
diff --git a/example02/index.html b/example02/index.html
@@ -338,7 +338,7 @@
     setMatrixUniforms();
     gl.drawElements(gl.TRIANGLES, cubeVertexIndexBuffer.numItems, gl.UNSIGNED_SHORT, 0);
 
-    gl.deleteBuffer(positionBuffer);
+    gl.deleteBuffer(positionBuffer.id);
   }
 
 
diff --git a/example03/particles-01-noenable.html b/example03/particles-01-noenable.html
@@ -147,16 +147,12 @@
 
   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.bindTexture(gl.TEXTURE_2D, texture.id);
     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)
diff --git a/example03/particles-01.html b/example03/particles-01.html
@@ -147,16 +147,12 @@
 
   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.bindTexture(gl.TEXTURE_2D, texture.id);
     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)
diff --git a/example03/particles-02.html b/example03/particles-02.html
@@ -157,16 +157,12 @@
 
   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.bindTexture(gl.TEXTURE_2D, texture.id);
     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)
diff --git a/example03/particles-03.html b/example03/particles-03.html
@@ -116,7 +116,7 @@
     gl.attachShader(shaderProgram.id, fragmentShader.id);
     gl.linkProgram(shaderProgram.id);
 
-    if (!gl.getProgramParameter(shaderProgram.id.id, gl.LINK_STATUS)) {
+    if (!gl.getProgramParameter(shaderProgram.id, gl.LINK_STATUS)) {
       alert("Could not initialise shaders");
     }
 
@@ -157,16 +157,12 @@
 
   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.bindTexture(gl.TEXTURE_2D, texture.id);
     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)
diff --git a/lesson05/index.html b/lesson05/index.html
@@ -130,6 +130,11 @@
 
     function initTexture() {
         neheTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, neheTexture.id);
+        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.
         neheTexture.image = new Image();
         neheTexture.image.onload = function () {
             handleLoadedTexture(neheTexture)
diff --git a/lesson06/index.html b/lesson06/index.html
@@ -146,6 +146,11 @@
 
         for (var i=0; i < 3; i++) {
             var texture = { id: gl.createTexture() };
+            // Setup a single pixel texture to use while we wait for the image to load.
+            gl.bindTexture(gl.TEXTURE_2D, texture.id);
+            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.
             texture.image = crateImage;
             crateTextures.push(texture);
         }
diff --git a/lesson07/index.html b/lesson07/index.html
@@ -161,7 +161,12 @@
 
     function initTexture() {
         crateTexture = { id: gl.createTexture() };
-        crateTexture.image = new Image();
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, crateTexture.id);
+        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.
+       crateTexture.image = new Image();
         crateTexture.image.onload = function () {
             handleLoadedTexture(crateTexture)
         }
diff --git a/lesson08/index.html b/lesson08/index.html
@@ -163,6 +163,11 @@
 
     function initTexture() {
         glassTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, glassTexture.id);
+        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.
         glassTexture.image = new Image();
         glassTexture.image.onload = function () {
             handleLoadedTexture(glassTexture)
diff --git a/lesson09/index.html b/lesson09/index.html
@@ -134,6 +134,11 @@
 
     function initTexture() {
         starTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, starTexture.id);
+        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.
         starTexture.image = new Image();
         starTexture.image.onload = function () {
             handleLoadedTexture(starTexture)
diff --git a/lesson10/index.html b/lesson10/index.html
@@ -130,6 +130,11 @@
 
     function initTexture() {
         mudTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, mudTexture.id);
+        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.
         mudTexture.image = new Image();
         mudTexture.image.onload = function () {
             handleLoadedTexture(mudTexture)
diff --git a/lesson11/index.html b/lesson11/index.html
@@ -159,6 +159,11 @@
 
     function initTexture() {
         moonTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, moonTexture.id);
+        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.
         moonTexture.image = new Image();
         moonTexture.image.onload = function () {
             handleLoadedTexture(moonTexture)
diff --git a/lesson12/index.html b/lesson12/index.html
@@ -163,13 +163,23 @@
 
     function initTextures() {
         moonTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, moonTexture.id);
+        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.
         moonTexture.image = new Image();
         moonTexture.image.onload = function () {
             handleLoadedTexture(moonTexture)
         }
         moonTexture.image.src = "moon.gif";
 
         crateTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, crateTexture.id);
+        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.
         crateTexture.image = new Image();
         crateTexture.image.onload = function () {
             handleLoadedTexture(crateTexture)
diff --git a/lesson13/index.html b/lesson13/index.html
@@ -242,13 +242,23 @@
 
     function initTextures() {
         moonTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, moonTexture.id);
+        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.
         moonTexture.image = new Image();
         moonTexture.image.onload = function () {
             handleLoadedTexture(moonTexture)
         }
         moonTexture.image.src = "moon.gif";
 
         crateTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, crateTexture.id);
+        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.
         crateTexture.image = new Image();
         crateTexture.image.onload = function () {
             handleLoadedTexture(crateTexture)
diff --git a/lesson14/index.html b/lesson14/index.html
@@ -193,13 +193,23 @@
 
     function initTextures() {
         earthTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, earthTexture.id);
+        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.
         earthTexture.image = new Image();
         earthTexture.image.onload = function () {
             handleLoadedTexture(earthTexture)
         }
         earthTexture.image.src = "earth.jpg";
 
         galvanizedTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, galvanizedTexture.id);
+        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.
         galvanizedTexture.image = new Image();
         galvanizedTexture.image.onload = function () {
             handleLoadedTexture(galvanizedTexture)
diff --git a/lesson15/index.html b/lesson15/index.html
@@ -196,13 +196,23 @@
 
     function initTextures() {
         earthColorMapTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, earthColorMapTexture.id);
+        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.
         earthColorMapTexture.image = new Image();
         earthColorMapTexture.image.onload = function () {
             handleLoadedTexture(earthColorMapTexture)
         }
         earthColorMapTexture.image.src = "earth.jpg";
 
         earthSpecularMapTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, earthSpecularMapTexture.id);
+        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.
         earthSpecularMapTexture.image = new Image();
         earthSpecularMapTexture.image.onload = function () {
             handleLoadedTexture(earthSpecularMapTexture)
diff --git a/lesson16/index.html b/lesson16/index.html
@@ -208,13 +208,23 @@
 
     function initTextures() {
         moonTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, moonTexture.id);
+        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.
         moonTexture.image = new Image();
         moonTexture.image.onload = function () {
             handleLoadedTexture(moonTexture)
         }
         moonTexture.image.src = "moon.gif";
 
         crateTexture = { id: gl.createTexture() };
+        // Setup a single pixel texture to use while we wait for the image to load.
+        gl.bindTexture(gl.TEXTURE_2D, crateTexture.id);
+        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.
         crateTexture.image = new Image();
         crateTexture.image.onload = function () {
             handleLoadedTexture(crateTexture)
@@ -269,9 +279,9 @@
         gl.bindTexture(gl.TEXTURE_2D, rttTexture.id);
         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.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, rttFramebuffer.width, rttFramebuffer.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
+        gl.generateMipmap(gl.TEXTURE_2D);
 
         var renderbuffer = { id: gl.createRenderbuffer() };
         gl.bindRenderbuffer(gl.RENDERBUFFER, renderbuffer.id);

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@`
`338`	`338`	`setMatrixUniforms();`
`339`	`339`	`gl.drawElements(gl.TRIANGLES, cubeVertexIndexBuffer.numItems, gl.UNSIGNED_SHORT, 0);`
`340`	`340`
`341`		`- gl.deleteBuffer(positionBuffer);`
	`341`	`+ gl.deleteBuffer(positionBuffer.id);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`