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

Conflicts:
	manifest.json

22 files changed, 2934 insertions, 2911 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index ce392f34..4ab377c6 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -36,42 +37,42 @@ var NinjaCvsRt =  NinjaCvsRt || {};
 window.addEventListener('load', loadCanvasData, false);
 //Load data function (on document loaded)
 function loadCanvasData (e) {
-        //Cleaning up events
-        window.removeEventListener('load', loadCanvasData, false);
+    //Cleaning up events
+    window.removeEventListener('load', loadCanvasData, false);
     //Getting tag with data, MUST contain attribute
     var xhr, tag = document.querySelectorAll(['script[data-ninja-canvas-lib]'])[0];
-        //Checking for data to be external file
-        if (tag.getAttribute('data-ninja-canvas-json') !== null) {
-                //Loading JSON data
-                xhr = new XMLHttpRequest();
+    //Checking for data to be external file
+    if (tag.getAttribute('data-ninja-canvas-json') !== null) {
+        //Loading JSON data
+        xhr = new XMLHttpRequest();
         xhr.open("GET", tag.getAttribute('data-ninja-canvas-json'), false);
         xhr.send();
-                //Checking for data
-        if (xhr.readyState === 4) {
-                //Calling method to initialize all webGL/canvas(es)
-                        NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), xhr.response);
-        } else {
-                //TODO: Add error for users
-        }
-        } else {//Data in document itself
-                //Calling method to initialize all webGL/canvas(es)
-                NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), document.querySelectorAll(['script[data-ninja-canvas]'])[0].innerHTML);
-        }
+        //Checking for data
+        if (xhr.readyState === 4) {
+            //Calling method to initialize all webGL/canvas(es)
+            NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), xhr.response);
+        } else {
+            //TODO: Add error for users
+        }
+    } else {//Data in document itself
+        //Calling method to initialize all webGL/canvas(es)
+        NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), document.querySelectorAll(['script[data-ninja-canvas]'])[0].innerHTML);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////
 //Loading webGL/canvas data
 NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
-        var cvsDataMngr, ninjaWebGlData = JSON.parse((data.replace('(', '')).replace(')', ''));
-        if (ninjaWebGlData && ninjaWebGlData.data) {
-                for (var n=0; ninjaWebGlData.data[n]; n++) {
-                        ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
-                }
-        }
-        //Creating data manager
-        cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
-        //Loading data to canvas(es)
-        cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
+    var cvsDataMngr, ninjaWebGlData = JSON.parse((data.replace('(', '')).replace(')', ''));
+    if (ninjaWebGlData && ninjaWebGlData.data) {
+        for (var n=0; ninjaWebGlData.data[n]; n++) {
+            ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
+        }
+    }
+    //Creating data manager
+    cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
+    //Loading data to canvas(es)
+    cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
 };
 
 ///////////////////////////////////////////////////////////////////////
@@ -80,64 +81,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);
-                                                }
-                                                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 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)