diff options
author | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
commit | 18243deb66ab14a014756bfb0be1a52648c7771a (patch) | |
tree | c64660f7f69840cac5186fd730221335bd0a67af /js/helper-classes/RDGE/MaterialsLibrary.js | |
parent | 802e92eb70b00849dadacf2c6590d27edbe65d99 (diff) | |
parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
download | ninja-18243deb66ab14a014756bfb0be1a52648c7771a.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rw-r--r-- | js/helper-classes/RDGE/MaterialsLibrary.js | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index 5f82a996..9616b525 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js | |||
@@ -169,29 +169,31 @@ var MaterialsLibrary = Object.create(Object.prototype, { | |||
169 | 169 | ||
170 | // create the library of stroke and fill materials | 170 | // create the library of stroke and fill materials |
171 | 171 | ||
172 | var flatMaterial = new FlatMaterial(); | ||
172 | var uberMaterial = new UberMaterial(); | 173 | var uberMaterial = new UberMaterial(); |
173 | var linearGradientMaterial = new LinearGradientMaterial(); | 174 | //var linearGradientMaterial = new LinearGradientMaterial(); |
174 | var radialGradientMaterial = new RadialGradientMaterial(); | 175 | //var radialGradientMaterial = new RadialGradientMaterial(); |
175 | var radialBlurMaterial = new RadialBlurMaterial(); | 176 | //var radialBlurMaterial = new RadialBlurMaterial(); |
176 | var pulseMaterial = new PulseMaterial(); | 177 | //var pulseMaterial = new PulseMaterial(); |
177 | var tunnelMaterial = new TunnelMaterial(); | 178 | //var tunnelMaterial = new TunnelMaterial(); |
178 | var twistMaterial = new TwistMaterial(); | 179 | //var twistMaterial = new TwistMaterial(); |
179 | var keleidoscopeMaterial = new KeleidoscopeMaterial(); | 180 | //var keleidoscopeMaterial = new KeleidoscopeMaterial(); |
180 | var juliaMaterial = new JuliaMaterial(); | 181 | //var juliaMaterial = new JuliaMaterial(); |
181 | var mandelMaterial = new MandelMaterial(); | 182 | //var mandelMaterial = new MandelMaterial(); |
182 | var plasmaMaterial = new PlasmaMaterial(); | 183 | //var plasmaMaterial = new PlasmaMaterial(); |
183 | var bumpMetalMaterial = new BumpMetalMaterial(); | 184 | var bumpMetalMaterial = new BumpMetalMaterial(); |
184 | 185 | ||
185 | MaterialsLibrary.addMaterial(linearGradientMaterial); | 186 | MaterialsLibrary.addMaterial(flatMaterial); |
186 | MaterialsLibrary.addMaterial(radialGradientMaterial); | 187 | //MaterialsLibrary.addMaterial(linearGradientMaterial); |
187 | MaterialsLibrary.addMaterial(radialBlurMaterial); | 188 | //MaterialsLibrary.addMaterial(radialGradientMaterial); |
188 | MaterialsLibrary.addMaterial(pulseMaterial); | 189 | //MaterialsLibrary.addMaterial(radialBlurMaterial); |
189 | MaterialsLibrary.addMaterial(tunnelMaterial); | 190 | //MaterialsLibrary.addMaterial(pulseMaterial); |
190 | MaterialsLibrary.addMaterial(twistMaterial); | 191 | //MaterialsLibrary.addMaterial(tunnelMaterial); |
191 | MaterialsLibrary.addMaterial(keleidoscopeMaterial); | 192 | //MaterialsLibrary.addMaterial(twistMaterial); |
192 | MaterialsLibrary.addMaterial(juliaMaterial); | 193 | //MaterialsLibrary.addMaterial(keleidoscopeMaterial); |
193 | MaterialsLibrary.addMaterial(mandelMaterial); | 194 | //MaterialsLibrary.addMaterial(juliaMaterial); |
194 | MaterialsLibrary.addMaterial(plasmaMaterial); | 195 | //MaterialsLibrary.addMaterial(mandelMaterial); |
196 | //MaterialsLibrary.addMaterial(plasmaMaterial); | ||
195 | MaterialsLibrary.addMaterial(bumpMetalMaterial); | 197 | MaterialsLibrary.addMaterial(bumpMetalMaterial); |
196 | MaterialsLibrary.addMaterial(uberMaterial); | 198 | MaterialsLibrary.addMaterial(uberMaterial); |
197 | 199 | ||