Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

3 files changed, 16 insertions, 16 deletions

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;
 }