Merge branch 'pentool' into brushtool

Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
author: Pushkar Joshi 2012-02-24 12:08:49 -0800
committer: Pushkar Joshi 2012-02-24 12:08:49 -0800
commit: 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree: c51112223ceb9121cd595a60335eb2795215590f /js/helper-classes/RDGE/MaterialsLibrary.js
parent: fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent: 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download: ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
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, {
                                switch (type)
                                {
                                        case "flat":                            mat = new FlatMaterial();                               break;
-                                        case "brick":                           mat = new BrickMaterial();                              break;
-                                        case "iridescentScales":        mat = new IridescentScalesMaterial();   break;
-                                        case "quilt_1":                         mat = new QuiltMaterial01();                    break;
-                                        case "quilt_2":                         mat = new QuiltMaterial02();                    break;
                                        case "linearGradient":          mat = new LinearGradientMaterial();             break;
                                        case "radialGradient":          mat = new RadialGradientMaterial();             break;
-                                        case "radialBlur":                      mat = new RadiaBlurMaterial();                  break;
+                                        case "bumpMetal":                       mat = new BumpMetalMaterial();                  break;
+                                        case "uber":                            mat = new UberMaterial();                               break;
+                                        case "taper":                           mat = new TaperMaterial();                              break;
+                                        case "twistVert":                       mat = new TwistVertMaterial();                  break;
+                                        case "radialBlur":                      mat = new RadialBlurMaterial();                 break;
+                                        case "plasma":                          mat = new PlasmaMaterial();                             break;
                                        case "pulse":                           mat = new PulseMaterial();                              break;
                                        case "tunnel":                          mat = new TunnelMaterial();                             break;
+                                        case "reliefTunnel":            mat = new ReliefTunnelMaterial();               break;
+                                        case "squareTunnel":            mat = new SquareTunnelMaterial();               break;
+                                        case "fly":                                     mat = new FlyMaterial();                                break;
+                                        case "water":                           mat = new WaterMaterial();                              break;
+                                        case "zinvert":                         mat = new ZInvertMaterial();                    break;
+                                        case "deform":                          mat = new DeformMaterial();                             break;
+                                        case "star":                            mat = new StarMaterial();                               break;
                                        case "twist":                           mat = new TwistMaterial();                              break;
-                                        case "keleidoscope":            mat = new KeleidoscopeMaterial();               break;
                                        case "julia":                           mat = new JuliaMaterial();                              break;
+                                        case "keleidoscope":            mat = new KeleidoscopeMaterial();               break;
                                        case "mandel":                          mat = new MandelMaterial();                             break;
-                                        case "plasma":                          mat = new PlasmaMaterial();                             break;
-                                        case "bumpMetal":                       mat = new BumpMetalMaterial();                  break;
-                                        case "uber":                            mat = new UberMaterial();                               break;
                                        default:
                                                throw new Error( "Unrecognized material type: " + type );
@@ -170,30 +177,54 @@ var MaterialsLibrary = Object.create(Object.prototype, {
 // create the library of stroke and fill materials
 var flatMaterial                                = new FlatMaterial();
-var uberMaterial                                = new UberMaterial();
+var linearGradientMaterial              = new LinearGradientMaterial();
-//var linearGradientMaterial            = new LinearGradientMaterial();
+var radialGradientMaterial              = new RadialGradientMaterial();
-//var radialGradientMaterial            = new RadialGradientMaterial();
-//var radialBlurMaterial                        = new RadialBlurMaterial();
-//var pulseMaterial                             = new PulseMaterial();
-//var tunnelMaterial                            = new TunnelMaterial();
-//var twistMaterial                             = new TwistMaterial();
-//var keleidoscopeMaterial              = new KeleidoscopeMaterial();
-//var juliaMaterial                             = new JuliaMaterial();
-//var mandelMaterial                            = new MandelMaterial();
-//var plasmaMaterial                            = new PlasmaMaterial();
 var bumpMetalMaterial                   = new BumpMetalMaterial();
+var uberMaterial                                = new UberMaterial();
+//var taperMaterial                             = new TaperMaterial();
+//var twistVertMaterial                 = new TwistVertMaterial();
+var radialBlurMaterial                  = new RadialBlurMaterial();
+var plasmaMaterial                              = new PlasmaMaterial();
+var pulseMaterial                               = new PulseMaterial();
+var tunnelMaterial                              = new TunnelMaterial();
+var reliefTunnelMaterial                = new ReliefTunnelMaterial();
+var squareTunnelMaterial                = new SquareTunnelMaterial();
+var flyMaterial                                 = new FlyMaterial();
+var waterMaterial                               = new WaterMaterial();
+var zInvertMaterial                             = new ZInvertMaterial();
+var deformMaterial                              = new DeformMaterial();
+var starMaterial                                = new StarMaterial();
+var twistMaterial                               = new TwistMaterial();
+var juliaMaterial                               = new JuliaMaterial();
+var keleidoscopeMaterial                = new KeleidoscopeMaterial();
+var mandelMaterial                              = new MandelMaterial();
 MaterialsLibrary.addMaterial(flatMaterial);
-//MaterialsLibrary.addMaterial(linearGradientMaterial);
+MaterialsLibrary.addMaterial(linearGradientMaterial);
-//MaterialsLibrary.addMaterial(radialGradientMaterial);
+MaterialsLibrary.addMaterial(radialGradientMaterial);
-//MaterialsLibrary.addMaterial(radialBlurMaterial);
-//MaterialsLibrary.addMaterial(pulseMaterial);
-//MaterialsLibrary.addMaterial(tunnelMaterial);
-//MaterialsLibrary.addMaterial(twistMaterial);
-//MaterialsLibrary.addMaterial(keleidoscopeMaterial);
-//MaterialsLibrary.addMaterial(juliaMaterial);
-//MaterialsLibrary.addMaterial(mandelMaterial);
-//MaterialsLibrary.addMaterial(plasmaMaterial);
 MaterialsLibrary.addMaterial(bumpMetalMaterial);
 MaterialsLibrary.addMaterial(uberMaterial);
+//MaterialsLibrary.addMaterial(taperMaterial);
+//MaterialsLibrary.addMaterial(twistVertMaterial);
+MaterialsLibrary.addMaterial(radialBlurMaterial);
+MaterialsLibrary.addMaterial(plasmaMaterial);
+MaterialsLibrary.addMaterial(pulseMaterial);
+MaterialsLibrary.addMaterial(tunnelMaterial);
+MaterialsLibrary.addMaterial(reliefTunnelMaterial);
+MaterialsLibrary.addMaterial(squareTunnelMaterial);
+MaterialsLibrary.addMaterial(flyMaterial);
+MaterialsLibrary.addMaterial(waterMaterial);
+MaterialsLibrary.addMaterial(zInvertMaterial);
+MaterialsLibrary.addMaterial(deformMaterial);
+MaterialsLibrary.addMaterial(starMaterial);
+MaterialsLibrary.addMaterial(twistMaterial);
+MaterialsLibrary.addMaterial(juliaMaterial);
+MaterialsLibrary.addMaterial(keleidoscopeMaterial);
+MaterialsLibrary.addMaterial(mandelMaterial);
author	Pushkar Joshi	2012-02-24 12:08:49 -0800
committer	Pushkar Joshi	2012-02-24 12:08:49 -0800
commit	03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree	c51112223ceb9121cd595a60335eb2795215590f /js/helper-classes/RDGE/MaterialsLibrary.js
parent	fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent	053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download	ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz

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
172	var flatMaterial = new FlatMaterial();	179	var flatMaterial = new FlatMaterial();
173	var uberMaterial = new UberMaterial();	180	var linearGradientMaterial = new LinearGradientMaterial();
174	//var linearGradientMaterial = new LinearGradientMaterial();	181	var 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();
184	var bumpMetalMaterial = new BumpMetalMaterial();	182	var bumpMetalMaterial = new BumpMetalMaterial();
		183	var uberMaterial = new UberMaterial();
		184
		185	//var taperMaterial = new TaperMaterial();
		186	//var twistVertMaterial = new TwistVertMaterial();
		187	var radialBlurMaterial = new RadialBlurMaterial();
		188	var plasmaMaterial = new PlasmaMaterial();
		189	var pulseMaterial = new PulseMaterial();
		190	var tunnelMaterial = new TunnelMaterial();
		191	var reliefTunnelMaterial = new ReliefTunnelMaterial();
		192	var squareTunnelMaterial = new SquareTunnelMaterial();
		193	var flyMaterial = new FlyMaterial();
		194	var waterMaterial = new WaterMaterial();
		195	var zInvertMaterial = new ZInvertMaterial();
		196	var deformMaterial = new DeformMaterial();
		197	var starMaterial = new StarMaterial();
		198	var twistMaterial = new TwistMaterial();
		199	var juliaMaterial = new JuliaMaterial();
		200	var keleidoscopeMaterial = new KeleidoscopeMaterial();
		201	var mandelMaterial = new MandelMaterial();
		202
185		203
186	MaterialsLibrary.addMaterial(flatMaterial);	204	MaterialsLibrary.addMaterial(flatMaterial);
187	//MaterialsLibrary.addMaterial(linearGradientMaterial);	205	MaterialsLibrary.addMaterial(linearGradientMaterial);
188	//MaterialsLibrary.addMaterial(radialGradientMaterial);	206	MaterialsLibrary.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);
197	MaterialsLibrary.addMaterial(bumpMetalMaterial);	207	MaterialsLibrary.addMaterial(bumpMetalMaterial);
198	MaterialsLibrary.addMaterial(uberMaterial);	208	MaterialsLibrary.addMaterial(uberMaterial);
199		209
		210	//MaterialsLibrary.addMaterial(taperMaterial);
		211	//MaterialsLibrary.addMaterial(twistVertMaterial);
		212
		213	MaterialsLibrary.addMaterial(radialBlurMaterial);
		214	MaterialsLibrary.addMaterial(plasmaMaterial);
		215	MaterialsLibrary.addMaterial(pulseMaterial);
		216	MaterialsLibrary.addMaterial(tunnelMaterial);
		217	MaterialsLibrary.addMaterial(reliefTunnelMaterial);
		218	MaterialsLibrary.addMaterial(squareTunnelMaterial);
		219	MaterialsLibrary.addMaterial(flyMaterial);
		220	MaterialsLibrary.addMaterial(waterMaterial);
		221	MaterialsLibrary.addMaterial(zInvertMaterial);
		222	MaterialsLibrary.addMaterial(deformMaterial);
		223	MaterialsLibrary.addMaterial(starMaterial);
		224	MaterialsLibrary.addMaterial(twistMaterial);
		225	MaterialsLibrary.addMaterial(juliaMaterial);
		226	MaterialsLibrary.addMaterial(keleidoscopeMaterial);
		227	MaterialsLibrary.addMaterial(mandelMaterial);
		228
		229
		230