From 2779b48197effabe1a975c8139c497631238f8f1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 15 Jun 2012 11:26:57 -0700
Subject: Re-added Paris material

---
 js/lib/rdge/materials/water-material.js                     | 4 ++--
 js/models/materials-model.js                                | 6 +++---
 js/panels/Materials/materials-data.json                     | 4 ++++
 js/panels/Materials/materials-popup.reel/materials-popup.js | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index f2ef0e49..982b581f 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -133,11 +133,11 @@ var ParisMaterial = function ParisMaterial()
 	this.inheritedFrom = WaterMaterial;
 	this.inheritedFrom();
 
-	this._name = "ParisMaterial";
+	this._name = "Paris";
 	this._shaderName = "paris";
 
 	this._defaultTexMap = 'assets/images/paris.png';
-	this._propValues[this._propNames[u_tex_index]] = this._defaultTexMap.slice(0);
+	this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
 
 	//this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
 	//this._propValues[this._propNames[1]] = this._diffuseColor.slice();
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index d8f9a9e2..3cc80982 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -27,7 +27,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 ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
 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;
@@ -58,9 +58,9 @@ 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 ParisMaterial());
 			this.addMaterial(new RadialBlurMaterial());
 			this.addMaterial(new RadialGradientMaterial());
 			this.addMaterial(new RaidersMaterial());
@@ -235,7 +235,7 @@ 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 "paris":				mat = new ParisMaterial();				break;
 				case "raiders":		        mat = new RaidersMaterial();		    break;
 				case "zinvert":				mat = new ZInvertMaterial();			break;
 				case "deform":				mat = new DeformMaterial();				break;
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index ad0c1f56..221fdd2b 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -40,6 +40,10 @@
                     "label": "Mandel",
                     "id" : "Mandel"
                 },
+                {
+                    "label": "Paris",
+                    "id" : "Paris"
+                },
                 {
                     "label": "Plasma",
                     "id" : "Plasma"
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index e9535f94..8240c746 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -345,6 +345,7 @@ exports.MaterialsPopup = Montage.create(Component, {
 						(materialID ===  "Keleidoscope")	||
 						(materialID ===  "Linear Gradient")	||
 						(materialID ===  "Mandel")			||
+						(materialID ===  "Paris")			||
 						(materialID ===  "Plasma")			||
 						(materialID ===  "Pulse")			||
 						(materialID ===  "Radial Blur")		||
-- 
cgit v1.2.3