aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-27 11:30:17 -0700
committerValerio Virgillito2012-03-27 11:30:17 -0700
commit73ae65902d355fcb75bcdb486eaa27c0d79125c8 (patch)
tree89b0ae1c6d49916544f5003f7c6d08d19b2a4fb1 /js/lib/rdge
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
parent2d94104653667e93e0f7e5f8d12bc4f7b82e64fa (diff)
downloadninja-73ae65902d355fcb75bcdb486eaa27c0d79125c8.tar.gz
Merge pull request #144 from mqg734/WebGLFileIO
WebGL Fixes and Minor EyeDropper Tool Fixes.
Diffstat (limited to 'js/lib/rdge')
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js18
1 files changed, 17 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index f4a4baa2..fee02a1d 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -282,10 +282,26 @@ var RaidersMaterial = function RaidersMaterial()
282 this.inheritedFrom(); 282 this.inheritedFrom();
283 283
284 this._name = "RaidersMaterial"; 284 this._name = "RaidersMaterial";
285 this._shaderName = "radialBlur"; 285 this._shaderName = "raiders";
286 286
287 this._texMap = 'assets/images/raiders.png'; 287 this._texMap = 'assets/images/raiders.png';
288 this._propValues[ this._propNames[0] ] = this._texMap.slice(0); 288 this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
289
290
291 // duplcate method requirde
292 this.dup = function( world ) {
293 // allocate a new uber material
294 var newMat = new RaidersMaterial();
295
296 // copy over the current values;
297 var propNames = [], propValues = [], propTypes = [], propLabels = [];
298 this.getAllProperties( propNames, propValues, propTypes, propLabels);
299 var n = propNames.length;
300 for (var i=0; i<n; i++)
301 newMat.setProperty( propNames[i], propValues[i] );
302
303 return newMat;
304 };
289} 305}
290 306
291RaidersMaterial.prototype = new Material(); 307RaidersMaterial.prototype = new Material();