diff options
author | Ananya Sen | 2012-07-23 17:01:14 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-23 17:01:14 -0700 |
commit | 48d9ed19573a07c68da305d14ca6ab3a04d31d64 (patch) | |
tree | b4bf6c48c7fdade2cf531d84cac3359489d38405 /js/lib/rdge/materials/radial-blur-material.js | |
parent | c07a7a9d11bc8299fa9686544b18840cc8e640c2 (diff) | |
parent | afc7ad4f240fdf7890a79c2d4d7f8eb2e7c30a34 (diff) | |
download | ninja-48d9ed19573a07c68da305d14ca6ab3a04d31d64.tar.gz |
Merge branch 'refs/heads/Jose-Document' into Document
Diffstat (limited to 'js/lib/rdge/materials/radial-blur-material.js')
-rw-r--r-- | js/lib/rdge/materials/radial-blur-material.js | 14 |
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 | ||
179 | var RaidersMaterial = function RaidersMaterial() { | 179 | var 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 | ||
207 | RaidersMaterial.prototype = new Material(); | 207 | DarkBlurMaterial.prototype = new Material(); |
208 | 208 | ||
209 | if (typeof exports === "object") { | 209 | if (typeof exports === "object") { |
210 | exports.RaidersMaterial = RaidersMaterial; | 210 | exports.DarkBlurMaterial = DarkBlurMaterial; |
211 | } | 211 | } |
212 | 212 | ||
213 | 213 | ||