From 3d5b5f7c5efb25b5e605d5d120b57f2dde33fd23 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 3 Feb 2012 15:18:45 -0800
Subject: Added a counter to the renderer that tracks the number of unloaded
 texture maps.

Started vertex deformations.
---
 js/helper-classes/RDGE/Materials/FlatMaterial.js           | 1 +
 js/helper-classes/RDGE/Materials/LinearGradientMaterial.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/helper-classes/RDGE/Materials')

diff --git a/js/helper-classes/RDGE/Materials/FlatMaterial.js b/js/helper-classes/RDGE/Materials/FlatMaterial.js
index 3e3ae25e..c8eb3b6c 100644
--- a/js/helper-classes/RDGE/Materials/FlatMaterial.js
+++ b/js/helper-classes/RDGE/Materials/FlatMaterial.js
@@ -121,6 +121,7 @@ function FlatMaterial()
 flatShaderDef  = 
 {
     'shaders':  { // shader files
+		//'defaultVShader':"assets/shaders/Taper.vert.glsl",
 		'defaultVShader':"assets/shaders/Basic.vert.glsl",
 		'defaultFShader':"assets/shaders/Basic.frag.glsl",
         },
diff --git a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
index ce965296..8b23d77e 100644
--- a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
+++ b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
@@ -135,8 +135,10 @@ function LinearGradientMaterial()
 	// duplcate method requirde
 	this.dup = function()	{  return new LinearGradientMaterial();	} 
 
-	this.init = function()
+	this.init = function( world )
 	{
+		this.setWorld( world );
+
 		// set up the shader
 		this._shader = new jshader();
 		this._shader.def = linearGradientMaterialDef;
-- 
cgit v1.2.3