esangel · rbrito · Jul 18, 2015 · Jul 18, 2015 · Jul 18, 2015 · Jul 18, 2015
diff --git a/Chap10/README.txt b/Chap10/README.txt
diff --git a/Chap10/mandelbrot1.html b/Chap10/mandelbrot1.html
diff --git a/Chap10/mandelbrot1.js b/Chap10/mandelbrot1.js
diff --git a/Chap10/mandelbrot2.html b/Chap10/mandelbrot2.html
diff --git a/Chap10/mandelbrot2.js b/Chap10/mandelbrot2.js
diff --git a/Chap10/particleSystem.html b/Chap10/particleSystem.html
diff --git a/Chap10/particleSystem.js b/Chap10/particleSystem.js
diff --git a/Chap11/README.txt b/Chap11/README.txt
diff --git a/Chap11/patches.js b/Chap11/patches.js
diff --git a/Chap11/teapot1.html b/Chap11/teapot1.html
diff --git a/Chap11/teapot1.js b/Chap11/teapot1.js
diff --git a/Chap11/teapot2.html b/Chap11/teapot2.html
diff --git a/Chap11/teapot2.js b/Chap11/teapot2.js
diff --git a/Chap11/teapot3.html b/Chap11/teapot3.html
diff --git a/Chap11/teapot3.js b/Chap11/teapot3.js
diff --git a/Chap11/teapot4.html b/Chap11/teapot4.html
diff --git a/Chap11/teapot4.js b/Chap11/teapot4.js
diff --git a/Chap11/teapot5.html b/Chap11/teapot5.html
diff --git a/Chap11/teapot5.js b/Chap11/teapot5.js
diff --git a/Chap11/teapot6.html b/Chap11/teapot6.html
diff --git a/Chap11/teapot7.html b/Chap11/teapot7.html
diff --git a/Chap11/vertices.js b/Chap11/vertices.js
diff --git a/Chap2/README.txt b/Chap2/README.txt
diff --git a/Chap2/gasket1.html b/Chap2/gasket1.html
diff --git a/Chap2/gasket1.js b/Chap2/gasket1.js
diff --git a/Chap2/gasket1v2.html b/Chap2/gasket1v2.html
diff --git a/Chap2/gasket1v2.js b/Chap2/gasket1v2.js
diff --git a/Chap2/gasket2.html b/Chap2/gasket2.html
diff --git a/Chap2/gasket2.js b/Chap2/gasket2.js
diff --git a/Chap2/gasket3.html b/Chap2/gasket3.html
diff --git a/Chap2/gasket3.js b/Chap2/gasket3.js
diff --git a/Chap2/gasket4.html b/Chap2/gasket4.html
diff --git a/Chap2/gasket4.js b/Chap2/gasket4.js
diff --git a/Chap2/shaders/fshader21.glsl b/Chap2/shaders/fshader21.glsl
diff --git a/Chap2/shaders/vshader21.glsl b/Chap2/shaders/vshader21.glsl
diff --git a/Chap3/README.txt b/Chap3/README.txt
diff --git a/Chap3/cad1.html b/Chap3/cad1.html
diff --git a/Chap3/cad1.js b/Chap3/cad1.js
diff --git a/Chap3/cad2.html b/Chap3/cad2.html
diff --git a/Chap3/cad2.js b/Chap3/cad2.js
diff --git a/Chap3/gasket5.html b/Chap3/gasket5.html
diff --git a/Chap3/gasket5.js b/Chap3/gasket5.js
diff --git a/Chap3/square.html b/Chap3/square.html
diff --git a/Chap3/square.js b/Chap3/square.js
diff --git a/Chap3/squarem.html b/Chap3/squarem.html
diff --git a/Chap3/squarem.js b/Chap3/squarem.js
diff --git a/Chap3/triangle.html b/Chap3/triangle.html
diff --git a/Chap3/triangle.js b/Chap3/triangle.js
diff --git a/Chap4/README.txt b/Chap4/README.txt
diff --git a/Chap4/cube.html b/Chap4/cube.html
diff --git a/Chap4/cube.js b/Chap4/cube.js
diff --git a/Chap4/cubeq.html b/Chap4/cubeq.html
diff --git a/Chap4/cubeq.js b/Chap4/cubeq.js
diff --git a/Chap4/cubev.html b/Chap4/cubev.html
diff --git a/Chap4/cubev.js b/Chap4/cubev.js
diff --git a/Chap4/trackball.html b/Chap4/trackball.html
diff --git a/Chap4/trackball.js b/Chap4/trackball.js
diff --git a/Chap4/trackballQuaterion.html b/Chap4/trackballQuaterion.html
diff --git a/Chap4/trackballQuaterion.js b/Chap4/trackballQuaterion.js
diff --git a/Chap5/README.txt b/Chap5/README.txt
diff --git a/Chap5/hat.html b/Chap5/hat.html
diff --git a/Chap5/hat.js b/Chap5/hat.js
diff --git a/Chap5/hata.html b/Chap5/hata.html
diff --git a/Chap5/hata.js b/Chap5/hata.js
diff --git a/Chap5/ortho.html b/Chap5/ortho.html
diff --git a/Chap5/ortho.js b/Chap5/ortho.js
diff --git a/Chap5/ortho1.html b/Chap5/ortho1.html
diff --git a/Chap5/ortho1.js b/Chap5/ortho1.js
diff --git a/Chap5/ortho2.html b/Chap5/ortho2.html
diff --git a/Chap5/ortho2.js b/Chap5/ortho2.js
diff --git a/Chap5/perspective.html b/Chap5/perspective.html
diff --git a/Chap5/perspective.js b/Chap5/perspective.js
diff --git a/Chap5/perspective1.html b/Chap5/perspective1.html
diff --git a/Chap5/perspective1.js b/Chap5/perspective1.js
diff --git a/Chap5/perspective2.html b/Chap5/perspective2.html
diff --git a/Chap5/perspective2.js b/Chap5/perspective2.js
diff --git a/Chap5/shadow.html b/Chap5/shadow.html
diff --git a/Chap5/shadow.js b/Chap5/shadow.js
diff --git a/Chap6/README.txt b/Chap6/README.txt
diff --git a/Chap6/shadedCube.html b/Chap6/shadedCube.html
diff --git a/Chap6/shadedCube.js b/Chap6/shadedCube.js
diff --git a/Chap6/shadedSphere1.html b/Chap6/shadedSphere1.html
diff --git a/Chap6/shadedSphere1.js b/Chap6/shadedSphere1.js
diff --git a/Chap6/shadedSphere2.html b/Chap6/shadedSphere2.html
diff --git a/Chap6/shadedSphere2.js b/Chap6/shadedSphere2.js
diff --git a/Chap6/shadedSphere3.html b/Chap6/shadedSphere3.html
diff --git a/Chap6/shadedSphere3.js b/Chap6/shadedSphere3.js
diff --git a/Chap6/shadedSphere4.html b/Chap6/shadedSphere4.html
diff --git a/Chap6/shadedSphere4.js b/Chap6/shadedSphere4.js
diff --git a/Chap6/shadedSphereEyeSpace.html b/Chap6/shadedSphereEyeSpace.html
diff --git a/Chap6/shadedSphereEyeSpace.js b/Chap6/shadedSphereEyeSpace.js
diff --git a/Chap6/shadedSphereObjectSpace.html b/Chap6/shadedSphereObjectSpace.html
diff --git a/Chap6/shadedSphereObjectSpace.js b/Chap6/shadedSphereObjectSpace.js
diff --git a/Chap6/wireSphere.html b/Chap6/wireSphere.html
diff --git a/Chap6/wireSphere.js b/Chap6/wireSphere.js
diff --git a/Chap7/README.txt b/Chap7/README.txt
diff --git a/Chap7/SA2011_black.gif b/Chap7/SA2011_black.gif
diff --git a/Chap7/bumpMap.html b/Chap7/bumpMap.html
diff --git a/Chap7/bumpMap.js b/Chap7/bumpMap.js
diff --git a/Chap7/bumpMap2.html b/Chap7/bumpMap2.html
diff --git a/Chap7/bumpMap2.js b/Chap7/bumpMap2.js
diff --git a/Chap7/cubet.html b/Chap7/cubet.html
diff --git a/Chap7/cubet.js b/Chap7/cubet.js
diff --git a/Chap7/hatImage1.html b/Chap7/hatImage1.html
diff --git a/Chap7/hatImage1.js b/Chap7/hatImage1.js
diff --git a/Chap7/hatImage2.html b/Chap7/hatImage2.html
diff --git a/Chap7/hatImage2.js b/Chap7/hatImage2.js
diff --git a/Chap7/hawaiiImage.html b/Chap7/hawaiiImage.html
diff --git a/Chap7/hawaiiImage.js b/Chap7/hawaiiImage.js
diff --git a/Chap7/hawaiiIsobel.html b/Chap7/hawaiiIsobel.html
diff --git a/Chap7/hawaiisobel.js b/Chap7/hawaiisobel.js
diff --git a/Chap7/honolulu256.js b/Chap7/honolulu256.js
diff --git a/Chap7/honolulu4.js b/Chap7/honolulu4.js
diff --git a/Chap7/pickCube.html b/Chap7/pickCube.html
diff --git a/Chap7/pickCube.js b/Chap7/pickCube.js
diff --git a/Chap7/pickCube2.html b/Chap7/pickCube2.html
diff --git a/Chap7/pickCube2.js b/Chap7/pickCube2.js
diff --git a/Chap7/pickCube3.html b/Chap7/pickCube3.html
diff --git a/Chap7/pickCube3.js b/Chap7/pickCube3.js
diff --git a/Chap7/pickCube4.html b/Chap7/pickCube4.html
diff --git a/Chap7/pickCube4.js b/Chap7/pickCube4.js
diff --git a/Chap7/pickCube5.html b/Chap7/pickCube5.html
diff --git a/Chap7/pickCube5.js b/Chap7/pickCube5.js
diff --git a/Chap7/reflectiingCube.html b/Chap7/reflectiingCube.html
diff --git a/Chap7/reflectingCube.js b/Chap7/reflectingCube.js
diff --git a/Chap7/reflectingSphere.html b/Chap7/reflectingSphere.html
diff --git a/Chap7/reflectingSphere.js b/Chap7/reflectingSphere.js
diff --git a/Chap7/reflectionMap.html b/Chap7/reflectionMap.html
diff --git a/Chap7/reflectionMap.js b/Chap7/reflectionMap.js
diff --git a/Chap7/reflectionMap2.html b/Chap7/reflectionMap2.html
diff --git a/Chap7/reflectionMap2.js b/Chap7/reflectionMap2.js
diff --git a/Chap7/render1.html b/Chap7/render1.html
diff --git a/Chap7/render1.js b/Chap7/render1.js
diff --git a/Chap7/render1v2.html b/Chap7/render1v2.html
diff --git a/Chap7/render1v2.js b/Chap7/render1v2.js
diff --git a/Chap7/render3.html b/Chap7/render3.html
diff --git a/Chap7/render3.js b/Chap7/render3.js
diff --git a/Chap7/render4.html b/Chap7/render4.html
diff --git a/Chap7/render4.js b/Chap7/render4.js
diff --git a/Chap7/render5.html b/Chap7/render5.html
diff --git a/Chap7/render5.js b/Chap7/render5.js
diff --git a/Chap7/textureCube1.html b/Chap7/textureCube1.html
diff --git a/Chap7/textureCube1.js b/Chap7/textureCube1.js
diff --git a/Chap7/textureCubev2.html b/Chap7/textureCubev2.html
diff --git a/Chap7/textureCubev2.js b/Chap7/textureCubev2.js
diff --git a/Chap7/textureCubev3.html b/Chap7/textureCubev3.html
diff --git a/Chap7/textureCubev3.js b/Chap7/textureCubev3.js
diff --git a/Chap7/textureCubev4.html b/Chap7/textureCubev4.html
diff --git a/Chap7/textureCubev4.js b/Chap7/textureCubev4.js
diff --git a/Chap7/textureSquare.html b/Chap7/textureSquare.html
diff --git a/Chap7/textureSquare.js b/Chap7/textureSquare.js
diff --git a/Chap9/README.txt b/Chap9/README.txt
diff --git a/Chap9/figure.html b/Chap9/figure.html
diff --git a/Chap9/figure.js b/Chap9/figure.js
diff --git a/Chap9/robotArm.html b/Chap9/robotArm.html
diff --git a/Chap9/robotArm.js b/Chap9/robotArm.js
diff --git a/Common/MV.js b/Common/MV.js
diff --git a/Common/README.txt b/Common/README.txt
diff --git a/Common/initShaders.js b/Common/initShaders.js
@@ -6,48 +6,47 @@ function initShaders( gl, vertexShaderId, fragmentShaderId )
 {
     var vertShdr;
     var fragShdr;
+    var msg;
 
     var vertElem = document.getElementById( vertexShaderId );
-    if ( !vertElem ) { 
+    if ( !vertElem ) {
         alert( "Unable to load vertex shader " + vertexShaderId );
         return -1;
     }
-    else {
-        vertShdr = gl.createShader( gl.VERTEX_SHADER );
-        gl.shaderSource( vertShdr, vertElem.text );
-        gl.compileShader( vertShdr );
-        if ( !gl.getShaderParameter(vertShdr, gl.COMPILE_STATUS) ) {
-            var msg = "Vertex shader failed to compile.  The error log is:"
-        	+ "<pre>" + gl.getShaderInfoLog( vertShdr ) + "</pre>";
-            alert( msg );
-            return -1;
-        }
+
+    vertShdr = gl.createShader( gl.VERTEX_SHADER );
+    gl.shaderSource( vertShdr, vertElem.text );
+    gl.compileShader( vertShdr );
+    if ( !gl.getShaderParameter(vertShdr, gl.COMPILE_STATUS) ) {
+        msg = "Vertex shader failed to compile.  The error log is:"
+            + "<pre>" + gl.getShaderInfoLog( vertShdr ) + "</pre>";
+        alert( msg );
+        return -1;
     }
 
     var fragElem = document.getElementById( fragmentShaderId );
-    if ( !fragElem ) { 
+    if ( !fragElem ) {
         alert( "Unable to load vertex shader " + fragmentShaderId );
         return -1;
     }
-    else {
-        fragShdr = gl.createShader( gl.FRAGMENT_SHADER );
-        gl.shaderSource( fragShdr, fragElem.text );
-        gl.compileShader( fragShdr );
-        if ( !gl.getShaderParameter(fragShdr, gl.COMPILE_STATUS) ) {
-            var msg = "Fragment shader failed to compile.  The error log is:"
-        	+ "<pre>" + gl.getShaderInfoLog( fragShdr ) + "</pre>";
-            alert( msg );
-            return -1;
-        }
+
+    fragShdr = gl.createShader( gl.FRAGMENT_SHADER );
+    gl.shaderSource( fragShdr, fragElem.text );
+    gl.compileShader( fragShdr );
+    if ( !gl.getShaderParameter(fragShdr, gl.COMPILE_STATUS) ) {
+        msg = "Fragment shader failed to compile.  The error log is:"
+            + "<pre>" + gl.getShaderInfoLog( fragShdr ) + "</pre>";
+        alert( msg );
+        return -1;
     }
 
     var program = gl.createProgram();
     gl.attachShader( program, vertShdr );
     gl.attachShader( program, fragShdr );
     gl.linkProgram( program );
-    
+
     if ( !gl.getProgramParameter(program, gl.LINK_STATUS) ) {
-        var msg = "Shader program failed to link.  The error log is:"
+        msg = "Shader program failed to link.  The error log is:"
             + "<pre>" + gl.getProgramInfoLog( program ) + "</pre>";
         alert( msg );
         return -1;

diff --git a/Common/initShaders2.js b/Common/initShaders2.js
@@ -1,44 +1,42 @@
+// Get a file as a string using  AJAX
+function loadFileAJAX(name) {
+    var xhr = new XMLHttpRequest(),
+        okStatus = document.location.protocol === "file:" ? 0 : 200;
+    xhr.open('GET', name, false);
+    xhr.send(null);
+    return xhr.status == okStatus ? xhr.responseText : null;
+};
 
-    // Get a file as a string using  AJAX
-    function loadFileAJAX(name) {
-        var xhr = new XMLHttpRequest(),
-            okStatus = document.location.protocol === "file:" ? 0 : 200;
-        xhr.open('GET', name, false);
-        xhr.send(null);
-        return xhr.status == okStatus ? xhr.responseText : null;
-    };
 
-
-    function initShaders(gl, vShaderName, fShaderName) {
-        function getShader(gl, shaderName, type) {
-            var shader = gl.createShader(type),
-                shaderScript = loadFileAJAX(shaderName);
-            if (!shaderScript) {
-                alert("Could not find shader source: "+shaderName);
-            }
-            gl.shaderSource(shader, shaderScript);
-            gl.compileShader(shader);
-
-            if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
-                alert(gl.getShaderInfoLog(shader));
-                return null;
-            }
-            return shader;
+function initShaders(gl, vShaderName, fShaderName) {
+    function getShader(gl, shaderName, type) {
+        var shader = gl.createShader(type),
+            shaderScript = loadFileAJAX(shaderName);
+        if (!shaderScript) {
+            alert("Could not find shader source: "+shaderName);
         }
-        var vertexShader = getShader(gl, vShaderName, gl.VERTEX_SHADER),
-            fragmentShader = getShader(gl, fShaderName, gl.FRAGMENT_SHADER),
-            program = gl.createProgram();
-
-        gl.attachShader(program, vertexShader);
-        gl.attachShader(program, fragmentShader);
-        gl.linkProgram(program);
+        gl.shaderSource(shader, shaderScript);
+        gl.compileShader(shader);
 
-        if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
-            alert("Could not initialise shaders");
+        if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+            alert(gl.getShaderInfoLog(shader));
             return null;
         }
+        return shader;
+    }
+    var vertexShader = getShader(gl, vShaderName, gl.VERTEX_SHADER),
+        fragmentShader = getShader(gl, fShaderName, gl.FRAGMENT_SHADER),
+        program = gl.createProgram();
+
+    gl.attachShader(program, vertexShader);
+    gl.attachShader(program, fragmentShader);
+    gl.linkProgram(program);
+
+    if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+        alert("Could not initialise shaders");
+        return null;
+    }
 
-
-        return program;
-    };
 
+    return program;
+};