7 files changed, 68 insertions, 52 deletions

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/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index bc3b1478..1bb4bcac 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -279,10 +279,10 @@ function GLRectangle()
                 brRadius = -z*(r-l)/(2.0*zn)*brRadiusNDC;
 
                 // stroke
-//              var strokeMaterial = this.makeStrokeMaterial();
-//              prim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial)
-//        this._primArray.push( prim );
-//              this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
+                var strokeMaterial = this.makeStrokeMaterial();
+                prim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial)
+        this._primArray.push( prim );
+                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
                 // fill
                 tlRadius -= strokeSize;  if (tlRadius < 0)  tlRadius = 0.0;
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index b84bb585..0dc34034 100644
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -240,6 +240,7 @@ function GLWorld( canvas, use3D )
                                 if (renderer != aRenderer)  console.log( "***** DIFFERENT RENDERERS *****" );
                                 renderer.disableCulling();
                                 this.myScene.render();
+                                console.log( "render" );
 
                                 if (this._firstRender)
                                 {
@@ -247,15 +248,15 @@ function GLWorld( canvas, use3D )
 
                                         if (!this.hasAnimatedMaterials())
                                         {
-                                                this.myScene.render();
+                                                //this.myScene.render();
                                                 //this._canvas.task.stop();
-                                                this._renderCount = 3;
+                                                this._renderCount = 10;
                                         }
                                 }
                                 else if (this._renderCount >= 0)
                                 {
                                         this._renderCount--;
-                                        if (this._renderCount == 0)
+                                        if (this._renderCount <= 0)
                                                 this._canvas.task.stop();
                                 }
 
@@ -270,6 +271,7 @@ function GLWorld( canvas, use3D )
     this.onRunState = function()
         {
                 console.log( "GLWorld.onRunState" );
+                this.restartRenderLoop();
         }
         
     this.onLoadState = function()
@@ -387,16 +389,13 @@ function GLWorld( canvas, use3D )
         {
                 rdgeStarted = true;
 
-        // TODO - temporary fix for RDGE id's
-        this._canvas.id = this._canvas.uuid;
-
+        this._canvas.rdgeid = this._canvas.uuid;
                 g_Engine.registerCanvas(this._canvas, this);
                 RDGEStart( this._canvas );
 
                 //this._canvas.fpsTracker = new fpsTracker( '0' );
-                this._canvas.task = new RDGETask(this._canvas, false);
+                //this._canvas.task = new RDGETask(this._canvas, false);
                 this._canvas.task.stop()
-                //this._canvas.task.start()
         }
 }
 
@@ -508,11 +507,16 @@ GLWorld.prototype.addObject = function( obj )
 
 GLWorld.prototype.restartRenderLoop = function()
 {
+        console.log( "restartRenderLoop" );
+
         this._firstRender = true;
-        if (this._allMapsLoaded)
-                this._canvas.task.start();
-        else
-                this._canvas.task.stop();
+        if (this._canvas.task)
+        {
+                if (this._allMapsLoaded)
+                        this._canvas.task.start();
+                else
+                        this._canvas.task.stop();
+        }
 }
 
 //append to the list of objects if obj doesn't already exist
@@ -563,7 +567,7 @@ GLWorld.prototype.clearTree = function()
         {
                 var root = this._rootNode;
                 root.children = new Array();
-                g_Engine.unregisterCanvas( this._canvas.id )
+                g_Engine.unregisterCanvas( this._canvas.rdgeid )
 
                 this.update( 0 );
                 this.draw();
@@ -805,7 +809,7 @@ GLWorld.prototype.getShapeFromPoint = function( offsetX, offsetY )
 GLWorld.prototype.export = function()
 {
         var exportStr = "GLWorld 1.0\n";
-        exportStr += "id: " + this._canvas.id + "\n";
+        exportStr += "id: " + this._canvas.rdgeid + "\n";
         exportStr += "fov: " + this._fov + "\n";
         exportStr += "zNear: " + this._zNear + "\n";
         exportStr += "zFar: " + this._zFar + "\n";
diff --git a/js/helper-classes/RDGE/Materials/FlatMaterial.js b/js/helper-classes/RDGE/Materials/FlatMaterial.js
index f342eef8..3e3ae25e 100644
--- a/js/helper-classes/RDGE/Materials/FlatMaterial.js
+++ b/js/helper-classes/RDGE/Materials/FlatMaterial.js
@@ -50,6 +50,12 @@ function FlatMaterial()
                 // set up the material node
                 this._materialNode = createMaterialNode("flatMaterial");
                 this._materialNode.setShader(this._shader);
+
+                // initialize the taper properties
+//              this._shader.colorMe.u_limit1.set( [0.25] );
+//              this._shader.colorMe.u_limit2.set( [0.5] );
+//              this._shader.colorMe.u_limit3.set( [0.75] );
+//              this._shader.colorMe.u_taperAmount.set( [0.5] );
         }
 
 
@@ -102,10 +108,11 @@ function FlatMaterial()
                 var rtnStr = importStr.substr( index );
                 return rtnStr;
         }
-}