Merge pull request tparisi#1 from greggman/remove-viewportwidth

daPhyre · daPhyre · commit b9f98d3260ee · 2014-01-21T13:01:45.000-08:00
Remove gl.viewportWidth and gl.viewportHeight
diff --git a/example01/index.html b/example01/index.html
@@ -88,8 +88,6 @@
   function initGL(canvas) {
     try {
       gl = canvas.getContext("experimental-webgl");
-      gl.viewportWidth = canvas.width;
-      gl.viewportHeight = canvas.height;
     } catch(e) {
     }
     if (!gl) {
@@ -191,7 +189,7 @@
       [-2.2, -1.2],
   ];
   function drawScene() {
-    gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+    gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
     gl.bindBuffer(gl.ARRAY_BUFFER, vertexPositionBuffer.id);
diff --git a/example02/index.html b/example02/index.html
@@ -126,8 +126,6 @@
   function initGL(canvas) {
     try {
       gl = canvas.getContext("experimental-webgl");
-      gl.viewportWidth = canvas.width;
-      gl.viewportHeight = canvas.height;
     } catch(e) {
     }
     if (!gl) {
@@ -487,10 +485,10 @@
 
 
   function drawScene() {
-    gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+    gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-    mat4.perspective(45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0, pMatrix);
+    mat4.perspective(45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0, pMatrix);
 
     for (var i in cubes) {
       cubes[i].draw();
diff --git a/example03/particles-01-noenable.html b/example03/particles-01-noenable.html
@@ -56,8 +56,6 @@
   function initGL(canvas) {
     try {
       gl = canvas.getContext("experimental-webgl");
-      gl.viewportWidth = canvas.width;
-      gl.viewportHeight = canvas.height;
     } catch(e) {
     }
     if (!gl) {
@@ -204,7 +202,7 @@
   var centerPos;
   var color;
   function drawScene() {
-    gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+    gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
 
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
diff --git a/example03/particles-01.html b/example03/particles-01.html
@@ -56,8 +56,6 @@
   function initGL(canvas) {
     try {
       gl = canvas.getContext("experimental-webgl");
-      gl.viewportWidth = canvas.width;
-      gl.viewportHeight = canvas.height;
     } catch(e) {
     }
     if (!gl) {
@@ -204,7 +202,7 @@
   var centerPos;
   var color;
   function drawScene() {
-    gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+    gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
 
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
diff --git a/example03/particles-02.html b/example03/particles-02.html
@@ -62,8 +62,6 @@
   function initGL(canvas) {
     try {
       gl = canvas.getContext("experimental-webgl");
-      gl.viewportWidth = canvas.width;
-      gl.viewportHeight = canvas.height;
     } catch(e) {
     }
     if (!gl) {
@@ -261,7 +259,7 @@
   var centerPos;
   var color;
   function drawScene() {
-    gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+    gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
 
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
diff --git a/example03/particles-03.html b/example03/particles-03.html
@@ -62,8 +62,6 @@
   function initGL(canvas) {
     try {
       gl = canvas.getContext("experimental-webgl");
-      gl.viewportWidth = canvas.width;
-      gl.viewportHeight = canvas.height;
     } catch(e) {
     }
     if (!gl) {
@@ -272,7 +270,7 @@
   var centerPos;
   var color;
   function drawScene() {
-    gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+    gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
 
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
diff --git a/lesson01/index.html b/lesson01/index.html
@@ -32,8 +32,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -143,10 +141,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson02/index.html b/lesson02/index.html
@@ -39,8 +39,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -177,10 +175,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson03/index.html b/lesson03/index.html
@@ -40,8 +40,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -201,10 +199,10 @@
     var rSquare = 0;
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson04/index.html b/lesson04/index.html
@@ -40,8 +40,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -289,10 +287,10 @@
     var rCube = 0;
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson05/index.html b/lesson05/index.html
@@ -43,8 +43,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -281,10 +279,10 @@
     var zRot = 0;
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson06/index.html b/lesson06/index.html
@@ -43,8 +43,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -353,10 +351,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson07/index.html b/lesson07/index.html
@@ -62,8 +62,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -408,10 +406,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson08/index.html b/lesson08/index.html
@@ -64,8 +64,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -410,10 +408,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson09/index.html b/lesson09/index.html
@@ -45,8 +45,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -341,10 +339,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         gl.blendFunc(gl.SRC_ALPHA, gl.ONE);
         gl.enable(gl.BLEND);
diff --git a/lesson10/index.html b/lesson10/index.html
@@ -42,8 +42,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -283,14 +281,14 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
         if (worldVertexTextureCoordBuffer == null || worldVertexPositionBuffer == null) {
             return;
         }
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         mat4.identity(mvMatrix);
 
diff --git a/lesson11/index.html b/lesson11/index.html
@@ -62,8 +62,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -328,10 +326,10 @@
 
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         var lighting = document.getElementById("lighting").checked;
         gl.uniform1i(shaderProgram.useLightingUniform, lighting);
diff --git a/lesson12/index.html b/lesson12/index.html
@@ -65,8 +65,6 @@
     function initGL(canvas) {
         try {
             gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
-            gl.viewportWidth = canvas.width;
-            gl.viewportHeight = canvas.height;
         } catch (e) {
         }
         if (!gl) {
@@ -448,10 +446,10 @@
     var cubeAngle = 0;
 
     function drawScene() {
-        gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight);
+        gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        mat4.perspective(pMatrix, 45, gl.viewportWidth / gl.viewportHeight, 0.1, 100.0);
+        mat4.perspective(pMatrix, 45, gl.canvas.clientWidth / gl.canvas.clientHeight, 0.1, 100.0);
 
         var lighting = document.getElementById("lighting").checked;
         gl.uniform1i(shaderProgram.useLightingUniform, lighting);
diff --git a/lesson13/index.html b/lesson13/index.html
diff --git a/lesson14/index.html b/lesson14/index.html
diff --git a/lesson15/index.html b/lesson15/index.html
diff --git a/lesson16/index.html b/lesson16/index.html
