aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-23 13:52:32 -0800
committerAnanya Sen2012-02-23 13:52:32 -0800
commitec3d07c2fea4e79c68606234074f43d694982e5b (patch)
treedc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/helper-classes/RDGE/MaterialsLibrary.js
parent7283884c39df537694b21419a3ea9e3ca7793b4b (diff)
parent287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff)
downloadninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rwxr-xr-xjs/helper-classes/RDGE/MaterialsLibrary.js59
1 files changed, 59 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index 314a13bc..8f55f2bc 100755
--- a/js/helper-classes/RDGE/MaterialsLibrary.js
+++ b/js/helper-classes/RDGE/MaterialsLibrary.js
@@ -132,6 +132,25 @@ var MaterialsLibrary = Object.create(Object.prototype, {
132 case "bumpMetal": mat = new BumpMetalMaterial(); break; 132 case "bumpMetal": mat = new BumpMetalMaterial(); break;
133 case "uber": mat = new UberMaterial(); break; 133 case "uber": mat = new UberMaterial(); break;
134 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;
139 case "pulse": mat = new PulseMaterial(); 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;
148 case "twist": mat = new TwistMaterial(); break;
149 case "julia": mat = new JuliaMaterial(); break;
150 case "keleidoscope": mat = new KeleidoscopeMaterial(); break;
151 case "mandel": mat = new MandelMaterial(); break;
152
153
135 default: 154 default:
136 throw new Error( "Unrecognized material type: " + type ); 155 throw new Error( "Unrecognized material type: " + type );
137 pu.advancePastToken( "endMaterial\n" ); 156 pu.advancePastToken( "endMaterial\n" );
@@ -163,9 +182,49 @@ var radialGradientMaterial = new RadialGradientMaterial();
163var bumpMetalMaterial = new BumpMetalMaterial(); 182var bumpMetalMaterial = new BumpMetalMaterial();
164var uberMaterial = new UberMaterial(); 183var uberMaterial = new UberMaterial();
165 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
203
166MaterialsLibrary.addMaterial(flatMaterial); 204MaterialsLibrary.addMaterial(flatMaterial);
167MaterialsLibrary.addMaterial(linearGradientMaterial); 205MaterialsLibrary.addMaterial(linearGradientMaterial);
168MaterialsLibrary.addMaterial(radialGradientMaterial); 206MaterialsLibrary.addMaterial(radialGradientMaterial);
169MaterialsLibrary.addMaterial(bumpMetalMaterial); 207MaterialsLibrary.addMaterial(bumpMetalMaterial);
170MaterialsLibrary.addMaterial(uberMaterial); 208MaterialsLibrary.addMaterial(uberMaterial);
171 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