aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/radial-blur-material.js
diff options
context:
space:
mode:
authorhwc4872012-03-20 16:26:52 -0700
committerhwc4872012-03-20 16:26:52 -0700
commit98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c (patch)
tree93a3fc2c1aaffb97edeecc890e5540f7d15ad838 /js/lib/rdge/materials/radial-blur-material.js
parent43ea2515f1482eeb77454f407111f0568c056f72 (diff)
downloadninja-98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c.tar.gz
Bug Fixes for Canvas & WebGL File IO
Diffstat (limited to 'js/lib/rdge/materials/radial-blur-material.js')
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js29
1 files changed, 26 insertions, 3 deletions
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() {
174 return jObj; 174 return jObj;
175 }; 175 };
176 176
177 this.importJSON = function( importStr ) 177 this.importJSON = function( jObj )
178 { 178 {
179 if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" ); 179 if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" );
180 this.setName( jObj.name ); 180 this.setName( jObj.name );
@@ -278,10 +278,33 @@ var radialBlurMaterialDef =
278 } 278 }
279}; 279};
280 280
281
282/*
283var RaidersMaterial = function RaidersMaterial()
284{
285 // initialize the inherited members
286 this.inheritedFrom = RadialBlurMaterial;
287 this.inheritedFrom();
288
289 this._name = "RaidersMaterial";
290 this._shaderName = "radialBlur";
291
292 this._texMap = 'assets/images/raiders.png';
293 this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
294}
295
296RaidersMaterial.prototype = new Material();
297
298if (typeof exports === "object")
299{
300 exports.RaidersMaterial = RaidersMaterial;
301}
302*/
303
304
281RadialBlurMaterial.prototype = new Material(); 305RadialBlurMaterial.prototype = new Material();
282 306
283if (typeof exports === "object") { 307if (typeof exports === "object")
284 exports.RadialBlurMaterial = RadialBlurMaterial; 308 exports.RadialBlurMaterial = RadialBlurMaterial;
285}
286 309
287 310