36 files changed, 3408 insertions, 3851 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 904aa41e..67bb59c4 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -94,7 +94,10 @@ exports.NJUtils = Object.create(Object.prototype, {
     ///// TODO: find a different place for this function
     makeElementModel: {
         value: function(el, selection, controller, isShape) {
-            var p3d = Montage.create(Properties3D).init(el);
+            var p3d = Montage.create(Properties3D);
+            if(selection === "Stage") {
+                p3d.init(el, true);
+            }
             var shapeProps = null;
             var pi = controller + "Pi";
 
@@ -136,7 +139,8 @@ exports.NJUtils = Object.create(Object.prototype, {
                     controller: { value: ControllerFactory.getController(controller)},
                     pi:         { value: pi},
                     props3D:    { value: p3d},
-                    shapeModel: { value: shapeProps}
+                    shapeModel: { value: shapeProps},
+                    isShape:    { value: isShape}
             });
 
         }
@@ -168,6 +172,7 @@ exports.NJUtils = Object.create(Object.prototype, {
                         // TODO - Need more info about the shape
                         selection = "canvas";
                         controller = "shape";
+                        isShape = true;
                     }
                     else
                     {
@@ -179,6 +184,9 @@ exports.NJUtils = Object.create(Object.prototype, {
                     break;
             }
             this.makeElementModel(el, selection, controller, isShape);
+            if(el.elementModel && el.elementModel.props3D) {
+                el.elementModel.props3D.init(el, (selection === "Stage"));
+            }
         }
     },
 
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 4ca738f4..eb06e59d 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -29,14 +29,20 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     }
 
     this._canvas = canvas;
-        if (this._useWebGL) {
+        if (this._useWebGL)
+        {
         preserveDrawingBuffer = true;
-        if(preserveDrawingBuffer) {
+        if(preserveDrawingBuffer)
+                {
             this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
-        } else {
+        }
+                else
+                {
                     this._glContext = canvas.getContext("experimental-webgl");
         }
-    } else {
+    }
+        else
+        {
                 this._2DContext = canvas.getContext( "2d" );
     }
     
@@ -124,6 +130,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
     // Flag to play/pause animation at authortime
     this._previewAnimation = true;
+  
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -148,46 +155,47 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         this.setCameraMat( camMat );
     
     // post-load processing of the scene
-    this.init = function() {
-                var ctx1 = g_Engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle),
-                        ctx2 = g_Engine.getContext();
+    this.init = function()
+        {
+                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;
                 this.renderer._world = this;
       
                 // 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);
 
                 // change clear color
-                //this.renderer.setClearFlags(g_Engine.getContext().DEPTH_BUFFER_BIT);
+                //this.renderer.setClearFlags(RDGE.globals.engine.getContext().DEPTH_BUFFER_BIT);
                 this.renderer.setClearColor([0.0, 0.0, 0.0, 0.0]);
                 //this.renderer.NinjaWorld = this;
         
                 // create an empty scene graph
-                this.myScene = new SceneGraph();
+                this.myScene = new RDGE.SceneGraph();
         
                 // create some lights
                 // light 1
-                this.light = createLightNode("myLight");
+                this.light = RDGE.createLightNode("myLight");
                 this.light.setPosition([0,0,1.2]);
                 this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
         
                 // light 2
-                this.light2 = createLightNode("myLight2");
+                this.light2 = RDGE.createLightNode("myLight2");
                 this.light2.setPosition([-0.5,0,1.2]);
                 this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
         
                 // create a light transform
-                var lightTr = createTransformNode("lightTr");
+                var lightTr = RDGE.createTransformNode("lightTr");
         
                 // create and attach a material - materials hold the light data
-                lightTr.attachMaterial(createMaterialNode("lights"));
+                lightTr.attachMaterial(RDGE.createMaterialNode("lights"));
         
                 // enable light channels 1, 2 - channel 0 is used by the default shader
                 lightTr.materialNode.enableLightChannel(1, this.light);
@@ -200,21 +208,23 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 this.myScene.addNode(lightTr);
         
                 // Add the scene to the engine - necessary if you want the engine to draw for you
-                //g_Engine.AddScene("myScene" + this._canvas.id, this.myScene);
+                //R