From 22cbc9644b79df60b3f6336f9563debd47fb3ea1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 28 Jun 2012 11:44:15 -0700
Subject: Added capability to split a mesh into multiiple parts to avoid buffer
 overflow situations.

---
 js/lib/rdge/materials/taper-material.js | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'js/lib/rdge/materials/taper-material.js')

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index f6aa782c..595f5064 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -38,6 +38,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 +64,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 +98,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 +155,7 @@ taperShaderDef = {
 				     'u_maxVal': { 'type': 'float' },
 				     'u_center': { 'type': 'float' },
 				     'u_taperAmount': { 'type': 'float' },
+					 'facettol': { 'type': 'float' },
 				     'u_speed': { 'type': 'float' }
 				 }
             }
-- 
cgit v1.2.3


From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs

---
 js/lib/rdge/materials/taper-material.js | 56 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'js/lib/rdge/materials/taper-material.js')

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 2dc3e120..d88b1e9e 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,8 +55,8 @@ 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;
@@ -117,7 +117,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 +138,31 @@ 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' },
+                     'u_speed': { 'type': 'float' }
+                 }
             }
-		]
+        ]
     }
 };
 
-- 
cgit v1.2.3


From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces

---
 js/lib/rdge/materials/taper-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/taper-material.js')

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index d88b1e9e..988381f1 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -76,7 +76,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]);
-- 
cgit v1.2.3


From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Mon, 9 Jul 2012 16:27:52 -0700
Subject: BSD License

---
 js/lib/rdge/materials/taper-material.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'js/lib/rdge/materials/taper-material.js')

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index bf5236fd..73e344d5 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 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.
+* 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 LLC 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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
-- 
cgit v1.2.3


From 67dd4bdd47a0324507bed232d22068aa198549fe Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 11 Jul 2012 09:48:19 -0700
Subject: re-wrote the radial blur shader.  Changed tolerances in the
 deformation shaders.

---
 js/lib/rdge/materials/taper-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/taper-material.js')

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 73e344d5..929dffa6 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -61,7 +61,7 @@ var TaperMaterial = function TaperMaterial()
 
     this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
     this._hasVertexDeformation = true;
-    this._vertexDeformationTolerance = 0.02; // should be a property
+    this._vertexDeformationTolerance = 0.1; // should be a property
 
 	this.getVertexDeformationTolerance = function()	{  return  this._propValues[this._propNames[7]];  };
 
-- 
cgit v1.2.3