diff options
author | hwc487 | 2012-06-15 11:26:57 -0700 |
---|---|---|
committer | hwc487 | 2012-06-15 11:26:57 -0700 |
commit | 2779b48197effabe1a975c8139c497631238f8f1 (patch) | |
tree | 3469d6b7b7fbc6a7d1c9a2631c5ded0a38d69161 /js/models | |
parent | 9f74616f7727bf8cf988021ba0cd5d3354d67991 (diff) | |
download | ninja-2779b48197effabe1a975c8139c497631238f8f1.tar.gz |
Re-added Paris material
Diffstat (limited to 'js/models')
-rwxr-xr-x | js/models/materials-model.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js index d8f9a9e2..3cc80982 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js | |||
@@ -27,7 +27,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; | |||
27 | var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; | 27 | var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; |
28 | var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; | 28 | var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; |
29 | var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; | 29 | var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; |
30 | //var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; | 30 | var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; |
31 | var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; | 31 | var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; |
32 | var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; | 32 | var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; |
33 | var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; | 33 | var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; |
@@ -58,9 +58,9 @@ exports.MaterialsModel = Montage.create(Component, { | |||
58 | this.addMaterial(new KeleidoscopeMaterial()); | 58 | this.addMaterial(new KeleidoscopeMaterial()); |
59 | this.addMaterial(new LinearGradientMaterial()); | 59 | this.addMaterial(new LinearGradientMaterial()); |
60 | this.addMaterial(new MandelMaterial()); | 60 | this.addMaterial(new MandelMaterial()); |
61 | this.addMaterial(new ParisMaterial()); | ||
61 | this.addMaterial(new PlasmaMaterial()); | 62 | this.addMaterial(new PlasmaMaterial()); |
62 | this.addMaterial(new PulseMaterial()); | 63 | this.addMaterial(new PulseMaterial()); |
63 | //this.addMaterial(new ParisMaterial()); | ||
64 | this.addMaterial(new RadialBlurMaterial()); | 64 | this.addMaterial(new RadialBlurMaterial()); |
65 | this.addMaterial(new RadialGradientMaterial()); | 65 | this.addMaterial(new RadialGradientMaterial()); |
66 | this.addMaterial(new RaidersMaterial()); | 66 | this.addMaterial(new RaidersMaterial()); |
@@ -235,7 +235,7 @@ exports.MaterialsModel = Montage.create(Component, { | |||
235 | case "flag": mat = new FlagMaterial(); break; | 235 | case "flag": mat = new FlagMaterial(); break; |
236 | case "fly": mat = new FlyMaterial(); break; | 236 | case "fly": mat = new FlyMaterial(); break; |
237 | case "water": mat = new WaterMaterial(); break; | 237 | case "water": mat = new WaterMaterial(); break; |
238 | //case "paris": mat = new ParisMaterial(); break; | 238 | case "paris": mat = new ParisMaterial(); break; |
239 | case "raiders": mat = new RaidersMaterial(); break; | 239 | case "raiders": mat = new RaidersMaterial(); break; |
240 | case "zinvert": mat = new ZInvertMaterial(); break; | 240 | case "zinvert": mat = new ZInvertMaterial(); break; |
241 | case "deform": mat = new DeformMaterial(); break; | 241 | case "deform": mat = new DeformMaterial(); break; |