aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
diff options
context:
space:
mode:
authorhwc4872012-06-15 11:26:57 -0700
committerhwc4872012-06-15 11:26:57 -0700
commit2779b48197effabe1a975c8139c497631238f8f1 (patch)
tree3469d6b7b7fbc6a7d1c9a2631c5ded0a38d69161 /js/lib/rdge/materials
parent9f74616f7727bf8cf988021ba0cd5d3354d67991 (diff)
downloadninja-2779b48197effabe1a975c8139c497631238f8f1.tar.gz
Re-added Paris material
Diffstat (limited to 'js/lib/rdge/materials')
-rw-r--r--js/lib/rdge/materials/water-material.js4
1 files changed, 2 insertions, 2 deletions
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()
133 this.inheritedFrom = WaterMaterial; 133 this.inheritedFrom = WaterMaterial;
134 this.inheritedFrom(); 134 this.inheritedFrom();
135 135
136 this._name = "ParisMaterial"; 136 this._name = "Paris";
137 this._shaderName = "paris"; 137 this._shaderName = "paris";
138 138
139 this._defaultTexMap = 'assets/images/paris.png'; 139 this._defaultTexMap = 'assets/images/paris.png';
140 this._propValues[this._propNames[u_tex_index]] = this._defaultTexMap.slice(0); 140 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
141 141
142 //this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; 142 //this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
143 //this._propValues[this._propNames[1]] = this._diffuseColor.slice(); 143 //this._propValues[this._propNames[1]] = this._diffuseColor.slice();