aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 15:48:37 -0800
committerEric Guzman2012-02-13 15:48:37 -0800
commitb2672478decd3ee3bfacf86b525551c997f9604d (patch)
tree79a88684406d3adf00350246a4da884b97fb0eac /js/helper-classes/RDGE/MaterialsLibrary.js
parenta738121a921e4c721b280434952b415b9ab3b1a8 (diff)
parent0620e2f788861e824d6e49fa319da4d20b18a556 (diff)
downloadninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js40
1 files changed, 6 insertions, 34 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index 9616b525..314a13bc 100644
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -127,21 +127,9 @@ var MaterialsLibrary = Object.create(Object.prototype, {
127 switch (type) 127 switch (type)
128 { 128 {
129 case "flat": mat = new FlatMaterial(); break; 129 case "flat": mat = new FlatMaterial(); break;
130 case "brick": mat = new BrickMaterial(); break;
131 case "iridescentScales": mat = new IridescentScalesMaterial(); break;
132 case "quilt_1": mat = new QuiltMaterial01(); break;
133 case "quilt_2": mat = new QuiltMaterial02(); break;
134 case "linearGradient": mat = new LinearGradientMaterial(); break; 130 case "linearGradient": mat = new LinearGradientMaterial(); break;
135 case "radialGradient": mat = new RadialGradientMaterial(); break; 131 case "radialGradient": mat = new RadialGradientMaterial(); break;
136 case "radialBlur": mat = new RadiaBlurMaterial(); break; 132 case "bumpMetal": mat = new BumpMetalMaterial(); break;
137 case "pulse": mat = new PulseMaterial(); break;
138 case "tunnel": mat = new TunnelMaterial(); break;
139 case "twist": mat = new TwistMaterial(); break;
140 case "keleidoscope": mat = new KeleidoscopeMaterial(); break;
141 case "julia": mat = new JuliaMaterial(); break;
142 case "mandel": mat = new MandelMaterial(); break;
143 case "plasma": mat = new PlasmaMaterial(); break;
144 case "bumpMetal": mat = new PlasmaMaterial(); break;
145 case "uber": mat = new UberMaterial(); break; 133 case "uber": mat = new UberMaterial(); break;
146 134
147 default: 135 default:
@@ -170,30 +158,14 @@ var MaterialsLibrary = Object.create(Object.prototype, {
170// create the library of stroke and fill materials 158// create the library of stroke and fill materials
171 159
172var flatMaterial = new FlatMaterial(); 160var flatMaterial = new FlatMaterial();
173var uberMaterial = new UberMaterial(); 161var linearGradientMaterial = new LinearGradientMaterial();
174//var linearGradientMaterial = new LinearGradientMaterial(); 162var radialGradientMaterial = new RadialGradientMaterial();
175//var radialGradientMaterial = new RadialGradientMaterial();
176//var radialBlurMaterial = new RadialBlurMaterial();
177//var pulseMaterial = new PulseMaterial();
178//var tunnelMaterial = new TunnelMaterial();
179//var twistMaterial = new TwistMaterial();
180//var keleidoscopeMaterial = new KeleidoscopeMaterial();
181//var juliaMaterial = new JuliaMaterial();
182//var mandelMaterial = new MandelMaterial();
183//var plasmaMaterial = new PlasmaMaterial();
184var bumpMetalMaterial = new BumpMetalMaterial(); 163var bumpMetalMaterial = new BumpMetalMaterial();
164var uberMaterial = new UberMaterial();
185 165
186MaterialsLibrary.addMaterial(flatMaterial); 166MaterialsLibrary.addMaterial(flatMaterial);
187//MaterialsLibrary.addMaterial(linearGradientMaterial); 167MaterialsLibrary.addMaterial(linearGradientMaterial);
188//MaterialsLibrary.addMaterial(radialGradientMaterial); 168MaterialsLibrary.addMaterial(radialGradientMaterial);
189//MaterialsLibrary.addMaterial(radialBlurMaterial);
190//MaterialsLibrary.addMaterial(pulseMaterial);
191//MaterialsLibrary.addMaterial(tunnelMaterial);
192//MaterialsLibrary.addMaterial(twistMaterial);
193//MaterialsLibrary.addMaterial(keleidoscopeMaterial);
194//MaterialsLibrary.addMaterial(juliaMaterial);
195//MaterialsLibrary.addMaterial(mandelMaterial);
196//MaterialsLibrary.addMaterial(plasmaMaterial);
197MaterialsLibrary.addMaterial(bumpMetalMaterial); 169MaterialsLibrary.addMaterial(bumpMetalMaterial);
198MaterialsLibrary.addMaterial(uberMaterial); 170MaterialsLibrary.addMaterial(uberMaterial);
199 171