6 files changed, 58 insertions, 51 deletions

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;
         }
-}
 
-// used to create unique names
-var flatMaterialCounter = 0;
+        this.update = function( time )
+        {
+        }
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
@@ -114,35 +121,31 @@ var flatMaterialCounter = 0;
 flatShaderDef  = 
 {
     'shaders':  { // shader files
-        'defaultVShader': "\
-            uniform mat4 u_mvMatrix;\
-            uniform mat4 u_projMatrix;\
-            attribute vec3  a_pos;\
-            void main() {\
-                gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0);\
-            }",             
-        'defaultFShader': "\
-            precision highp float;\
-            uniform vec4 color;\
-            void main() {\
-                gl_FragColor = color;\
-            }",
+                'defaultVShader':"assets/shaders/Basic.vert.glsl",
+                'defaultFShader':"assets/shaders/Basic.frag.glsl",
         },
     'techniques': { // rendering control
         'colorMe':[ // simple color pass
             {
                 'vshader' : 'defaultVShader',
                 'fshader' : 'defaultFShader',
-            
+           
                 // attributes
                 'attributes' :
                  {
-                    'a_pos' :   { 'type' : 'vec3' } // only using position for this shader
+                                                'vert'  :       { 'type' : 'vec3' },
+                                                'normal' :      { 'type' : 'vec3' },
+                                                'texcoord'      :       { 'type' : 'vec2' },
                  },
                 // attributes
                 'params' :
                  {
-                    'color' :   { 'type' : 'vec4' }
+                    'color' :   { 'type' : 'vec4' },
+
+                                        //'u_limit1': { 'type': 'float' },
+                                        //'u_limit2': { 'type': 'float' },