37 files changed, 1748 insertions, 253 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..07a98ab5 100644
--- a/js/helper-classes/RDGE/GLMaterial.js
+++ b/js/helper-classes/RDGE/GLMaterial.js
@@ -31,6 +31,11 @@ function GLMaterial( world )
 
         this._texture;
 
+        // vertex deformation variables
+        this._hasVertexDeformation = false;
+        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
+        this._vertexDeformationTolerance = 0.05;
+
         // RDGE variables
         this._shader;
         this._materialNode;
@@ -62,6 +67,16 @@ 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;                                        }
+
+        // the vertex shader can apply deformations requiring refinement in
+        // certain areas.
+        this.hasVertexDeformation                       = function()    {  return this._hasVertexDeformation;                   }
+        this.getVertexDeformationRange          = function()    {  return this._vertexDeformationRange.slice();                 }       
+        this.getVertexDeformationTolerance      = function()    {  return this._vertexDeformationTolerance;             }
+
 
     ///////////////////////////////////////////////////////////////////////
     // Common Material Methods
@@ -174,6 +189,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..e72b4488 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();
         }
 
         ///////////////////////////////////////////////////////////////////////
@@ -279,7 +280,7 @@ function GLRectangle()
 
                 // stroke
                 var strokeMaterial = this.makeStrokeMaterial();
-                prim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial)
+                prim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius);
         this._primArray.push( prim );
                 this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
@@ -485,7 +486,7 @@ function GLRectangle()
         this.createStroke = function(ctr,  width,  height,  strokeWidth,  tlRad, blRad, brRad, trRad, material)
         {
                 // create the geometry
-                var prim = RectangleStroke.create( ctr,  width, height, strokeWidth,  tlRad, blRad,  brRad, trRad)
+                var prim = RectangleStroke.create( ctr,  width, height, strokeWidth,  tlRad, blRad,  brRad, trRad, material)
                 return prim;
         }