From b6a8f72f670a8edee35554a4ca3a0618c526d651 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 5 Apr 2012 05:30:55 -0700
Subject: Re-added taper and twist-vert materials.

---
 js/lib/rdge/materials/taper-material.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 15b7b2b0..efba3807 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -4,15 +4,17 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
+var Material = require("js/lib/rdge/materials/material").Material;
+var Texture = require("js/lib/rdge/texture").Texture;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
 ///////////////////////////////////////////////////////////////////////
-function TaperMaterial()
+var TaperMaterial = function TaperMaterial()
 {
 	// initialize the inherited members
-	this.inheritedFrom = GLMaterial;
+	this.inheritedFrom = Material;
 	this.inheritedFrom();
    
 	///////////////////////////////////////////////////////////////////////
@@ -250,3 +252,7 @@ taperShaderDef  =
 	 }
 };
 
+
+if (typeof exports === "object") {
+    exports.TaperMaterial = TaperMaterial;
+}
-- 
cgit v1.2.3