aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/radial-blur-material.js
diff options
context:
space:
mode:
authorEric Guzman2012-07-20 11:24:19 -0700
committerEric Guzman2012-07-20 11:24:19 -0700
commit3cc29231852440508bdeec1964e40ce59f979f99 (patch)
tree2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/lib/rdge/materials/radial-blur-material.js
parent8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'js/lib/rdge/materials/radial-blur-material.js')
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 1f89f79e..2d26638b 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -176,22 +176,22 @@ var radialBlurMaterialDef =
176}; 176};
177 177
178 178
179var RaidersMaterial = function RaidersMaterial() { 179var DarkBlurMaterial = function DarkBlurMaterial() {
180 // initialize the inherited members 180 // initialize the inherited members
181 this.inheritedFrom = RadialBlurMaterial; 181 this.inheritedFrom = RadialBlurMaterial;
182 this.inheritedFrom(); 182 this.inheritedFrom();
183 183
184 this._name = "Raiders"; 184 this._name = "Dark Blur";
185 this._shaderName = "raiders"; 185 this._shaderName = "darkBlur";
186 186
187 this._texMap = 'assets/images/raiders.png'; 187 this._texMap = 'assets/images/darkblur.png';
188 this._propValues[this._propNames[0]] = this._texMap.slice(0); 188 this._propValues[this._propNames[0]] = this._texMap.slice(0);
189 189
190 190
191 // duplicate method required 191 // duplicate method required
192 this.dup = function (world) { 192 this.dup = function (world) {
193 // allocate a new uber material 193 // allocate a new uber material
194 var newMat = new RaidersMaterial(); 194 var newMat = new DarkBlurMaterial();
195 195
196 // copy over the current values; 196 // copy over the current values;
197 var propNames = [], propValues = [], propTypes = [], propLabels = []; 197 var propNames = [], propValues = [], propTypes = [], propLabels = [];
@@ -204,10 +204,10 @@ var RaidersMaterial = function RaidersMaterial() {
204 }; 204 };
205} 205}
206 206
207RaidersMaterial.prototype = new Material(); 207DarkBlurMaterial.prototype = new Material();
208 208
209if (typeof exports === "object") { 209if (typeof exports === "object") {
210 exports.RaidersMaterial = RaidersMaterial; 210 exports.DarkBlurMaterial = DarkBlurMaterial;
211} 211}
212 212
213 213