From 0df5ad6391df5d285cb8b93dc23e2595cddaec3c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 19 Jul 2012 10:36:31 -0700
Subject: Re-added Radial Blur and Raiders materials

---
 js/models/materials-model.js            | 12 ++++++------
 js/panels/Materials/materials-data.json |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'js')

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
 var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
 var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
 //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
-//var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
-//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
+var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
+var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
 var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
 //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
@@ -86,9 +86,9 @@ exports.MaterialsModel = Montage.create(Component, {
             this.addMaterial(new ParisMaterial());
             this.addMaterial(new PlasmaMaterial());
             this.addMaterial(new PulseMaterial());
-            //this.addMaterial(new RadialBlurMaterial());
+            this.addMaterial(new RadialBlurMaterial());
             this.addMaterial(new RadialGradientMaterial());
-            //this.addMaterial(new RaidersMaterial());
+            this.addMaterial(new RaidersMaterial());
             //this.addMaterial(new ReliefTunnelMaterial());
             //this.addMaterial(new SquareTunnelMaterial());
             //this.addMaterial(new StarMaterial());
@@ -251,7 +251,7 @@ exports.MaterialsModel = Montage.create(Component, {
 
                 case "taper":               mat = new TaperMaterial();              break;
                 case "twistVert":           mat = new TwistVertMaterial();          break;
-                //case "radialBlur":          mat = new RadialBlurMaterial();         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;
@@ -261,7 +261,7 @@ exports.MaterialsModel = Montage.create(Component, {
                 //case "fly":                 mat = new FlyMaterial();                break;
                 case "water":               mat = new WaterMaterial();              break;
                 case "paris":               mat = new ParisMaterial();              break;
-                //case "raiders":             mat = new RaidersMaterial();            break;
+                case "raiders":             mat = new RaidersMaterial();            break;
                 //case "zinvert":             mat = new ZInvertMaterial();            break;
                 //case "deform":              mat = new DeformMaterial();             break;
                 //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
@@ -28,10 +28,18 @@
                     "label": "Pulse",
                     "id" : "Pulse"
                 },
+                {
+                    "label": "Radial Blur",
+                    "id" : "Radial Blur"
+                },
                 {
                     "label": "Radial Gradient",
                     "id" : "Radial Gradient"
                 },
+                {
+                    "label": "Raiders",
+                    "id" : "Raiders"
+                },
                 {
                     "label": "Taper",
                     "id" : "Taper"
-- 
cgit v1.2.3