27 files changed, 602 insertions, 245 deletions

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index fc2e6460..8f7a5d30 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -63,14 +63,16 @@ function GLCircle()
 
                 this.m_world = world;
 
+
                 if(strokeMaterial)
-                {
                         this._strokeMaterial = strokeMaterial;
-                }
+                else
+                        this._strokeMaterial = new FlatMaterial();
+
                 if(fillMaterial)
-                {
                         this._fillMaterial = fillMaterial;
-                }
+                else 
+                        this._fillMaterial = new FlatMaterial();
         }
 
     ///////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js
index 72019703..e04b3283 100644
--- a/js/helper-classes/RDGE/GLGeomObj.js
+++ b/js/helper-classes/RDGE/GLGeomObj.js
@@ -99,6 +99,9 @@ function GLGeomObj()
                                 }
                         }
                 }
+
+                var world = this.getWorld();
+                if (world)  world.restartRenderLoop();
         }
 
         this.setFillColor   = function(c)               {  this.setMaterialColor(c, "fill");            }
diff --git a/js/helper-classes/RDGE/GLMaterial.js b/js/helper-classes/RDGE/GLMaterial.js
index 51c27ace..c633f679 100644
--- a/js/helper-classes/RDGE/GLMaterial.js
+++ b/js/helper-classes/RDGE/GLMaterial.js
@@ -62,6 +62,10 @@ function GLMaterial( world )
         this.getShader                  = function()                    {  return this._shader;                         }
         this.getMaterialNode    = function()                    {  return this._materialNode;           }
 
+        // a material can be animated or not. default is not.  
+        // Any material needing continuous rendering should override this method
+        this.isAnimated                 = function()                    {  return false;                                        }
+
 
     ///////////////////////////////////////////////////////////////////////
     // Common Material Methods
@@ -174,6 +178,31 @@ function GLMaterial( world )
                 // animated materials should implement the update method
         }
 
+        this.registerTexture = function( texture )
+        {
+                // the world needs to know about the texture map
+                var world = this.getWorld();
+                if (!world)
+                        console.log( "**** world not defined for registering texture map: " + texture.lookUpName );
+                else
+                        world.textureToLoad( texture );
+        }
+
+        this.loadTexture = function( texMapName, wrap, mips )
+        {
+                var tex;
+                var world = this.getWorld();
+                if (!world)
+                        console.log( "world not defined for material with texture map" );
+                else
+                {
+                        var renderer = world.getRenderer();
+                        tex = renderer.getTextureByName(texMapName, wrap, mips );
+                        this.registerTexture( tex );
+                }
+                return tex;
+        }
+
         this.export = function()
         {
                 // this function should be overridden by subclasses
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 1334d7e6..1bb4bcac 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -80,13 +80,14 @@ function GLRectangle()
                 this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
 
                 if(strokeMaterial)
-                {
                         this._strokeMaterial = strokeMaterial;
-                }
+                else
+                        this._strokeMaterial = new FlatMaterial();
+
                 if(fillMaterial)
-                {
                         this._fillMaterial = fillMaterial;
-                }
+                else 
+                        this._fillMaterial = new FlatMaterial();
         }
 
         ///////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index cc44da50..819f89db 100644
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -65,6 +65,11 @@ function GLWorld( canvas, use3D )
 
         this._camera;
 
+        // keep a flag indicating whether a render has been completed.
+        // this allows us to turn off automatic updating if there are
+        // no animated materials
+        this._firstRender = true;
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -103,6 +108,8 @@ function GLWorld( canvas, use3D )
 
         this.isWebGL                            = function()            {  return this._useWebGL;                       }
 
+        this.getRenderer                        = function()            {  return this.renderer;                        }
+
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -114,6 +121,10 @@ function GLWorld( canvas, use3D )
     this.strokeShader = null;
     this.renderer = null;
 
+        // keep an array of texture maps that need to be loaded
+        this._texMapsToLoad = [];
+        this._allMapsLoaded = true;
+
         // this is the node to which objects get hung
         this._rootNode;
 
@@ -214,18 +225,159 @@ function GLWorld( canvas, use3D )
     {
                 if (this._useWebGL)
                 {
-                        var ctx = g_Engine.getContext();
-                        //console.log( "RDGE state: " + ctx.ctxStateManager.currentState().name);
-
-                        var renderer = ctx.renderer;
-                        renderer.disableCulling();
-                        this.myScene.render();
+                        if (this._allMapsLoaded)
+                        {
+                                var ctx = g_Engine.getContext();
+                                //console.log( "RDGE state: " + ctx.ctxStateManager.currentState().name);
+
+                                /////////////////////////////
+                                var ctx1 = g_Engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle);
+                                if (ctx1 != ctx)  console.log( "***** different contexts (2) *****" );
+                                var aRenderer = ctx1.renderer;
+                                //////////////////////////////////////////
+