7 files changed, 207 insertions, 38 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 051490f5..d4db6e2f 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,9 +207,18 @@ 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) {
@@ -236,6 +245,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                         }
                                                 }
                                         }
+                                        // */
                                 }
                         }
                 }
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
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();

         }

 }

 

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index f285f24a..a64980e0 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -325,9 +325,11 @@ var GeomObj = function GLGeomObj() {
                         if (mat)
                                 mat.import( importStr );
 
-                        var endIndex = importStr.indexOf( "endMaterial\n" );
+                        // pull off the end of the material 
+                        var endMat = "endMaterial\n";
+                        var endIndex = importStr.indexOf( endMat );
                         if (endIndex < 0)  break;
-                        importStr = importStr.substr( endIndex );
+                        importStr = importStr.substr( endIndex + endMat.length );
                 }
         }
 
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index 97e4f646..fff0e68e 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -102,13 +102,7 @@ var FlatMaterial = function FlatMaterial() {
         try
         {
             var color  = eval( "[" + pu.nextValue( "color: " ) + "]" );
-
             this.setProperty( "color",  color);
-
-            var endKey = "endMaterial\n";
-            var index = importStr.indexOf( endKey );
-            index += endKey.length;
-            rtnStr = importStr.substr( index );
         }
         catch (e)
         {
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 655d8e2a..91f43754 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -4,6 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
+var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
 
 var UberMaterial = function UberMaterial() {
@@ -375,19 +376,111 @@ var UberMaterial = function UberMaterial() {
         var endKey = "endMaterial\n";
         var index = importStr.indexOf( endKey );
         index += endKey.length;
-        importStr = importStr.substr( index );
+        importStr = importStr.slice( 0, index );