From 9b40878fcc82d3ec08361e30d2029de261f0f80e Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 13 Mar 2012 16:32:46 -0700
Subject: Fixed BumpMetal material

---
 js/document/html-document.js      | 12 +++++--
 js/helper-classes/3D/vec-utils.js | 71 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 051490f5..f4ec3184 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,9 +207,17 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 		},
         set: function(value) {
 			var elt = this.documentRoot;
-			if (elt) {
+			if (elt)
+			{
 				var nWorlds= value.length;
-				for (var i=0;  i<nWorlds;  i++) {
+				for (var i=0;  i<nWorlds;  i++)
+				{
+					/*
+					// Use this code to test the runtime version of WebGL
+					var cdm = new CanvasDataManager();
+					cdm.loadGLData(elt,  value,  null );
+					*/
+
 					var importStr = value[i];
 					var startIndex = importStr.indexOf( "id: " );
 					if (startIndex >= 0) {
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index 3db95ab7..e6db4a8d 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -191,5 +191,74 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
 
             return vec;
         }
-    }
+    },
+
+	matI :
+	{
+		value: function(dimen)
+		{
+			var mat = [];
+			for (var i=0;  i<dimen*dimen;  i++)  mat.push(0);
+
+			var index = 0;
+			for (var i=0;  i<dimen;  i++)
+			{
+				mat[index] = 1.0;
+				index += dimen + 1;
+			}
+	
+			return mat;	
+		}
+	},
+
+	matTranslation:
+	{
+		value: function (vec)
+		{
+			var mat = Matrix.I(4);
+			glmat4.translate(mat, vec);
+			return mat;
+		}
+	},
+
+	matRotationX:
+	{
+		value: function( angle )
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotateX(mat, angle);
+			return mat;
+		}
+	},
+
+	matRotationY:
+	{
+		value: function( angle )
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotateY(mat, angle);
+			return mat;
+		}
+	},
+
+	matRotationZ:
+	{
+		value: function( angle )
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotateZ(mat, angle);
+			return mat;
+		}
+	},
+
+	matRotation:
+	{
+		value: function(angle, axis)
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotate(mat, angle, axis);
+			return mat;
+		}
+	},
+
 });
\ No newline at end of file
-- 
cgit v1.2.3