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/twist-material.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index b757afb8..f42a5f02 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -67,6 +67,16 @@ var TwistMaterial = function TwistMaterial() {
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
+
+	this.resetToDefault = function()
+	{
+		this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+		this._propValues[this._propNames[u_speed_index]] = 1.0;
+	
+		var nProps = this._propNames.length;
+		for (var i=0; i<nProps;  i++)
+			this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
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/twist-material.js | 84 ++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 42 deletions(-)

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

diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index 20e49713..d0b88b91 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -51,19 +51,19 @@ var TwistMaterial = function TwistMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	var u_tex0_index	= 0,  u_speed_index = 1;
-	this._propNames			= ["u_tex0",		"u_speed" ];
-	this._propLabels		= ["Texture map",	"Speed" ];
-	this._propTypes			= ["file",			"float" ];
-	this._propValues		= [];
+    var u_tex0_index    = 0,  u_speed_index = 1;
+    this._propNames         = ["u_tex0",        "u_speed" ];
+    this._propLabels        = ["Texture map",   "Speed" ];
+    this._propTypes         = ["file",          "float" ];
+    this._propValues        = [];
     this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
     this._propValues[this._propNames[u_speed_index]] = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.isAnimated		= function()	{  return true;				};
-	this.getShaderDef	= function()	{  return twistMaterialDef;	};
+    this.isAnimated     = function()    {  return true;             };
+    this.getShaderDef   = function()    {  return twistMaterialDef; };
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -99,42 +99,42 @@ var TwistMaterial = function TwistMaterial() {
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var twistMaterialDef =
 { 'shaders':
-	{
-	    'defaultVShader': "assets/shaders/Basic.vert.glsl",
-	    'defaultFShader': "assets/shaders/Twist.frag.glsl"
-	},
+    {
+        'defaultVShader': "assets/shaders/Basic.vert.glsl",
+        'defaultFShader': "assets/shaders/Twist.frag.glsl"
+    },
     'techniques':
-	{
-	    'default':
-		[
-			{
-			    'vshader': 'defaultVShader',
-			    'fshader': 'defaultFShader',
-			    // attributes
-			    'attributes':
-				{
-				    'vert': { 'type': 'vec3' },
-				    'normal': { 'type': 'vec3' },
-				    'texcoord': { 'type': 'vec2' }
-				},
-			    // parameters
-			    'params':
-				{
-				    'u_tex0': { 'type': 'tex2d' },
-				    'u_time': { 'type': 'float' },
-				    'u_speed': { 'type': 'float' },
-				    'u_resolution': { 'type': 'vec2' }
-				},
-
-			    // render states
-			    'states':
-				{
-				    'depthEnable': true,
-				    'offset': [1.0, 0.1]
-				}
-			}
-		]
-	}
+    {
+        'default':
+        [
+            {
+                'vshader': 'defaultVShader',
+                'fshader': 'defaultFShader',
+                // attributes
+                'attributes':
+                {
+                    'vert': { 'type': 'vec3' },
+                    'normal': { 'type': 'vec3' },
+                    'texcoord': { 'type': 'vec2' }
+                },
+                // parameters
+                'params':
+                {
+                    'u_tex0': { 'type': 'tex2d' },
+                    'u_time': { 'type': 'float' },
+                    'u_speed': { 'type': 'float' },
+                    'u_resolution': { 'type': 'vec2' }
+                },
+
+                // render states
+                'states':
+                {
+                    'depthEnable': true,
+                    'offset': [1.0, 0.1]
+                }
+            }
+        ]
+    }
 };
 
 TwistMaterial.prototype = new PulseMaterial();
-- 
cgit v1.2.3