aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/helper-classes/RDGE/MaterialsLibrary.js
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/MaterialsLibrary.js91
1 files changed, 61 insertions, 30 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index e7fc51ac..8f55f2bc 100644..100755
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -127,22 +127,29 @@ 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;
133 case "uber": mat = new UberMaterial(); break;
134
135 case "taper": mat = new TaperMaterial(); break;
136 case "twistVert": mat = new TwistVertMaterial(); break;
137 case "radialBlur": mat = new RadialBlurMaterial(); break;
138 case "plasma": mat = new PlasmaMaterial(); break;
137 case "pulse": mat = new PulseMaterial(); break; 139 case "pulse": mat = new PulseMaterial(); break;
138 case "tunnel": mat = new TunnelMaterial(); break; 140 case "tunnel": mat = new TunnelMaterial(); break;
141 case "reliefTunnel": mat = new ReliefTunnelMaterial(); break;
142 case "squareTunnel": mat = new SquareTunnelMaterial(); break;
143 case "fly": mat = new FlyMaterial(); break;
144 case "water": mat = new WaterMaterial(); break;
145 case "zinvert": mat = new ZInvertMaterial(); break;
146 case "deform": mat = new DeformMaterial(); break;
147 case "star": mat = new StarMaterial(); break;
139 case "twist": mat = new TwistMaterial(); break; 148 case "twist": mat = new TwistMaterial(); break;
140 case "keleidoscope": mat = new KeleidoscopeMaterial(); break;
141 case "julia": mat = new JuliaMaterial(); break; 149 case "julia": mat = new JuliaMaterial(); break;
150 case "keleidoscope": mat = new KeleidoscopeMaterial(); break;
142 case "mandel": mat = new MandelMaterial(); break; 151 case "mandel": mat = new MandelMaterial(); break;
143 case "plasma": mat = new PlasmaMaterial(); break; 152
144 case "bumpMetal": mat = new BumpMetalMaterial(); break;
145 case "uber": mat = new UberMaterial(); break;
146 153
147 default: 154 default:
148 throw new Error( "Unrecognized material type: " + type ); 155 throw new Error( "Unrecognized material type: " + type );
@@ -170,30 +177,54 @@ var MaterialsLibrary = Object.create(Object.prototype, {
170// create the library of stroke and fill materials 177// create the library of stroke and fill materials
171 178
172var flatMaterial = new FlatMaterial(); 179var flatMaterial = new FlatMaterial();
173var uberMaterial = new UberMaterial(); 180var linearGradientMaterial = new LinearGradientMaterial();
174//var linearGradientMaterial = new LinearGradientMaterial(); 181var 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(); 182var bumpMetalMaterial = new BumpMetalMaterial();
183var uberMaterial = new UberMaterial();
184
185//var taperMaterial = new TaperMaterial();
186//var twistVertMaterial = new TwistVertMaterial();
187var radialBlurMaterial = new RadialBlurMaterial();
188var plasmaMaterial = new PlasmaMaterial();
189var pulseMaterial = new PulseMaterial();
190var tunnelMaterial = new TunnelMaterial();
191var reliefTunnelMaterial = new ReliefTunnelMaterial();
192var squareTunnelMaterial = new SquareTunnelMaterial();
193var flyMaterial = new FlyMaterial();
194var waterMaterial = new WaterMaterial();
195var zInvertMaterial = new ZInvertMaterial();
196var deformMaterial = new DeformMaterial();
197var starMaterial = new StarMaterial();
198var twistMaterial = new TwistMaterial();
199var juliaMaterial = new JuliaMaterial();
200var keleidoscopeMaterial = new KeleidoscopeMaterial();
201var mandelMaterial = new MandelMaterial();
202
185 203
186MaterialsLibrary.addMaterial(flatMaterial); 204MaterialsLibrary.addMaterial(flatMaterial);
187//MaterialsLibrary.addMaterial(linearGradientMaterial); 205MaterialsLibrary.addMaterial(linearGradientMaterial);
188//MaterialsLibrary.addMaterial(radialGradientMaterial); 206MaterialsLibrary.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); 207MaterialsLibrary.addMaterial(bumpMetalMaterial);
198MaterialsLibrary.addMaterial(uberMaterial); 208MaterialsLibrary.addMaterial(uberMaterial);
199 209
210//MaterialsLibrary.addMaterial(taperMaterial);
211//MaterialsLibrary.addMaterial(twistVertMaterial);
212
213MaterialsLibrary.addMaterial(radialBlurMaterial);
214MaterialsLibrary.addMaterial(plasmaMaterial);
215MaterialsLibrary.addMaterial(pulseMaterial);
216MaterialsLibrary.addMaterial(tunnelMaterial);
217MaterialsLibrary.addMaterial(reliefTunnelMaterial);
218MaterialsLibrary.addMaterial(squareTunnelMaterial);
219MaterialsLibrary.addMaterial(flyMaterial);
220MaterialsLibrary.addMaterial(waterMaterial);
221MaterialsLibrary.addMaterial(zInvertMaterial);
222MaterialsLibrary.addMaterial(deformMaterial);
223MaterialsLibrary.addMaterial(starMaterial);
224MaterialsLibrary.addMaterial(twistMaterial);
225MaterialsLibrary.addMaterial(juliaMaterial);
226MaterialsLibrary.addMaterial(keleidoscopeMaterial);
227MaterialsLibrary.addMaterial(mandelMaterial);
228
229
230