6 files changed, 39 insertions, 31 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index bbf53144..6b74b04f 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.5"}
         ]
 }
\ No newline at end of file
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 3cd3a89b..e0ed51fb 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -385,8 +385,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "plasma":
                     case "deform":
                     case "water":
-                    case "paris":
-                    case "raiders":
+                    case "blueSky":
+                    case "darkBlur":
                     case "tunnel":
                     case "reliefTunnel":
                     case "squareTunnel":
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 1f89f79e..2d26638b 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -176,22 +176,22 @@ var radialBlurMaterialDef =
 };
 
 
-var RaidersMaterial = function RaidersMaterial() {
+var DarkBlurMaterial = function DarkBlurMaterial() {
     // initialize the inherited members
     this.inheritedFrom = RadialBlurMaterial;
     this.inheritedFrom();
 
-    this._name = "Raiders";
-    this._shaderName = "raiders";
+    this._name = "Dark Blur";
+    this._shaderName = "darkBlur";
 
-    this._texMap = 'assets/images/raiders.png';
+    this._texMap = 'assets/images/darkblur.png';
     this._propValues[this._propNames[0]] = this._texMap.slice(0);
 
 
     // duplicate method required
     this.dup = function (world) {
         // allocate a new uber material
-        var newMat = new RaidersMaterial();
+        var newMat = new DarkBlurMaterial();
 
         // copy over the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
@@ -204,10 +204,10 @@ var RaidersMaterial = function RaidersMaterial() {
     };
 }
 
-RaidersMaterial.prototype = new Material();
+DarkBlurMaterial.prototype = new Material();
 
 if (typeof exports === "object") {
-    exports.RaidersMaterial = RaidersMaterial;
+    exports.DarkBlurMaterial = DarkBlurMaterial;
 }
 
 
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index c7e7313c..9997244c 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -165,16 +165,16 @@ var waterMaterialDef =
     }
 };
 
-var ParisMaterial = function ParisMaterial()
+var BlueSkyMaterial = function BlueSkyMaterial()
 {
     // initialize the inherited members
     this.inheritedFrom = WaterMaterial;
     this.inheritedFrom();
 
-    this._name = "Paris";
-    this._shaderName = "paris";
+    this._name = "Blue Sky";
+    this._shaderName = "blueSky";
 
-    this._defaultTexMap = 'assets/images/paris.png';
+    this._defaultTexMap = 'assets/images/bluesky.png';
     this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
 
     //this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
@@ -191,7 +191,7 @@ var ParisMaterial = function ParisMaterial()
         this._shader.init();
 
         // set up the material node
-        this._materialNode = RDGE.createMaterialNode("parisMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode = RDGE.createMaterialNode("blueSkyMaterial" + "_" + world.generateUniqueNodeID());
         this._materialNode.setShader(this._shader);
 
         this._time = 0;
@@ -206,9 +206,9 @@ var ParisMaterial = function ParisMaterial()
 }
 
 
-ParisMaterial.prototype = new PulseMaterial();
+BlueSkyMaterial.prototype = new PulseMaterial();
 if (typeof exports === "object") {
-    exports.ParisMaterial = ParisMaterial;
+    exports.BlueSkyMaterial = BlueSkyMaterial;
 }
 
 
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index cc3c3fa1..ec481933 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 DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial;
 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;
@@ -52,7 +52,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial;
 //var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
 //var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
 var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
-var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
+var BlueSkyMaterial = require("js/lib/rdge/materials/water-material").BlueSkyMaterial;
 //var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
 //var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
 //var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
@@ -74,8 +74,10 @@ exports.MaterialsModel = Montage.create(Component, {
         value: function() {
             // Load all the materials
             this.addMaterial(new FlatMaterial());
+            this.addMaterial(new BlueSkyMaterial());
             this.addMaterial(new BumpMetalMaterial());
             //this.addMaterial(new CloudMaterial());
+            this.addMaterial(new DarkBlurMaterial());
             //this.addMaterial(new DeformMaterial());
             this.addMaterial(new FlagMaterial());
             //this.addMaterial(new FlyMaterial());
@@ -83,12 +85,10 @@ exports.MaterialsModel = Montage.create(Component, {
             //this.addMaterial(new KeleidoscopeMaterial());
             this.addMaterial(new LinearGradientMaterial());
             //this.addMaterial(new MandelMaterial());
-            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 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;
@@ -260,8 +260,8 @@ exports.MaterialsModel = Montage.create(Component, {
                 case "flag":                mat = new FlagMaterial();               break;
                 //case "fly":                 mat = new FlyMaterial();                break;
                 case "water":               mat = new WaterMaterial();              break;
-                case "paris":               mat = new ParisMaterial();              break;
+                case "blueSky":               mat = new BlueSkyMaterial();              break;