4 files changed, 616 insertions, 815 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index f53a4ef6..b4563ea5 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -19,7 +19,7 @@ function initWebGl (rootElement, directory) {
         cvsDataMngr = new CanvasDataManager();
         //Loading data to canvas(es)
         cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
-}
+};
 
 ///////////////////////////////////////////////////////////////////////
 // Class ShapeRuntime
@@ -59,7 +59,7 @@ function CanvasDataManager()
                                 }
                         }
                 }
-        }
+        };
 
         this.collectGLData = function( elt,  dataArray )
         {
@@ -78,7 +78,7 @@ function CanvasDataManager()
                                 this.collectGLData( child, dataArray );
                         }
                 }
-        }
+        };
 
         this.findCanvasWithID = function( id,  elt )
         {
@@ -95,8 +95,8 @@ function CanvasDataManager()
                                 if (foundElt)  return foundElt;
                         }
                 }
-        }
-}
+        };
+};
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLRuntime
@@ -149,16 +149,16 @@ function GLRuntime( canvas, jObj,  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 +188,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 +210,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 +233,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.rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
         
                         // orbit the light nodes around the boxes
                         if (this.light )  this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
@@ -244,7 +244,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                         // now update all the nodes in the scene
                         this.myScene.update(dt);
                 }
-    }
+    };
 
         this.updateMaterials = function()
         {
@@ -254,16 +254,16 @@ function GLRuntime( canvas, jObj,  assetPath )
                         var mat = this._materials[i];
                         mat.update();
                 }
-        }
+        };
 
     // defining the draw function to control how the scene is rendered      
         this.draw = function()
     {
                 if (this._initialized)
                 {
-                        g_Engine.setContext( this._canvas.rdgeid );
+                        RDGE.globals.engine.setContext( this._canvas.rdgeid );
 
-                        var ctx = g_Engine.getContext();
+                        var ctx = RDGE.globals.engine.getContext();
                         var renderer = ctx.renderer;
                         if (renderer.unloadedTextureCount <= 0)
                         {
@@ -281,7 +281,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                                 }
                         }
                 }
-    }
+    };
 
         this.importObjects = function( jObj,  parent )
         {
@@ -298,7 +298,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                                 this.importObjects( child, gObj );
                         }
                 }
-        }
+        };
 
         this.importObject = function( jObj,  parent )
         {
@@ -330,7 +330,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                         this.addObject( obj, parent );
 
                 return obj;
-        }
+        };
 
         this.addObject = function( obj, parent )
         {
@@ -341,7 +341,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                         this._geomRoot = obj;
                 else
                         parent.addChild( obj );
-        }
+        };
 
         this.linkLights = function()
         {
@@ -351,7 +351,7 @@ function GLRuntime( canvas, jObj,  assetPath )
                         this.light = matNode.lightChannel[1];
                         this.light2 = matNode.lightChannel[2];
                 }
-        }
+        };
 
         this.linkMaterials = function( obj )