1 files changed, 254 insertions, 62 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 1a391338..50fa735a 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -29,13 +29,20 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     }
 
     this._canvas = canvas;
-        if (this._useWebGL) {
-        if(preserveDrawingBuffer) {
+        if (this._useWebGL)
+        {
+        preserveDrawingBuffer = true;
+        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" );
     }
     
@@ -72,11 +79,15 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         this._firstRender = true;
 
         this._worldCount = worldCounter;
+        console.log( "creating world " + this._worldCount );
         worldCounter++;
 
         // keep a counter for generating node names
         this._nodeCounter = 0;
 
+    // for sending notifications to listeners
+    this._notifier = new Notifier();
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -119,6 +130,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
     // Flag to play/pause animation at authortime
     this._previewAnimation = true;
+  
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -143,7 +155,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 *****" );
@@ -201,13 +214,15 @@ 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]);
         
@@ -224,35 +239,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;
                                                 }
                                         }
-                                } else if (this._renderCount >= 0) {
-                                        if (this._canvas.task) {
+                                }
+                                else if (this._renderCount >= 0)
+                                {
+                                        if (this._canvas.task)
+                                        {
                                                 this._renderCount--;
-                                                if (this._renderCount <= 0) {
+                                                if (this._renderCount <= 0)
+                                                {
                                                         this._canvas.task.stop();
                         }
                                         }
                                 }
                         }
-                } else {
+                }
+                else
+                {
                         this.render();
                 }
     };
@@ -266,8 +294,10 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 //              console.log( "GLWorld.onLoadState" );
         };
 
-        this.textureToLoad = function( texture ) {
-                if (!texture.previouslyReferenced) {
+        this.textureToLoad = function( texture )
+        {
+                if (!texture.previouslyReferenced)
+                {
                         var name = texture.lookUpName;
                         texture._world = this;
                         texture.callback = this.textureMapLoaded;
@@ -279,7 +309,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 }
         };
 
-        this.textureMapLoaded = function( texture ) {
+        this.textureMapLoaded = function( texture )
+        {
                 var world = texture._world;
                 if (!world) {
                         console.log( "**** loaded texture does not have world defined ****" );
@@ -289,7 +320,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 var name = texture.lookUpName;
                 if (!world._texMapsToLoad[name]) {
                         console.log( "loaded an unregistered texture map: " + name );
-                } else {
+                }
+                else {
                         //console.log( "loaded a registered texture map: " + name );
                         world._texMapsToLoad[name] = undefined;
                 }
@@ -316,7 +348,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 var world = this._world;
                 if (!world) {
                         console.log( "**** world not defined for loaded texture map: " + name );
-        } else {
+        }
+                else {
                         world.textureMapLoaded( name );
         }
         };
@@ -326,7 +359,17 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 var rtnVal = false;
                 if (root) {
                         rtnVal = this.hHasAnimatedMaterials( root );
+            this._hasAnimatedMaterials = rtnVal;
         }
+                else
+                {
+                        // currently...
+                        // we set this case to true - cloud materials create a
+                        // world with no objects but cloud materials animate.
+                        // TODO - find a better way to do this
+                        rtnVal = true;
+                        this._hasAnimatedMaterials = true;
+                }
 
                 return rtnVal;
         };
@@ -359,6 +402,15 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {