From 46defc9bd11bf077efd672c72787a3b67da1a178 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 12 Mar 2012 14:59:08 -0700
Subject: Uber material changes for IO

---
 js/helper-classes/RDGE/src/core/script/MeshManager.js |  2 +-
 js/helper-classes/RDGE/src/core/script/run_state.js   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 43813078..7dfc79d4 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -69,7 +69,7 @@ MeshManager.prototype.deleteMesh = function (name)
 	if (model)
 	{
 		g_Engine.ctxMan.forEach(function(context)
-		{
+		{
 			context.renderer.deletePrimitive(model.primitive);
 		});
 
diff --git a/js/helper-classes/RDGE/src/core/script/run_state.js b/js/helper-classes/RDGE/src/core/script/run_state.js
index acdb6797..a5981caa 100755
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -30,9 +30,9 @@ RunState.prototype.Init = function()
 		this.userRunState.init();
 	}
 
-	if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
-		this.userRunState.onRunState();
-
+	if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+		this.userRunState.onRunState();
+
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -97,11 +97,11 @@ RunState.prototype.ReInit = function()
 	if(!this.initialized)
 	{
 		this.Init();
-	}
-	else
-	{
-		if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
-			this.userRunState.onRunState();
+	}
+	else
+	{
+		if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+			this.userRunState.onRunState();
 	}
 }
 
-- 
cgit v1.2.3


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/helper-classes/3D/vec-utils.js | 71 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

(limited to 'js/helper-classes')

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


From e33b3ce6f7b6789cfe854d4a6a8bb5bd57b8ae37 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 20 Mar 2012 06:45:06 -0700
Subject: Fixing error in drawUtils when closing document - should set
 _eltArray and _planesArray's length to 0 instead of setting the arrays to
 null.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/draw-utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 1c00f7ea..d6334e6c 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -139,8 +139,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
     handleCloseDocument:{
         value: function() {
             if(this.application.ninja.documentController._documents.length === 0){
-                this._eltArray = null;
-                this._planesArray = null;
+                this._eltArray.length = 0;
+                this._planesArray.length = 0;
             }
         }
     },
-- 
cgit v1.2.3