1 files changed, 54 insertions, 33 deletions

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 2dc3e120..bf5236fd 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -38,7 +38,7 @@ var Texture = require("js/lib/rdge/texture").Texture;
 var TaperMaterial = function TaperMaterial()
 {
     // initialize the inherited members
-        this.inheritedFrom = Material;
+    this.inheritedFrom = Material;
     this.inheritedFrom();
 
     ///////////////////////////////////////////////////////////////////////
@@ -55,13 +55,15 @@ var TaperMaterial = function TaperMaterial()
     this.getShaderName = function () { return this._shaderName; };
 
     this.isAnimated = function () { return true; };
-        this.getShaderDef       = function()    {  return taperShaderDef;       };
-        this.getTechniqueName   = function() {  return 'colorMe'  };
+    this.getShaderDef   = function()    {  return taperShaderDef;   };
+    this.getTechniqueName   = function() {  return 'colorMe'  };
 
     this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
     this._hasVertexDeformation = true;
     this._vertexDeformationTolerance = 0.02; // should be a property
 
+        this.getVertexDeformationTolerance = function() {  return  this._propValues[this._propNames[7]];  };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
@@ -76,7 +78,7 @@ var TaperMaterial = function TaperMaterial()
         // set up the material node
         this._materialNode = RDGE.createMaterialNode("taperMaterial" + "_" + world.generateUniqueNodeID());
         this._materialNode.setShader(this._shader);
- 
+
         this._time = 0;
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_time.set([this._time]);
@@ -86,13 +88,30 @@ var TaperMaterial = function TaperMaterial()
         this.setShaderValues();
     };
 
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = 0.25;
+                this._propValues[this._propNames[1]] = 0.50;
+                this._propValues[this._propNames[2]] = 0.75;
+                this._propValues[this._propNames[3]] = -1;
+                this._propValues[this._propNames[4]] = 1;
+                this._propValues[this._propNames[5]] = 0.0;
+                this._propValues[this._propNames[6]] = 0.9;
+                this._propValues[this._propNames[7]] = this._vertexDeformationTolerance;
+                this._propValues[this._propNames[8]] = 1.0;
+
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
+
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this._propNames = [ "u_limit1", "u_limit2", "u_limit3", "u_minVal", "u_maxVal", "u_center", "u_taperAmount",  "u_speed" ];
-    this._propLabels = [ "Minimum Parameter Value", "Center Paramater Value", "Maximum Parameter Value", "Minimum Data Bounds", "Maximum Data Bounds", "Center", "Taper Amount", "Speed" ];
-    this._propTypes = [ "float", "float", "float", "float", "float", "float", "float", "float" ];
+    this._propNames = [ "u_limit1", "u_limit2", "u_limit3", "u_minVal", "u_maxVal", "u_center", "u_taperAmount",  "facettol",  "u_speed" ];
+    this._propLabels = [ "Minimum Parameter Value", "Center Paramater Value", "Maximum Parameter Value", "Minimum Data Bounds", "Maximum Data Bounds", "Center", "Taper Amount",  "Faceting Tolerance", "Speed" ];
+    this._propTypes = [ "float", "float", "float", "float", "float", "float", "float", "float", "float" ];
     this._propValues = [];
 
     // initialize the property values
@@ -103,7 +122,8 @@ var TaperMaterial = function TaperMaterial()
     this._propValues[this._propNames[4]] = 1;
     this._propValues[this._propNames[5]] = 0.0;
     this._propValues[this._propNames[6]] = 0.9;
-    this._propValues[this._propNames[7]] = 1.0;
+    this._propValues[this._propNames[7]] = this._vertexDeformationTolerance;
+    this._propValues[this._propNames[8]] = 1.0;
 
     this.update = function (time) {
         var speed = this._propValues["u_speed"];
@@ -117,7 +137,7 @@ var TaperMaterial = function TaperMaterial()
             }
 
             var t1 = this._propValues["u_limit1"] - this._deltaTime,
-                                t2 = this._propValues["u_limit2"] - this._deltaTime;
+                t2 = this._propValues["u_limit2"] - this._deltaTime;
 
 
             this._shader.colorMe["u_limit1"].set([t1]);
@@ -138,31 +158,32 @@ taperShaderDef = {
     },
     'techniques': { // rendering control
         'colorMe': [ // simple color pass
-                        {
-                        'vshader': 'defaultVShader',
-                        'fshader': 'defaultFShader',
-
-                        // attributes
-                        'attributes':
-                                 {
-                                     'vert': { 'type': 'vec3' },
-                                     'normal': { 'type': 'vec3' },
-                                     'texcoord': { 'type': 'vec2' }
-                                 },
-                        // attributes
-                        'params':
-                                 {
-                                     'u_limit1': { 'type': 'float' },
-                                     'u_limit2': { 'type': 'float' },
-                                     'u_limit3': { 'type': 'float' },
-                                     'u_minVal': { 'type': 'float' },
-                                     'u_maxVal': { 'type': 'float' },
-                                     'u_center': { 'type': 'float' },
-                                     'u_taperAmount': { 'type': 'float' },
-                                     'u_speed': { 'type': 'float' }
-                                 }
+            {
+            'vshader': 'defaultVShader',
+            'fshader': 'defaultFShader',
+
+            // attributes
+            'attributes':
+                 {
+                     'vert': { 'type': 'vec3' },
+                     'normal': { 'type': 'vec3' },
+                     'texcoord': { 'type': 'vec2' }
+                 },
+            // attributes
+            'params':
+                 {
+                     'u_limit1': { 'type': 'float' },
+                     'u_limit2': { 'type': 'float' },
+                     'u_limit3': { 'type': 'float' },
+                     'u_minVal': { 'type': 'float' },
+                     'u_maxVal': { 'type': 'float' },
+                     'u_center': { 'type': 'float' },
+                     'u_taperAmount': { 'type': 'float' },
+                                         'facettol': { 'type': 'float' },
+                     'u_speed': { 'type': 'float' }
+                 }
             }
-                ]
+        ]
     }
 };