diff options
author | Valerio Virgillito | 2012-07-19 15:59:27 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-19 15:59:27 -0700 |
commit | 4b1a4b6b424400080271202800d2de78e5509708 (patch) | |
tree | 6554afcb8c3b8d83d1e9bb33241e239773f396e8 /js/lib | |
parent | c97f806fceb2a2e3c668b965e4f8e6fc047a3d9a (diff) | |
parent | 431b6fa7610e59074b4ebb3e9e712672f185b8ad (diff) | |
download | ninja-4b1a4b6b424400080271202800d2de78e5509708.tar.gz |
Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja into v0.7.1
Diffstat (limited to 'js/lib')
-rwxr-xr-x | js/lib/geom/geom-obj.js | 4 | ||||
-rw-r--r-- | js/lib/rdge/materials/radial-blur-material.js | 14 | ||||
-rw-r--r-- | js/lib/rdge/materials/water-material.js | 14 |
3 files changed, 16 insertions, 16 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index 3cd3a89b..e0ed51fb 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -385,8 +385,8 @@ exports.GeomObj = Object.create(Object.prototype, { | |||
385 | case "plasma": | 385 | case "plasma": |
386 | case "deform": | 386 | case "deform": |
387 | case "water": | 387 | case "water": |
388 | case "paris": | 388 | case "blueSky": |
389 | case "raiders": | 389 | case "darkBlur": |
390 | case "tunnel": | 390 | case "tunnel": |
391 | case "reliefTunnel": | 391 | case "reliefTunnel": |
392 | case "squareTunnel": | 392 | case "squareTunnel": |
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 | ||
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js index c7e7313c..9997244c 100644 --- a/js/lib/rdge/materials/water-material.js +++ b/js/lib/rdge/materials/water-material.js | |||
@@ -165,16 +165,16 @@ var waterMaterialDef = | |||
165 | } | 165 | } |
166 | }; | 166 | }; |
167 | 167 | ||
168 | var ParisMaterial = function ParisMaterial() | 168 | var BlueSkyMaterial = function BlueSkyMaterial() |
169 | { | 169 | { |
170 | // initialize the inherited members | 170 | // initialize the inherited members |
171 | this.inheritedFrom = WaterMaterial; | 171 | this.inheritedFrom = WaterMaterial; |
172 | this.inheritedFrom(); | 172 | this.inheritedFrom(); |
173 | 173 | ||
174 | this._name = "Paris"; | 174 | this._name = "Blue Sky"; |
175 | this._shaderName = "paris"; | 175 | this._shaderName = "blueSky"; |
176 | 176 | ||
177 | this._defaultTexMap = 'assets/images/paris.png'; | 177 | this._defaultTexMap = 'assets/images/bluesky.png'; |
178 | this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); | 178 | this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); |
179 | 179 | ||
180 | //this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; | 180 | //this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; |
@@ -191,7 +191,7 @@ var ParisMaterial = function ParisMaterial() | |||
191 | this._shader.init(); | 191 | this._shader.init(); |
192 | 192 | ||
193 | // set up the material node | 193 | // set up the material node |
194 | this._materialNode = RDGE.createMaterialNode("parisMaterial" + "_" + world.generateUniqueNodeID()); | 194 | this._materialNode = RDGE.createMaterialNode("blueSkyMaterial" + "_" + world.generateUniqueNodeID()); |
195 | this._materialNode.setShader(this._shader); | 195 | this._materialNode.setShader(this._shader); |
196 | 196 | ||
197 | this._time = 0; | 197 | this._time = 0; |
@@ -206,9 +206,9 @@ var ParisMaterial = function ParisMaterial() | |||
206 | } | 206 | } |
207 | 207 | ||
208 | 208 | ||
209 | ParisMaterial.prototype = new PulseMaterial(); | 209 | BlueSkyMaterial.prototype = new PulseMaterial(); |
210 | if (typeof exports === "object") { | 210 | if (typeof exports === "object") { |
211 | exports.ParisMaterial = ParisMaterial; | 211 | exports.BlueSkyMaterial = BlueSkyMaterial; |
212 | } | 212 | } |
213 | 213 | ||
214 | 214 | ||