diff options
author | hwc487 | 2012-07-19 11:44:50 -0700 |
---|---|---|
committer | hwc487 | 2012-07-19 11:44:50 -0700 |
commit | 431b6fa7610e59074b4ebb3e9e712672f185b8ad (patch) | |
tree | f1e23ef3e52d1a23d084a8e6471cb867010785a5 /js/models | |
parent | 0df5ad6391df5d285cb8b93dc23e2595cddaec3c (diff) | |
download | ninja-431b6fa7610e59074b4ebb3e9e712672f185b8ad.tar.gz |
Renamed Raiders material to Dark Blur, and Paris to Blue Sky.
Diffstat (limited to 'js/models')
-rwxr-xr-x | js/models/materials-model.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 15feca93..ec481933 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js | |||
@@ -43,7 +43,7 @@ var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").Bum | |||
43 | var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; | 43 | var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; |
44 | //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; | 44 | //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; |
45 | var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; | 45 | var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; |
46 | var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; | 46 | var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial; |
47 | var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; | 47 | var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; |
48 | var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; | 48 | var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; |
49 | //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; | 49 | //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; |
@@ -52,7 +52,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; | |||
52 | //var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; | 52 | //var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; |
53 | //var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; | 53 | //var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; |
54 | var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; | 54 | var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; |
55 | var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; | 55 | var BlueSkyMaterial = require("js/lib/rdge/materials/water-material").BlueSkyMaterial; |
56 | //var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; | 56 | //var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; |
57 | //var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; | 57 | //var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; |
58 | //var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; | 58 | //var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; |
@@ -74,8 +74,10 @@ exports.MaterialsModel = Montage.create(Component, { | |||
74 | value: function() { | 74 | value: function() { |
75 | // Load all the materials | 75 | // Load all the materials |
76 | this.addMaterial(new FlatMaterial()); | 76 | this.addMaterial(new FlatMaterial()); |
77 | this.addMaterial(new BlueSkyMaterial()); | ||
77 | this.addMaterial(new BumpMetalMaterial()); | 78 | this.addMaterial(new BumpMetalMaterial()); |
78 | //this.addMaterial(new CloudMaterial()); | 79 | //this.addMaterial(new CloudMaterial()); |
80 | this.addMaterial(new DarkBlurMaterial()); | ||
79 | //this.addMaterial(new DeformMaterial()); | 81 | //this.addMaterial(new DeformMaterial()); |
80 | this.addMaterial(new FlagMaterial()); | 82 | this.addMaterial(new FlagMaterial()); |
81 | //this.addMaterial(new FlyMaterial()); | 83 | //this.addMaterial(new FlyMaterial()); |
@@ -83,12 +85,10 @@ exports.MaterialsModel = Montage.create(Component, { | |||
83 | //this.addMaterial(new KeleidoscopeMaterial()); | 85 | //this.addMaterial(new KeleidoscopeMaterial()); |
84 | this.addMaterial(new LinearGradientMaterial()); | 86 | this.addMaterial(new LinearGradientMaterial()); |
85 | //this.addMaterial(new MandelMaterial()); | 87 | //this.addMaterial(new MandelMaterial()); |
86 | this.addMaterial(new ParisMaterial()); | ||
87 | this.addMaterial(new PlasmaMaterial()); | 88 | this.addMaterial(new PlasmaMaterial()); |
88 | this.addMaterial(new PulseMaterial()); | 89 | this.addMaterial(new PulseMaterial()); |
89 | this.addMaterial(new RadialBlurMaterial()); | 90 | this.addMaterial(new RadialBlurMaterial()); |
90 | this.addMaterial(new RadialGradientMaterial()); | 91 | this.addMaterial(new RadialGradientMaterial()); |
91 | this.addMaterial(new RaidersMaterial()); | ||
92 | //this.addMaterial(new ReliefTunnelMaterial()); | 92 | //this.addMaterial(new ReliefTunnelMaterial()); |
93 | //this.addMaterial(new SquareTunnelMaterial()); | 93 | //this.addMaterial(new SquareTunnelMaterial()); |
94 | //this.addMaterial(new StarMaterial()); | 94 | //this.addMaterial(new StarMaterial()); |
@@ -260,8 +260,8 @@ exports.MaterialsModel = Montage.create(Component, { | |||
260 | case "flag": mat = new FlagMaterial(); break; | 260 | case "flag": mat = new FlagMaterial(); break; |
261 | //case "fly": mat = new FlyMaterial(); break; | 261 | //case "fly": mat = new FlyMaterial(); break; |
262 | case "water": mat = new WaterMaterial(); break; | 262 | case "water": mat = new WaterMaterial(); break; |
263 | case "paris": mat = new ParisMaterial(); break; | 263 | case "blueSky": mat = new BlueSkyMaterial(); break; |
264 | case "raiders": mat = new RaidersMaterial(); break; | 264 | case "darkBlur": mat = new DarkBlurMaterial(); break; |
265 | //case "zinvert": mat = new ZInvertMaterial(); break; | 265 | //case "zinvert": mat = new ZInvertMaterial(); break; |
266 | //case "deform": mat = new DeformMaterial(); break; | 266 | //case "deform": mat = new DeformMaterial(); break; |
267 | //case "star": mat = new StarMaterial(); break; | 267 | //case "star": mat = new StarMaterial(); break; |