aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-07-19 10:36:31 -0700
committerhwc4872012-07-19 10:36:31 -0700
commit0df5ad6391df5d285cb8b93dc23e2595cddaec3c (patch)
treefd6aef702ce883bb816940fa0863c377ddc7a0cd
parent16d06bac95ce8334f8c5586750e98360dbc9cbd9 (diff)
downloadninja-0df5ad6391df5d285cb8b93dc23e2595cddaec3c.tar.gz
Re-added Radial Blur and Raiders materials
-rwxr-xr-xjs/models/materials-model.js12
-rw-r--r--js/panels/Materials/materials-data.json8
2 files changed, 14 insertions, 6 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index cc3c3fa1..15feca93 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -42,8 +42,8 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate
42var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; 42var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; 43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
44//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; 44//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
45//var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; 45var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
46//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; 46var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; 47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; 48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
49//var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; 49//var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
@@ -86,9 +86,9 @@ exports.MaterialsModel = Montage.create(Component, {
86 this.addMaterial(new ParisMaterial()); 86 this.addMaterial(new ParisMaterial());
87 this.addMaterial(new PlasmaMaterial()); 87 this.addMaterial(new PlasmaMaterial());
88 this.addMaterial(new PulseMaterial()); 88 this.addMaterial(new PulseMaterial());
89 //this.addMaterial(new RadialBlurMaterial()); 89 this.addMaterial(new RadialBlurMaterial());
90 this.addMaterial(new RadialGradientMaterial()); 90 this.addMaterial(new RadialGradientMaterial());
91 //this.addMaterial(new RaidersMaterial()); 91 this.addMaterial(new RaidersMaterial());
92 //this.addMaterial(new ReliefTunnelMaterial()); 92 //this.addMaterial(new ReliefTunnelMaterial());
93 //this.addMaterial(new SquareTunnelMaterial()); 93 //this.addMaterial(new SquareTunnelMaterial());
94 //this.addMaterial(new StarMaterial()); 94 //this.addMaterial(new StarMaterial());
@@ -251,7 +251,7 @@ exports.MaterialsModel = Montage.create(Component, {
251 251
252 case "taper": mat = new TaperMaterial(); break; 252 case "taper": mat = new TaperMaterial(); break;
253 case "twistVert": mat = new TwistVertMaterial(); break; 253 case "twistVert": mat = new TwistVertMaterial(); break;
254 //case "radialBlur": mat = new RadialBlurMaterial(); break; 254 case "radialBlur": mat = new RadialBlurMaterial(); break;
255 case "plasma": mat = new PlasmaMaterial(); break; 255 case "plasma": mat = new PlasmaMaterial(); break;
256 case "pulse": mat = new PulseMaterial(); break; 256 case "pulse": mat = new PulseMaterial(); break;
257 //case "tunnel": mat = new TunnelMaterial(); break; 257 //case "tunnel": mat = new TunnelMaterial(); break;
@@ -261,7 +261,7 @@ exports.MaterialsModel = Montage.create(Component, {
261 //case "fly": mat = new FlyMaterial(); break; 261 //case "fly": mat = new FlyMaterial(); break;
262 case "water": mat = new WaterMaterial(); break; 262 case "water": mat = new WaterMaterial(); break;
263 case "paris": mat = new ParisMaterial(); break; 263 case "paris": mat = new ParisMaterial(); break;
264 //case "raiders": mat = new RaidersMaterial(); break; 264 case "raiders": mat = new RaidersMaterial(); break;
265 //case "zinvert": mat = new ZInvertMaterial(); break; 265 //case "zinvert": mat = new ZInvertMaterial(); break;
266 //case "deform": mat = new DeformMaterial(); break; 266 //case "deform": mat = new DeformMaterial(); break;
267 //case "star": mat = new StarMaterial(); break; 267 //case "star": mat = new StarMaterial(); break;
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index abdacbe1..8e025185 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -29,10 +29,18 @@
29 "id" : "Pulse" 29 "id" : "Pulse"
30 }, 30 },
31 { 31 {
32 "label": "Radial Blur",
33 "id" : "Radial Blur"
34 },
35 {
32 "label": "Radial Gradient", 36 "label": "Radial Gradient",
33 "id" : "Radial Gradient" 37 "id" : "Radial Gradient"
34 }, 38 },
35 { 39 {
40 "label": "Raiders",
41 "id" : "Raiders"
42 },
43 {
36 "label": "Taper", 44 "label": "Taper",
37 "id" : "Taper" 45 "id" : "Taper"
38 }, 46 },