From 98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 20 Mar 2012 16:26:52 -0700
Subject: Bug Fixes for Canvas & WebGL File IO

---
 js/lib/rdge/materials/radial-blur-material.js | 29 ++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

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

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index e76b302f..d67a3d43 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -174,7 +174,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		return jObj;
 	};
 
-	this.importJSON = function( importStr )
+	this.importJSON = function( jObj )
 	{
         if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
         this.setName( jObj.name );
@@ -278,10 +278,33 @@ var radialBlurMaterialDef =
 	}
 };
 
+
+/*
+var RaidersMaterial = function RaidersMaterial()
+{
+	// initialize the inherited members
+	this.inheritedFrom = RadialBlurMaterial;
+	this.inheritedFrom();
+
+	this._name = "RaidersMaterial";
+	this._shaderName = "radialBlur";
+
+	this._texMap = 'assets/images/raiders.png';
+	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+}
+
+RaidersMaterial.prototype = new Material();
+
+if (typeof exports === "object")
+{
+	exports.RaidersMaterial = RaidersMaterial;
+}
+*/
+
+
 RadialBlurMaterial.prototype = new Material();
 
-if (typeof exports === "object") {
+if (typeof exports === "object")
     exports.RadialBlurMaterial = RadialBlurMaterial;
-}
 
 
-- 
cgit v1.2.3