From 0f31002ca696c1ef303d2926a504afd27305e94f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 4 Apr 2012 05:52:54 -0700
Subject: Added Flag material

---
 js/lib/rdge/materials/flag-material.js       | 6 ++++++
 js/lib/rdge/materials/material.js            | 5 +++++
 js/lib/rdge/materials/twist-vert-material.js | 1 +
 3 files changed, 12 insertions(+)

(limited to 'js/lib/rdge/materials')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 77991a8c..8d4d1ee3 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -23,6 +23,8 @@ var FlagMaterial = function FlagMaterial() {
     this._defaultWaveWidth = 1.0;
     this._defaultWaveHeight = 1.0;
 
+	this._hasVertexDeformation = true;
+
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
@@ -37,6 +39,10 @@ var FlagMaterial = function FlagMaterial() {
     this._propValues[ this._propNames[1] ] = this._defaultWaveWidth;
     this._propValues[ this._propNames[2] ] = this._defaultWaveHeight;
 
+	// a material can be animated or not. default is not.  
+	// Any material needing continuous rendering should override this method
+	this.isAnimated	= function() {  return true;  };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 13251ce8..a81ca18f 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -38,6 +38,11 @@ var Material = function GLMaterial( world ) {
 	this._shader = null;
 	this._materialNode = null;
 
+	// vertex deformation variables
+	this._hasVertexDeformation = false;
+	this._vertexDeformationRange = [0, 0, 1, 1];	// (xMin, yMin, xMax, yMax)
+	this._vertexDeformationTolerance = 0.02;
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 2d2cdcc5..802690a2 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -36,6 +36,7 @@ function TwistVertMaterial()
 	this.getShaderName			= function()	{  return this._shaderName;				}
 
 	this.isAnimated				= function()	{  return true;							}
+	
 	this.hasVertexDeformation	= function()	{  return this._hasVertexDeformation;	}
 	this._hasVertexDeformation	= true;
 	this._vertexDeformationTolerance = 0.02;	// should be a property
-- 
cgit v1.2.3