aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-02 11:28:45 -0800
committerPushkar Joshi2012-02-02 11:28:45 -0800
commitacc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9 (patch)
tree877f8ca734228c11050b037ce82fc0d1e1303193 /js/helper-classes/RDGE/MaterialsLibrary.js
parent4d4de64472603426a73b26cc98ba8206190949b8 (diff)
parent4222db97e353fb65fab787ba5927d16d9fa4e1f7 (diff)
downloadninja-acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9.tar.gz
Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js40
1 files changed, 20 insertions, 20 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index edc4f7da..5f82a996 100644
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -170,28 +170,28 @@ var MaterialsLibrary = Object.create(Object.prototype, {
170// create the library of stroke and fill materials 170// create the library of stroke and fill materials
171 171
172var uberMaterial = new UberMaterial(); 172var uberMaterial = new UberMaterial();
173//var linearGradientMaterial = new LinearGradientMaterial(); 173var linearGradientMaterial = new LinearGradientMaterial();
174//var radialGradientMaterial = new RadialGradientMaterial(); 174var radialGradientMaterial = new RadialGradientMaterial();
175//var radialBlurMaterial = new RadialBlurMaterial(); 175var radialBlurMaterial = new RadialBlurMaterial();
176//var pulseMaterial = new PulseMaterial(); 176var pulseMaterial = new PulseMaterial();
177//var tunnelMaterial = new TunnelMaterial(); 177var tunnelMaterial = new TunnelMaterial();
178//var twistMaterial = new TwistMaterial(); 178var twistMaterial = new TwistMaterial();
179//var keleidoscopeMaterial = new KeleidoscopeMaterial(); 179var keleidoscopeMaterial = new KeleidoscopeMaterial();
180//var juliaMaterial = new JuliaMaterial(); 180var juliaMaterial = new JuliaMaterial();
181//var mandelMaterial = new MandelMaterial(); 181var mandelMaterial = new MandelMaterial();
182//var plasmaMaterial = new PlasmaMaterial(); 182var plasmaMaterial = new PlasmaMaterial();
183var bumpMetalMaterial = new BumpMetalMaterial(); 183var bumpMetalMaterial = new BumpMetalMaterial();
184 184
185//MaterialsLibrary.addMaterial(linearGradientMaterial); 185MaterialsLibrary.addMaterial(linearGradientMaterial);
186//MaterialsLibrary.addMaterial(radialGradientMaterial); 186MaterialsLibrary.addMaterial(radialGradientMaterial);
187//MaterialsLibrary.addMaterial(radialBlurMaterial); 187MaterialsLibrary.addMaterial(radialBlurMaterial);
188//MaterialsLibrary.addMaterial(pulseMaterial); 188MaterialsLibrary.addMaterial(pulseMaterial);
189//MaterialsLibrary.addMaterial(tunnelMaterial); 189MaterialsLibrary.addMaterial(tunnelMaterial);
190//MaterialsLibrary.addMaterial(twistMaterial); 190MaterialsLibrary.addMaterial(twistMaterial);
191//MaterialsLibrary.addMaterial(keleidoscopeMaterial); 191MaterialsLibrary.addMaterial(keleidoscopeMaterial);
192//MaterialsLibrary.addMaterial(juliaMaterial); 192MaterialsLibrary.addMaterial(juliaMaterial);
193//MaterialsLibrary.addMaterial(mandelMaterial); 193MaterialsLibrary.addMaterial(mandelMaterial);
194//MaterialsLibrary.addMaterial(plasmaMaterial); 194MaterialsLibrary.addMaterial(plasmaMaterial);
195MaterialsLibrary.addMaterial(bumpMetalMaterial); 195MaterialsLibrary.addMaterial(bumpMetalMaterial);
196MaterialsLibrary.addMaterial(uberMaterial); 196MaterialsLibrary.addMaterial(uberMaterial);
197 197