Merge branch 'refs/heads/Ninja-Internal' into FileIO

33 files changed, 2409 insertions, 2114 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 0dde9af4..8068284e 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -29,13 +29,19 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     }
 
     this._canvas = canvas;
-        if (this._useWebGL) {
-        if(preserveDrawingBuffer) {
+        if (this._useWebGL)
+        {
+        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" );
     }
     
@@ -77,6 +83,9 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         // keep a counter for generating node names
         this._nodeCounter = 0;
 
+    // for sending notifications to listeners
+    this._notifier = new Notifier();
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -119,6 +128,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
     // Flag to play/pause animation at authortime
     this._previewAnimation = true;
+  
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -143,7 +153,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         this.setCameraMat( camMat );
     
     // post-load processing of the scene
-    this.init = function() {
+    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 *****" );
@@ -169,14 +180,14 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         
                 // create some lights
                 // light 1
-                this.light = RDGE.createLightNode("myLight");
-                this.light.setPosition([0,0,1.2]);
-                this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
+//              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 = RDGE.createLightNode("myLight2");
-                this.light2.setPosition([-0.5,0,1.2]);
-                this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
+//              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 = RDGE.createTransformNode("lightTr");
@@ -185,8 +196,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 lightTr.attachMaterial(RDGE.createMaterialNode("lights"));
         
                 // enable light channels 1, 2 - channel 0 is used by the default shader
-                lightTr.materialNode.enableLightChannel(1, this.light);
-                lightTr.materialNode.enableLightChannel(2, this.light2);
+//              lightTr.materialNode.enableLightChannel(1, this.light);
+//              lightTr.materialNode.enableLightChannel(2, this.light2);
      
                 // all added objects are parented to the light node
                 this._rootNode = lightTr;
@@ -201,19 +212,21 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         };
     
         // main code for handling user interaction and updating the scene   
-        this.update = function(dt) {
+        this.update = function(dt)
+        {
                 if (!dt)  dt = 0.2;
         
                 dt = 0.01;      // use our own internal throttle
                 this.elapsed += dt;
         
-                if (this._useWebGL) {
+                if (this._useWebGL)
+                {
                         // changed the global position uniform of light 0, another way to change behavior of a light
                     RDGE.rdgeGlobalParameters.u_light0Pos.set([5 * Math.cos(this.elapsed), 5 * Math.sin(this.elapsed), 20]);
         
                         // orbit the light nodes around the boxes
-                        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)]);
-                        this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
+//                      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)]);
+//                      this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
                 }
         
                 this.updateMaterials( this.getGeomRoot(), this.elapsed );
@@ -224,35 +237,48 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     };
 
     // defining the draw function to control how the scene is rendered      
-        this.draw = function() {
-                if (this._useWebGL) {
+        this.draw = function()
+        {
+                if (this._useWebGL)
+                {
                         RDGE.globals.engine.setContext( this._canvas.rdgeid );
                         var ctx = RDGE.globals.engine.getContext();
                         var renderer = ctx.renderer;
-                        if (renderer.unloadedTextureCount <= 0) {
+                        if (renderer.unloadedTextureCount <= 0)
+                        {
                                 renderer.disableCulling();
                                 renderer._clear();
                                 this.myScene.render();
 
-                                if (this._firstRender) {
-                                        if (this._canvas.task) {
+                                if (this._firstRender)
+                                {
+                                        this._notifier.sendNotification( this._notifier.FIRST_RENDER );
+                                        if (this._canvas.task)
+                                        {
                                                 this._firstRender = false;
 
-                                                if (!this.hasAnimatedMaterials() || !this._previewAnimation) {
+                                                if (!this.hasAnimatedMaterials() || !this._previewAnimation)
+                                                {
                                                         this._canvas.task.stop();
                                                         //this._renderCount = 10;
                                                 }
                                         }