35 files changed, 1723 insertions, 259 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 8819f637..7e1260bf 100644
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -977,7 +977,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         viewUtils.setViewportObj( stage );
 
                         MathUtils.makeDimension3( screenPt );
-                        this.hSnapToElements( stage,  screenPt, hitRecs, 0, screenPt );
+                        this.hSnapToElements( stage,  hitRecs, 0, screenPt );
 
                         return;
                 }
@@ -985,7 +985,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
         hSnapToElements : 
         {
-                value: function( elt, parentPt, hitRecs, depth, globalScrPt )
+                value: function( elt, hitRecs, depth, globalScrPt )
                 {
                         // hit test the current object
                         var hit;
@@ -994,8 +994,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 // if the element is in the 2D cache snapping is done there
                                 if (elt.elementModel && !elt.elementModel.isIn2DSnapCache)
                                 {
-                                        var scrPt = viewUtils.parentToChild( parentPt, elt, false );
-                                        hit = this.snapToElement( elt, scrPt, globalScrPt );
+                                        hit = this.snapToElement( elt, globalScrPt );
                                         if (hit)
                                         {
                                                 //hitRecs.push( hit );
@@ -1017,14 +1016,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
             }
                         // test the rest of the tree
                         var n = elt.childElementCount;
-                        var eltPt = viewUtils.parentToChild( parentPt, elt, true );
+                        //var eltPt = viewUtils.parentToChild( parentPt, elt, true );
                         if (n > 0)
                         {
                                 for (var i=0;  i<n;  i++)
                                 {
                                         var child = elt.children[i];
                                         //var childPt = viewUtils.parentToChild( scrPt, child );
-                                        hit = this.hSnapToElements( child,  eltPt, hitRecs, (depth+1), globalScrPt );
+                                        hit = this.hSnapToElements( child,  hitRecs, (depth+1), globalScrPt );
                                         if (hit)
                                         {
                                                 //hitRecs.push( hit );
@@ -1044,7 +1043,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
         snapToElement : 
         {
-                value: function( elt, scrPt, globalScrPt ) 
+                value: function( elt, globalScrPt ) 
                 {
                         if (this.isAvoidedElement(elt) )  return null;
 
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();