aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib/rdge')
-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();