Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

84 files changed, 4935 insertions, 3948 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 6268f0bb..13b36540 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -56,60 +56,64 @@ NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
 ///////////////////////////////////////////////////////////////////////
 NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
 
-    loadGLData: {
-        value: function(root, valueArray, assetPath) {
-            if (assetPath)
-                this._assetPath = assetPath.slice();
-
-            var value = valueArray;
-            var nWorlds = value.length;
-            for (var i=0;  i<nWorlds;  i++)
-            {
-                var importStr = value[i];
-
-                // there should be some version information in
-                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
-                // be in the first 24 characters).
-                var index = importStr.indexOf( ';' );
-                if ((importStr[0] === 'v') && (index < 24))
-                {
-                    // JSON format.  pull off the version info
-                    importStr = importStr.substr( index+1 );
-
-                    var jObj = JSON.parse( importStr );
-                    var id = jObj.id;
-                    if (id)
-                    {
-                        var canvas = this.findCanvasWithID( id, root );
-                        if (canvas)
-                        {
+        loadGLData: {
+                value: function(root, valueArray, assetPath) {
+                        if (assetPath)
+                                this._assetPath = assetPath.slice();
+
+                        var value = valueArray;
+                        var nWorlds = value.length;
+                        for (var i=0;  i<nWorlds;  i++)
+                        {
+                                var importStr = value[i];
+
+                                // there should be some version information in
+                                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+                                // be in the first 24 characters).
+                                var index = importStr.indexOf( ';' );
+                                if ((importStr[0] === 'v') && (index < 24))
+                                {
+                                        // JSON format.  pull off the version info
+                                        importStr = importStr.substr( index+1 );
+
+                                        var jObj = JSON.parse( importStr );
+                                        var id = jObj.id;
+                                        if (id)
+                                        {
+                                                var canvas = this.findCanvasWithID( id, root );
+                                                if (canvas)
+                                                {
 //                            new NinjaCvsRt.GLRuntime( canvas, jObj,  assetPath );
-                            var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
-                            glRt.renderWorld(canvas, jObj, this._assetPath);
-                        }
-                    }
-                }
-            }
-            }
-    },
-
-    findCanvasWithID: {
-        value: function(id, elt) {
-            var cid = elt.getAttribute( "data-RDGE-id" );
-            if (cid == id)  return elt;
-
-            if (elt.children)
-            {
-                var nKids = elt.children.length;
-                for (var i=0;  i<nKids;  i++)
-                {
-                    var child = elt.children[i];
-                    var foundElt = this.findCanvasWithID( id, child );
-                    if (foundElt)  return foundElt;
-                }
-            }
-        }
-    }
+                                                        var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
+                                                        glRt.renderWorld(canvas, jObj, this._assetPath);
+                                                }
+                                                else
+                                                {
+                                                        console.log( "***** COULD NOT FIND CANVAS WITH ID " + id + " *****" );
+                                                }
+                                        }
+                                }
+                        }
+                }
+        },
+
+        findCanvasWithID: {
+                value: function(id, elt) {
+                        var cid = elt.getAttribute( "data-RDGE-id" );
+                        if (cid == id)  return elt;
+
+                        if (elt.children)
+                        {
+                                var nKids = elt.children.length;
+                                for (var i=0;  i<nKids;  i++)
+                                {
+                                        var child = elt.children[i];
+                                        var foundElt = this.findCanvasWithID( id, child );
+                                        if (foundElt)  return foundElt;
+                                }