diff options
author | hwc487 | 2012-04-26 16:40:05 -0700 |
---|---|---|
committer | hwc487 | 2012-04-26 16:40:05 -0700 |
commit | 5a1965bf2ed9a54601ca16fd67555335c510ce08 (patch) | |
tree | 7fa2419c8a194e7b0265b58f0f4d10d02a0d66f4 /js/models | |
parent | ee07f71e9e6c9219e02738c77fb038bece2e03b6 (diff) | |
download | ninja-5a1965bf2ed9a54601ca16fd67555335c510ce08.tar.gz |
Update materials to the new texture model.
Create local world for deleted source canvases
Diffstat (limited to 'js/models')
-rwxr-xr-x | js/models/materials-model.js | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js index a083dc54..20ef317a 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js | |||
@@ -45,37 +45,37 @@ exports.MaterialsModel = Montage.create(Component, { | |||
45 | value: false | 45 | value: false |
46 | }, | 46 | }, |
47 | 47 | ||
48 | deserializedFromTemplate: { | 48 | deserializedFromTemplate: { |
49 | value: function() { | 49 | value: function() { |
50 | // Load all the materials | 50 | // Load all the materials |
51 | this.addMaterial(new FlatMaterial()); | 51 | this.addMaterial(new BumpMetalMaterial()); |
52 | this.addMaterial(new LinearGradientMaterial()); | 52 | this.addMaterial(new CloudMaterial()); |
53 | this.addMaterial(new RadialGradientMaterial()); | 53 | this.addMaterial(new DeformMaterial()); |
54 | this.addMaterial(new BumpMetalMaterial()); | 54 | this.addMaterial(new FlagMaterial()); |
55 | this.addMaterial(new UberMaterial()); | 55 | this.addMaterial(new FlatMaterial()); |
56 | this.addMaterial(new CloudMaterial()); | 56 | this.addMaterial(new FlyMaterial()); |
57 | this.addMaterial(new RadialBlurMaterial()); | 57 | this.addMaterial(new JuliaMaterial()); |
58 | this.addMaterial(new RaidersMaterial()); | 58 | this.addMaterial(new KeleidoscopeMaterial()); |
59 | this.addMaterial(new PlasmaMaterial()); | 59 | this.addMaterial(new LinearGradientMaterial()); |
60 | this.addMaterial(new PulseMaterial()); | 60 | this.addMaterial(new MandelMaterial()); |
61 | this.addMaterial(new TunnelMaterial()); | 61 | this.addMaterial(new PlasmaMaterial()); |
62 | this.addMaterial(new ReliefTunnelMaterial()); | 62 | this.addMaterial(new PulseMaterial()); |
63 | this.addMaterial(new FlagMaterial()); | 63 | this.addMaterial(new ParisMaterial()); |
64 | this.addMaterial(new SquareTunnelMaterial()); | 64 | this.addMaterial(new RadialGradientMaterial()); |
65 | this.addMaterial(new FlyMaterial()); | 65 | this.addMaterial(new RadialBlurMaterial()); |
66 | this.addMaterial(new WaterMaterial()); | 66 | this.addMaterial(new RaidersMaterial()); |
67 | this.addMaterial(new ParisMaterial()); | 67 | this.addMaterial(new ReliefTunnelMaterial()); |
68 | this.addMaterial(new ZInvertMaterial()); | 68 | this.addMaterial(new SquareTunnelMaterial()); |
69 | this.addMaterial(new DeformMaterial()); | 69 | this.addMaterial(new StarMaterial()); |
70 | this.addMaterial(new StarMaterial()); | 70 | this.addMaterial(new TaperMaterial()); |
71 | this.addMaterial(new TwistMaterial()); | 71 | this.addMaterial(new TunnelMaterial()); |
72 | this.addMaterial(new TwistVertMaterial()); | 72 | this.addMaterial(new TwistMaterial()); |
73 | this.addMaterial(new TaperMaterial()); | 73 | this.addMaterial(new TwistVertMaterial()); |
74 | this.addMaterial(new JuliaMaterial()); | 74 | this.addMaterial(new WaterMaterial()); |
75 | this.addMaterial(new KeleidoscopeMaterial()); | 75 | this.addMaterial(new ZInvertMaterial()); |
76 | this.addMaterial(new MandelMaterial()); | 76 | this.addMaterial(new UberMaterial()); |
77 | } | 77 | } |
78 | }, | 78 | }, |
79 | 79 | ||
80 | _materials : { | 80 | _materials : { |
81 | value: AppModel.materials | 81 | value: AppModel.materials |