32 files changed, 672 insertions, 288 deletions

diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js
index 21de9879..b5df3911 100644
--- a/js/controllers/elements/canvas-controller.js
+++ b/js/controllers/elements/canvas-controller.js
@@ -34,12 +34,12 @@ exports.CanvasController = Montage.create(ElementController, {
             }
         }
     },
-
-    setProperties: {
-        value: function(el, props, index) {
-            for(var p in props) {
-                el.elementModel.controller.setProperty(el, p, props[p][index]);
-            }
-        }
+        
+   setProperties: {
+       value: function(el, props, index) {
+           for(var p in props) {
+               el.elementModel.controller.setProperty(el, p, props[p][index]);
+           }
+       }
     }
 });
\ No newline at end of file
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 3ed96082..8819f637 100644
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1780,7 +1780,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         var mergedSnap = this.mergeHitRecords( hitRecs );
                         if (mergedSnap)
                         {
-                                while (hitRecs.length > 0)  hitRecs.pop();
+                                while (hitRecs.length > 0) hitRecs.pop();
                                 hitRecs.push( mergedSnap );
                                 //console.log( "merged snaps" );
                         }
@@ -1836,6 +1836,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 hSnap.setLocalPoint( localPt );
                                                 hSnap.setScreenPoint( scrPt );
                                                 hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                hSnap.setElement( stage );
+                                                hSnap.setPlane( [0,0,1,0] );
+                                                hSnap.setPlaneMatrix( Matrix.I(4) );
                                                 if (vSnap.hasAssociatedScreenPoint() )
                                                         hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                 if (vSnap.hasAssociatedScreenPoint2() )
@@ -1882,6 +1885,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 hSnap.setLocalPoint( localPt );
                                                 hSnap.setScreenPoint( scrPt );
                                                 hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                hSnap.setElement( stage );
+                                                hSnap.setPlane( [0,0,1,0] );
+                                                hSnap.setPlaneMatrix( Matrix.I(4) );
                                                 if (vSnap.hasAssociatedScreenPoint() )
                                                         hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                 if (vSnap.hasAssociatedScreenPoint2() )
@@ -1934,6 +1940,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                         hSnap.setLocalPoint( localPt );
                                                         hSnap.setScreenPoint( scrPt );
                                                         hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                        hSnap.setElement( stage );
+                                                        hSnap.setPlane( [0,0,1,0] );
+                                                        hSnap.setPlaneMatrix( Matrix.I(4) );
                                                         if (vSnap.hasAssociatedScreenPoint() )
                                                                 hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                         if (vSnap.hasAssociatedScreenPoint2() )
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()