aboutsummaryrefslogtreecommitdiff
path: root/js/models/materials-model.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-24 15:46:16 -0700
committerJohn Mayhew2012-07-24 15:46:16 -0700
commit9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch)
tree407564eaa6466e8d4cf2eeee0c56dc623243586f /js/models/materials-model.js
parentd25359c75089215ee48838db081fd3d51cbbd85f (diff)
parent21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff)
downloadninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja
Diffstat (limited to 'js/models/materials-model.js')
-rwxr-xr-xjs/models/materials-model.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index cc3c3fa1..ec481933 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -42,8 +42,8 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate
42var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; 42var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; 43var 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; 45var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
46//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; 46var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial;
47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; 47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; 48var 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;
54var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; 54var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
55var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; 55var 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());
@@ -251,7 +251,7 @@ exports.MaterialsModel = Montage.create(Component, {
251 251
252 case "taper": mat = new TaperMaterial(); break; 252 case "taper": mat = new TaperMaterial(); break;
253 case "twistVert": mat = new TwistVertMaterial(); break; 253 case "twistVert": mat = new TwistVertMaterial(); break;
254 //case "radialBlur": mat = new RadialBlurMaterial(); break; 254 case "radialBlur": mat = new RadialBlurMaterial(); break;
255 case "plasma": mat = new PlasmaMaterial(); break; 255 case "plasma": mat = new PlasmaMaterial(); break;
256 case "pulse": mat = new PulseMaterial(); break; 256 case "pulse": mat = new PulseMaterial(); break;
257 //case "tunnel": mat = new TunnelMaterial(); break; 257 //case "tunnel": mat = new TunnelMaterial(); break;
@@ -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;