1 files changed, 52 insertions, 7 deletions

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index f6aa782c..b4ff07d3 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -1,7 +1,31 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -38,6 +62,8 @@ var TaperMaterial = function TaperMaterial()
     this._hasVertexDeformation = true;
     this._vertexDeformationTolerance = 0.02; // should be a property
 
+        this.getVertexDeformationTolerance = function() {  return  this._propValues[this._propNames[7]];  };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
@@ -62,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
@@ -79,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"];
@@ -135,6 +179,7 @@ taperShaderDef = {
                                      'u_maxVal': { 'type': 'float' },
                                      'u_center': { 'type': 'float' },
                                      'u_taperAmount': { 'type': 'float' },
+                                         'facettol': { 'type': 'float' },
                                      'u_speed': { 'type': 'float' }
                                  }
             }