1 files changed, 18 insertions, 15 deletions

diff --git a/js/helper-classes/RDGE/Materials/FlatMaterial.js b/js/helper-classes/RDGE/Materials/FlatMaterial.js
index e2f23d75..a250dc0a 100644
--- a/js/helper-classes/RDGE/Materials/FlatMaterial.js
+++ b/js/helper-classes/RDGE/Materials/FlatMaterial.js
@@ -26,10 +26,13 @@ function FlatMaterial()
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getColor                   = function()    {  return this._color;          }
-        this.getShaderName              = function()    {  return this._shaderName;     }
+        this.getColor                           = function()    {  return this._color;          }
+        this.getShaderName                      = function()    {  return this._shaderName;     }
 
-        this.isAnimated                 = function()    {  return false;                                }
+        this.isAnimated                         = function()    {  return false;                        }
+        this.hasVertexDeformation       = function()    {  return true;                         }
+        this._hasVertexDeformation = true;
+        this._vertexDeformationTolerance = 0.2;
 
     //////////////////////////////////s/////////////////////////////////////
     // Methods
@@ -55,6 +58,7 @@ function FlatMaterial()
 //              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_center.set( [0.0] );
 //              this._shader.colorMe.u_taperAmount.set( [0.5] );
         }
 
@@ -76,7 +80,7 @@ function FlatMaterial()
                 {
             this._propValues[prop] = value;
             if (this._shader && this._shader.colorMe)
-                        this._shader.colorMe[prop].set(value);
+                this._shader.colorMe[prop].set(value);
                 }
         }
     ///////////////////////////////////////////////////////////////////////
@@ -96,11 +100,11 @@ function FlatMaterial()
                 return exportStr;
         }
 
-        this.import = function( importStr )
-        {
-                var pu = new ParseUtils( importStr );
-                var material = pu.nextValue( "material: " );
-                if (material != this.getShaderName())  throw new Error( "ill-formed material" );
+    this.import = function( importStr )
+    {
+        var pu = new ParseUtils( importStr );
+        var material = pu.nextValue( "material: " );
+        if (material != this.getShaderName())  throw new Error( "ill-formed material" );
         this.setName(  pu.nextValue( "name: ") );
 
         var rtnStr;
@@ -110,7 +114,7 @@ function FlatMaterial()
 
             this.setProperty( "color",  color);
 
-                var endKey = "endMaterial\n";
+            var endKey = "endMaterial\n";
             var index = importStr.indexOf( endKey );
             index += endKey.length;
             rtnStr = importStr.substr( index );
@@ -120,16 +124,13 @@ function FlatMaterial()
             throw new Error( "could not import material: " + importStr );
         }
 
-                return rtnStr;
-        }
+        return rtnStr;
+    }
 
         this.update = function( time )
         {
         }
-
 }
-// used to create unique names
-var flatMaterialCounter = 0;
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
@@ -138,6 +139,7 @@ var flatMaterialCounter = 0;
 flatShaderDef  = 
 {
     'shaders':  { // shader files
+                //'defaultVShader':"assets/shaders/Taper.vert.glsl",
                 'defaultVShader':"assets/shaders/Basic.vert.glsl",
                 'defaultFShader':"assets/shaders/Basic.frag.glsl",
         },
@@ -162,6 +164,7 @@ flatShaderDef  =
                                         //'u_limit1': { 'type': 'float' },
                                         //'u_limit2': { 'type': 'float' },
                                         //'u_limit3': { 'type': 'float' },
+                                        //'u_center': { 'type': 'float' },
                                         //'u_taperAmount': { 'type': 'float' }
                  },
             },