Added all materials back in

5 files changed, 27 insertions, 11 deletions

diff --git a/js/helper-classes/RDGE/Materials/FlyMaterial.js b/js/helper-classes/RDGE/Materials/FlyMaterial.js
index ca07ce85..4a44e2e5 100644
--- a/js/helper-classes/RDGE/Materials/FlyMaterial.js
+++ b/js/helper-classes/RDGE/Materials/FlyMaterial.js
@@ -20,7 +20,7 @@ function FlyMaterial()
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
         this._name = "FlyMaterial";
-        this._shaderName = "tunnel";
+        this._shaderName = "fly";
 
         this._texMap = 'assets/images/rocky-normal.jpg';
 
diff --git a/js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js b/js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js
index c5c0b9a7..6540c3e9 100644
--- a/js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js
+++ b/js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js
@@ -20,7 +20,7 @@ function ReliefTunnelMaterial()
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
         this._name = "ReliefTunnelMaterial";
-        this._shaderName = "tunnel";
+        this._shaderName = "reliefTunnel";
 
         this._texMap = 'assets/images/rocky-normal.jpg';
 
diff --git a/js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js b/js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js
index 41a46429..8238b651 100644
--- a/js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js
+++ b/js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js
@@ -20,7 +20,7 @@ function SquareTunnelMaterial()
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
         this._name = "SquareTunnelMaterial";
-        this._shaderName = "tunnel";
+        this._shaderName = "squareTunnel";
 
         this._texMap = 'assets/images/rocky-normal.jpg';
 
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js
index d62c2a21..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, {
                                         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 "julia":                           mat = new JuliaMaterial();                              break;
+                                        case "keleidoscope":            mat = new KeleidoscopeMaterial();               break;
+                                        case "mandel":                          mat = new MandelMaterial();                             break;
+
+
                                         default:
                                                 throw new Error( "Unrecognized material type: " + type );
                                                 pu.advancePastToken( "endMaterial\n" );
@@ -163,9 +182,8 @@ var radialGradientMaterial		= new RadialGradientMaterial();
 var bumpMetalMaterial                   = new BumpMetalMaterial();
 var uberMaterial                                = new UberMaterial();
 
-
-var taperMaterial                               = new TaperMaterial();
-var twistVertMaterial                   = new TwistVertMaterial();
+//var taperMaterial                             = new TaperMaterial();
+//var twistVertMaterial                 = new TwistVertMaterial();
 var radialBlurMaterial                  = new RadialBlurMaterial();
 var plasmaMaterial                              = new PlasmaMaterial();
 var pulseMaterial                               = new PulseMaterial();
@@ -177,7 +195,6 @@ var waterMaterial				= new WaterMaterial();
 var zInvertMaterial                             = new ZInvertMaterial();
 var deformMaterial                              = new DeformMaterial();
 var starMaterial                                = new StarMaterial();
-var bumpMetalMaterial                   = new BumpMetalMaterial();
 var twistMaterial                               = new TwistMaterial();
 var juliaMaterial                               = new JuliaMaterial();
 var keleidoscopeMaterial                = new KeleidoscopeMaterial();
@@ -190,8 +207,8 @@ MaterialsLibrary.addMaterial(radialGradientMaterial);
 MaterialsLibrary.addMaterial(bumpMetalMaterial);
 MaterialsLibrary.addMaterial(uberMaterial);
 
-MaterialsLibrary.addMaterial(taperMaterial);
-MaterialsLibrary.addMaterial(twistVertMaterial);
+//MaterialsLibrary.addMaterial(taperMaterial);
+//MaterialsLibrary.addMaterial(twistVertMaterial);
 
 MaterialsLibrary.addMaterial(radialBlurMaterial);
 MaterialsLibrary.addMaterial(plasmaMaterial);
@@ -204,7 +221,6 @@ MaterialsLibrary.addMaterial(waterMaterial);
 MaterialsLibrary.addMaterial(zInvertMaterial);
 MaterialsLibrary.addMaterial(deformMaterial);
 MaterialsLibrary.addMaterial(starMaterial);
-MaterialsLibrary.addMaterial(bumpMetalMaterial);
 MaterialsLibrary.addMaterial(twistMaterial);
 MaterialsLibrary.addMaterial(juliaMaterial);
 MaterialsLibrary.addMaterial(keleidoscopeMaterial);
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index e955623a..a958575e 100755
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
-          <leaf id="UberMaterial" label="Uber" />
+              <leaf id="UberMaterial" label="Uber" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
         <leaf id="LinearGradientMaterial" label="Linear Gradient" />
         <leaf id="RadialGradientMaterial" label="Radial Gradient" />