Merge branch 'refs/heads/master' into components

2 files changed, 536 insertions, 686 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index f53a4ef6..a35f473d 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -4,11 +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++) {
@@ -16,16 +17,16 @@ 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 )
         {
@@ -54,31 +55,12 @@ function CanvasDataManager()
                                         var canvas = this.findCanvasWithID( id, root );
                                         if (canvas)
                                         {
-                                                new GLRuntime( canvas, jObj,  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 )
         {
@@ -95,14 +77,14 @@ function CanvasDataManager()
                                 if (foundElt)  return foundElt;
                         }
                 }
-        }
-}
+        };
+};
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLRuntime
 //      Manages runtime fora WebGL canvas
 ///////////////////////////////////////////////////////////////////////
-function GLRuntime( canvas, jObj,  assetPath )
+NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
 {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
@@ -122,6 +104,7 @@ function GLRuntime( canvas, jObj,  assetPath )
         this._initialized       = false;
 
         this._useWebGL          = false;
+        this._assetPath     = undefined;
 
         // view parameters
         this._fov = 45.0;
@@ -138,27 +121,31 @@ function GLRuntime( canvas, jObj,  assetPath )
         // all "live" materials
         this._materials = [];
 
-                // provide the mapping for the asset directory
-                if (assetPath)
-                {
-                        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
@@ -188,20 +175,20 @@ function GLRuntime( canvas, jObj,  assetPath )
                         this.importObjects( root );
                         this.render();
                 }
-        }
+        };
 
         this.init = function()
     { 
-                var ctx1 = g_Engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle),
-                        ctx2 = g_Engine.getContext();
+                var ctx1 = RDGE.globals.engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle),
+                        ctx2 = RDGE.globals.engine.getContext();
                 if (ctx1 != ctx2)  console.log( "***** different contexts *****" );
                 this.renderer = ctx1.renderer;
       
                 // create a camera, set its perspective, and then point it at the origin
-                var cam = new camera();
+                var cam = new RDGE.camera();
                 this._camera = cam;
                 cam.setPerspective(this.getFOV(), this.getAspect(), this.getZNear(), this.getZFar());
-                cam.setLookAt([0, 0, this.getViewDistance()], [0, 0, 0], vec3.up());
+                cam.setLookAt([0, 0, this.getViewDistance()], [0, 0, 0], RDGE.vec3.up());
         
                 // make this camera the active camera
                 this.renderer.cameraManager().setActiveCamera(cam);
@@ -210,17 +197,17 @@ function GLRuntime( canvas, jObj,  assetPath )
                 this.renderer.setClearColor([1.0, 1.0, 1.0, 0.0]);
         
                 // create an empty scene graph
-                this.myScene = new SceneGraph();
+                this.myScene = new RDGE.SceneGraph();
 
                 // load the scene graph data
                 this.loadScene();
         
                 // Add the scene to the engine - necessary if you want the engine to draw for you
                 var name = "myScene" + this._canvas.getAttribute( "data-RDGE-id" ); 
-                g_Engine.AddScene(name, this.myScene);
+                RDGE.globals.engine.AddScene(name, this.myScene);
 
                 this._initialized = true;
-        }
+        };
     
         // main code for handling user interaction and updating the scene   
         this.update = function(dt)
@@ -233,7 +220,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                         this.elapsed += dt;
         
                         // changed the global position uniform of light 0, another way to change behavior of a light
-                        rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
+                        RDGE.