7 files changed, 1218 insertions, 955 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 655e52fa..ee9f24a4 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -4,9 +4,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
+// namespace for the Ninja Canvas Runtime
+var NinjaCvsRt =  NinjaCvsRt || {};
+
 ///////////////////////////////////////////////////////////////////////
 //Loading webGL/canvas data
-function initWebGl (rootElement, directory) {
+NinjaCvsRt.initWebGl = function (rootElement, directory) {
         var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', ''));
         if (ninjaWebGlData && ninjaWebGlData.data) {
                 for (var n=0; ninjaWebGlData.data[n]; n++) {
@@ -14,61 +17,50 @@ function initWebGl (rootElement, directory) {
                 }
         }
         //Creating data manager
-        cvsDataMngr = new CanvasDataManager();
+        cvsDataMngr = new NinjaCvsRt.CanvasDataManager();
         //Loading data to canvas(es)
         cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
-}
+};
 
 ///////////////////////////////////////////////////////////////////////
 // Class ShapeRuntime
 //      Manages runtime shape display
 ///////////////////////////////////////////////////////////////////////
-function CanvasDataManager()
+NinjaCvsRt.CanvasDataManager = function () 
 {
         this.loadGLData = function(root,  valueArray,  assetPath )
         {
-                this._assetPath = assetPath.slice();
+                if (assetPath)
+                        this._assetPath = assetPath.slice();
 
                 var value = valueArray;
                 var nWorlds = value.length;
                 for (var i=0;  i<nWorlds;  i++)
                 {
                         var importStr = value[i];
-                        var startIndex = importStr.indexOf( "id: " );
-                        if (startIndex >= 0)
+
+                        // 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))
                         {
-                                var endIndex = importStr.indexOf( "\n", startIndex );
-                                if (endIndex > 0)
+                                // JSON format.  pull off the version info
+                                importStr = importStr.substr( index+1 );
+
+                                var jObj = JSON.parse( importStr );
+                                var id = jObj.id;
+                                if (id)
                                 {
-                                        var id = importStr.substring( startIndex+4, endIndex );
                                         var canvas = this.findCanvasWithID( id, root );
                                         if (canvas)
                                         {
-                                                var rt = new GLRuntime( canvas, importStr,  assetPath );
+                                                new NinjaCvsRt.GLRuntime( canvas, jObj,  assetPath );
                                         }
                                 }
                         }
                 }
-        }
-
-        this.collectGLData = function( elt,  dataArray )
-        {
-                if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-                {
-                        var data = elt.elementModel.shapeModel.GLWorld.export( true );
-                        dataArray.push( data );
-                }
-
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                this.collectGLData( child, dataArray );
-                        }
-                }
-        }
+        };
 
         this.findCanvasWithID = function( id,  elt )
         {
@@ -85,21 +77,22 @@ function CanvasDataManager()
                                 if (foundElt)  return foundElt;
                         }
                 }
-        }
-}
+        };
+};
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLRuntime
 //      Manages runtime fora WebGL canvas
 ///////////////////////////////////////////////////////////////////////
-function GLRuntime( canvas, importStr,  assetPath )
+NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
 {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
         this._canvas            = canvas;
         this._context           = null;
-        this._importStr         = importStr;
+        //this._importStr               = importStr;
+        this._jObj                      = jObj;
 
         this.renderer           = null;
         this.myScene            = null;
@@ -111,6 +104,7 @@ function GLRuntime( canvas, importStr,  assetPath )
         this._initialized       = false;
 
         this._useWebGL          = false;
+        this._assetPath     = undefined;
 
         // view parameters
         this._fov = 45.0;
@@ -118,75 +112,82 @@ function GLRuntime( canvas, importStr,  assetPath )
         this._zFar = 100.0;
         this._viewDist = 5.0;
 
+        this.elapsed = 0;
+
         this._aspect = canvas.width/canvas.height;
 
-        this._geomRoot;
+        this._geomRoot = null;
 
         // all "live" materials
         this._materials = [];
 
-                // provide the mapping for the asset directory
-                this._assetPath = assetPath.slice();
-                if (this._assetPath[this._assetPath.length-1] != '/')
-                        this._assetPath += '/';
+    // provide the mapping for the asset directory
+    if (assetPath) {
+        this._assetPath = assetPath.slice();
+        if (this._assetPath[this._assetPath.length - 1] != '/')
+            this._assetPath += '/';
+    }
+
+        if(this._assetPath !== undefined) {
+                RDGE.globals.engine.setAssetPath(this._assetPath);
+        }
 
     ///////////////////////////////////////////////////////////////////////
         // accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getZNear                   = function()            {  return this._zNear;                  }
-        this.getZFar                    = function()            {  return this._zFar;                   }
-        this.getFOV                             = function()            {  return this._fov;                    }
-        this.getAspect                  = function()            {  return this._aspect;                 }
-        this.getViewDistance    = function()            {  return this._viewDist;               }
+        this.getZNear                   = function()            {  return this._zNear;                  };
+        this.getZFar                    = function()            {  return this._zFar;                   };
+        this.getFOV                             = function()            {  return this._fov;                    };
+        this.getAspect                  = function()            {  return this._aspect;                 };
+        this.getViewDistance    = function()            {  return this._viewDist;               };
 
-        this.get2DContext               = function()            {  return this._context;                }
+        this.get2DContext               = function()            {  return this._context;                };
 
-        this.getViewportWidth   = function()            {  return this._canvas.width;   }
-        this.getViewportHeight  = function()            {  return this._canvas.height;  }
+        this.getViewportWidth   = function()            {  return this._canvas.width;   };
+        this.getViewportHeight  = function()            {  return this._canvas.height;  };
 
     ///////////////////////////////////////////////////////////////////////
         // accessors
     ///////////////////////////////////////////////////////////////////////
         this.loadScene = function()
         {
+                var jObj = this._jObj;
+                if (!jObj.children || (jObj.children.length != 1))
+                        throw new Error( "ill-formed JSON for runtime load: " + jObj );
+                var root = jObj.children[0];
+
                 // parse the data
-                // the GL runtime must start with a "sceneData: "
+                if (jObj.scenedata)