Reverted last commit.

gero3 · Mar 17, 2011 · c906f97 · c906f97
1 parent ebf63e9
commit c906f97
Showing 1 changed file with 34 additions and 39 deletions.
diff --git a/webgl-2d.js b/webgl-2d.js
@@ -102,45 +102,40 @@
     }
   }; 
 
-  var mat3 = (function() {
-    // Scratch space for mat3.multiply result. Allocate once, use many
-    var multiplyResult = new Array(9);
-
-    return {
-      identity: [1.0, 0.0, 0.0,
-                 0.0, 1.0, 0.0,
-                 0.0, 0.0, 1.0],
-
-      multiply: function (m1, m2) {
-        // Cut down on array element lookups 18 vs 54
-        var m10 = m1[0], m11 = m1[1], m12 = m1[2], m13 = m1[3], m14 = m1[4], m15 = m1[5], m16 = m1[6], m17 = m1[7], m18 = m1[8],
-            m20 = m2[0], m21 = m2[1], m22 = m2[2], m23 = m2[3], m24 = m2[4], m25 = m2[5], m26 = m2[6], m27 = m2[7], m28 = m2[8];
-
-        multiplyResult[0] = m20 * m10 + m23 * m11 + m26 * m12;
-        multiplyResult[1] = m21 * m10 + m24 * m11 + m27 * m12;
-        multiplyResult[2] = m22 * m10 + m25 * m11 + m28 * m12;
-        multiplyResult[3] = m20 * m13 + m23 * m14 + m26 * m15;
-        multiplyResult[4] = m21 * m13 + m24 * m14 + m27 * m15;
-        multiplyResult[5] = m22 * m13 + m25 * m14 + m28 * m15;
-        multiplyResult[6] = m20 * m16 + m23 * m17 + m26 * m18;
-        multiplyResult[7] = m21 * m16 + m24 * m17 + m27 * m18;
-        multiplyResult[8] = m22 * m16 + m25 * m17 + m28 * m18;
-
-        return multiplyResult;
-      },
-
-      vec2_multiply: function (m1, m2) {
-        var mOut = [];
-        mOut[0] = m2[0] * m1[0] + m2[3] * m1[1] + m2[6];
-        mOut[1] = m2[1] * m1[0] + m2[4] * m1[1] + m2[7];
-        return mOut;
-      },
-
-      transpose: function (m) {
-        return [m[0], m[3], m[6], m[1], m[4], m[7], m[2], m[5], m[8]];
-      }
-    };
-  }());
+  var mat3 = {
+    identity: [1.0, 0.0, 0.0,
+               0.0, 1.0, 0.0,
+               0.0, 0.0, 1.0],
+
+    multiply: function (m1, m2) {
+      var m10 = m1[0], m11 = m1[1], m12 = m1[2], m13 = m1[3], m14 = m1[4], m15 = m1[5], m16 = m1[6], m17 = m1[7], m18 = m1[8],
+          m20 = m2[0], m21 = m2[1], m22 = m2[2], m23 = m2[3], m24 = m2[4], m25 = m2[5], m26 = m2[6], m27 = m2[7], m28 = m2[8],
+          mOut = [];
+
+      mOut[0] = m20 * m10 + m23 * m11 + m26 * m12;
+      mOut[1] = m21 * m10 + m24 * m11 + m27 * m12;
+      mOut[2] = m22 * m10 + m25 * m11 + m28 * m12;
+      mOut[3] = m20 * m13 + m23 * m14 + m26 * m15;
+      mOut[4] = m21 * m13 + m24 * m14 + m27 * m15;
+      mOut[5] = m22 * m13 + m25 * m14 + m28 * m15;
+      mOut[6] = m20 * m16 + m23 * m17 + m26 * m18;
+      mOut[7] = m21 * m16 + m24 * m17 + m27 * m18;
+      mOut[8] = m22 * m16 + m25 * m17 + m28 * m18;
+
+      return mOut;
+    },
+
+    vec2_multiply: function (m1, m2) {
+      var mOut = [];
+      mOut[0] = m2[0] * m1[0] + m2[3] * m1[1] + m2[6];
+      mOut[1] = m2[1] * m1[0] + m2[4] * m1[1] + m2[7];
+      return mOut;
+    },
+
+    transpose: function (m) {
+      return [m[0], m[3], m[6], m[1], m[4], m[7], m[2], m[5], m[8]];
+    }
+  }; //mat3
 
   // Transform library from CubicVR.js
   function Transform(mat) {