aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorhwc4872012-02-02 11:57:58 -0800
committerhwc4872012-02-02 11:57:58 -0800
commit6321075d93044c6747682a8e7280b5996da7ec52 (patch)
tree2d484c78d66df96e1315ee0047d3ef5305b9f7f7 /js/panels/Materials
parent4222db97e353fb65fab787ba5927d16d9fa4e1f7 (diff)
downloadninja-6321075d93044c6747682a8e7280b5996da7ec52.tar.gz
added some additional shaders
Diffstat (limited to 'js/panels/Materials')
-rw-r--r--js/panels/Materials/Materials.xml7
-rw-r--r--js/panels/Materials/materials-popup.reel/materials-popup.js7
2 files changed, 14 insertions, 0 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index cdeee69e..7d10fcfa 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -5,6 +5,13 @@
5 <leaf id="RadialBlurMaterial" label="Radial Blur" /> 5 <leaf id="RadialBlurMaterial" label="Radial Blur" />
6 <leaf id="PulseMaterial" label="Pulse" /> 6 <leaf id="PulseMaterial" label="Pulse" />
7 <leaf id="TunnelMaterial" label="Tunnel" /> 7 <leaf id="TunnelMaterial" label="Tunnel" />
8 <leaf id="ReliefTunnelMaterial" label="Relief Tunnel" />
9 <leaf id="SquareTunnelMaterial" label="Square Tunnel" />
10 <leaf id="FlyMaterial" label="Fly" />
11 <leaf id="WaterMaterial" label="Water" />
12 <leaf id="ZInvertMaterial" label="ZInvert" />
13 <leaf id="DeformMaterial" label="Deform" />
14 <leaf id="StarMaterial" label="Star" />
8 <leaf id="TwistMaterial" label="Twist" /> 15 <leaf id="TwistMaterial" label="Twist" />
9 <leaf id="KeleidoscopeMaterial" label="Keleidoscope" /> 16 <leaf id="KeleidoscopeMaterial" label="Keleidoscope" />
10 <leaf id="JuliaMaterial" label="Julia" /> 17 <leaf id="JuliaMaterial" label="Julia" />
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index afdc3628..bce2e42b 100644
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -246,6 +246,13 @@ exports.MaterialsPopup = Montage.create(Component, {
246 (materialID === "RadialBlurMaterial") || 246 (materialID === "RadialBlurMaterial") ||
247 (materialID === "PulseMaterial") || 247 (materialID === "PulseMaterial") ||
248 (materialID === "TunnelMaterial") || 248 (materialID === "TunnelMaterial") ||
249 (materialID === "ReliefTunnelMaterial") ||
250 (materialID === "SquareTunnelMaterial") ||
251 (materialID === "FlyMaterial") ||
252 (materialID === "WaterMaterial") ||
253 (materialID === "ZInvertMaterial") ||
254 (materialID === "DeformMaterial") ||
255 (materialID === "StarMaterial") ||
249 (materialID === "TwistMaterial") || 256 (materialID === "TwistMaterial") ||
250 (materialID === "KeleidoscopeMaterial") || 257 (materialID === "KeleidoscopeMaterial") ||
251 (materialID === "JuliaMaterial") || 258 (materialID === "JuliaMaterial") ||