From 5a1965bf2ed9a54601ca16fd67555335c510ce08 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 26 Apr 2012 16:40:05 -0700 Subject: Update materials to the new texture model. Create local world for deleted source canvases --- js/models/materials-model.js | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'js/models') 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, { value: false }, - deserializedFromTemplate: { - value: function() { - // Load all the materials - this.addMaterial(new FlatMaterial()); - this.addMaterial(new LinearGradientMaterial()); - this.addMaterial(new RadialGradientMaterial()); - this.addMaterial(new BumpMetalMaterial()); - this.addMaterial(new UberMaterial()); - this.addMaterial(new CloudMaterial()); - this.addMaterial(new RadialBlurMaterial()); - this.addMaterial(new RaidersMaterial()); - this.addMaterial(new PlasmaMaterial()); - this.addMaterial(new PulseMaterial()); - this.addMaterial(new TunnelMaterial()); - this.addMaterial(new ReliefTunnelMaterial()); - this.addMaterial(new FlagMaterial()); - this.addMaterial(new SquareTunnelMaterial()); - this.addMaterial(new FlyMaterial()); - this.addMaterial(new WaterMaterial()); - this.addMaterial(new ParisMaterial()); - this.addMaterial(new ZInvertMaterial()); - this.addMaterial(new DeformMaterial()); - this.addMaterial(new StarMaterial()); - this.addMaterial(new TwistMaterial()); - this.addMaterial(new TwistVertMaterial()); - this.addMaterial(new TaperMaterial()); - this.addMaterial(new JuliaMaterial()); - this.addMaterial(new KeleidoscopeMaterial()); - this.addMaterial(new MandelMaterial()); - } - }, + deserializedFromTemplate: { + value: function() { + // Load all the materials + this.addMaterial(new BumpMetalMaterial()); + this.addMaterial(new CloudMaterial()); + this.addMaterial(new DeformMaterial()); + this.addMaterial(new FlagMaterial()); + this.addMaterial(new FlatMaterial()); + this.addMaterial(new FlyMaterial()); + this.addMaterial(new JuliaMaterial()); + this.addMaterial(new KeleidoscopeMaterial()); + this.addMaterial(new LinearGradientMaterial()); + this.addMaterial(new MandelMaterial()); + this.addMaterial(new PlasmaMaterial()); + this.addMaterial(new PulseMaterial()); + this.addMaterial(new ParisMaterial()); + this.addMaterial(new RadialGradientMaterial()); + this.addMaterial(new RadialBlurMaterial()); + this.addMaterial(new RaidersMaterial()); + this.addMaterial(new ReliefTunnelMaterial()); + this.addMaterial(new SquareTunnelMaterial()); + this.addMaterial(new StarMaterial()); + this.addMaterial(new TaperMaterial()); + this.addMaterial(new TunnelMaterial()); + this.addMaterial(new TwistMaterial()); + this.addMaterial(new TwistVertMaterial()); + this.addMaterial(new WaterMaterial()); + this.addMaterial(new ZInvertMaterial()); + this.addMaterial(new UberMaterial()); + } + }, _materials : { value: AppModel.materials -- cgit v1.2.3