aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
diff options
context:
space:
mode:
Diffstat (limited to 'js/helper-classes')
-rw-r--r--js/helper-classes/RDGE/Materials/FlyMaterial.js2
-rw-r--r--js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js2
-rw-r--r--js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js2
-rwxr-xr-xjs/helper-classes/RDGE/MaterialsLibrary.js30
4 files changed, 26 insertions, 10 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()
20 // Instance variables 20 // Instance variables
21 /////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////
22 this._name = "FlyMaterial"; 22 this._name = "FlyMaterial";
23 this._shaderName = "tunnel"; 23 this._shaderName = "fly";
24 24
25 this._texMap = 'assets/images/rocky-normal.jpg'; 25 this._texMap = 'assets/images/rocky-normal.jpg';
26 26
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()
20 // Instance variables 20 // Instance variables
21 /////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////
22 this._name = "ReliefTunnelMaterial"; 22 this._name = "ReliefTunnelMaterial";
23 this._shaderName = "tunnel"; 23 this._shaderName = "reliefTunnel";
24 24
25 this._texMap = 'assets/images/rocky-normal.jpg'; 25 this._texMap = 'assets/images/rocky-normal.jpg';
26 26
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()
20 // Instance variables 20 // Instance variables
21 /////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////
22 this._name = "SquareTunnelMaterial"; 22 this._name = "SquareTunnelMaterial";
23 this._shaderName = "tunnel"; 23 this._shaderName = "squareTunnel";
24 24
25 this._texMap = 'assets/images/rocky-normal.jpg'; 25 this._texMap = 'assets/images/rocky-normal.jpg';
26 26
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, {
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,8 @@ var radialGradientMaterial = new RadialGradientMaterial();
163var bumpMetalMaterial = new BumpMetalMaterial(); 182var bumpMetalMaterial = new BumpMetalMaterial();
164var uberMaterial = new UberMaterial(); 183var uberMaterial = new UberMaterial();
165 184
166 185//var taperMaterial = new TaperMaterial();
167var taperMaterial = new TaperMaterial(); 186//var twistVertMaterial = new TwistVertMaterial();
168var twistVertMaterial = new TwistVertMaterial();
169var radialBlurMaterial = new RadialBlurMaterial(); 187var radialBlurMaterial = new RadialBlurMaterial();
170var plasmaMaterial = new PlasmaMaterial(); 188var plasmaMaterial = new PlasmaMaterial();
171var pulseMaterial = new PulseMaterial(); 189var pulseMaterial = new PulseMaterial();
@@ -177,7 +195,6 @@ var waterMaterial = new WaterMaterial();
177var zInvertMaterial = new ZInvertMaterial(); 195var zInvertMaterial = new ZInvertMaterial();
178var deformMaterial = new DeformMaterial(); 196var deformMaterial = new DeformMaterial();
179var starMaterial = new StarMaterial(); 197var starMaterial = new StarMaterial();
180var bumpMetalMaterial = new BumpMetalMaterial();
181var twistMaterial = new TwistMaterial(); 198var twistMaterial = new TwistMaterial();
182var juliaMaterial = new JuliaMaterial(); 199var juliaMaterial = new JuliaMaterial();
183var keleidoscopeMaterial = new KeleidoscopeMaterial(); 200var keleidoscopeMaterial = new KeleidoscopeMaterial();
@@ -190,8 +207,8 @@ MaterialsLibrary.addMaterial(radialGradientMaterial);
190MaterialsLibrary.addMaterial(bumpMetalMaterial); 207MaterialsLibrary.addMaterial(bumpMetalMaterial);
191MaterialsLibrary.addMaterial(uberMaterial); 208MaterialsLibrary.addMaterial(uberMaterial);
192 209
193MaterialsLibrary.addMaterial(taperMaterial); 210//MaterialsLibrary.addMaterial(taperMaterial);
194MaterialsLibrary.addMaterial(twistVertMaterial); 211//MaterialsLibrary.addMaterial(twistVertMaterial);
195 212
196MaterialsLibrary.addMaterial(radialBlurMaterial); 213MaterialsLibrary.addMaterial(radialBlurMaterial);
197MaterialsLibrary.addMaterial(plasmaMaterial); 214MaterialsLibrary.addMaterial(plasmaMaterial);
@@ -204,7 +221,6 @@ MaterialsLibrary.addMaterial(waterMaterial);
204MaterialsLibrary.addMaterial(zInvertMaterial); 221MaterialsLibrary.addMaterial(zInvertMaterial);
205MaterialsLibrary.addMaterial(deformMaterial); 222MaterialsLibrary.addMaterial(deformMaterial);
206MaterialsLibrary.addMaterial(starMaterial); 223MaterialsLibrary.addMaterial(starMaterial);
207MaterialsLibrary.addMaterial(bumpMetalMaterial);
208MaterialsLibrary.addMaterial(twistMaterial); 224MaterialsLibrary.addMaterial(twistMaterial);
209MaterialsLibrary.addMaterial(juliaMaterial); 225MaterialsLibrary.addMaterial(juliaMaterial);
210MaterialsLibrary.addMaterial(keleidoscopeMaterial); 226MaterialsLibrary.addMaterial(keleidoscopeMaterial);