aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/water-material.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-19 15:59:27 -0700
committerValerio Virgillito2012-07-19 15:59:27 -0700
commit4b1a4b6b424400080271202800d2de78e5509708 (patch)
tree6554afcb8c3b8d83d1e9bb33241e239773f396e8 /js/lib/rdge/materials/water-material.js
parentc97f806fceb2a2e3c668b965e4f8e6fc047a3d9a (diff)
parent431b6fa7610e59074b4ebb3e9e712672f185b8ad (diff)
downloadninja-4b1a4b6b424400080271202800d2de78e5509708.tar.gz
Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja into v0.7.1
Diffstat (limited to 'js/lib/rdge/materials/water-material.js')
-rw-r--r--js/lib/rdge/materials/water-material.js14
1 files changed, 7 insertions, 7 deletions
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 =
165 } 165 }
166}; 166};
167 167
168var ParisMaterial = function ParisMaterial() 168var BlueSkyMaterial = function BlueSkyMaterial()
169{ 169{
170 // initialize the inherited members 170 // initialize the inherited members
171 this.inheritedFrom = WaterMaterial; 171 this.inheritedFrom = WaterMaterial;
172 this.inheritedFrom(); 172 this.inheritedFrom();
173 173
174 this._name = "Paris"; 174 this._name = "Blue Sky";
175 this._shaderName = "paris"; 175 this._shaderName = "blueSky";
176 176
177 this._defaultTexMap = 'assets/images/paris.png'; 177 this._defaultTexMap = 'assets/images/bluesky.png';
178 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); 178 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
179 179
180 //this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; 180 //this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
@@ -191,7 +191,7 @@ var ParisMaterial = function ParisMaterial()
191 this._shader.init(); 191 this._shader.init();
192 192
193 // set up the material node 193 // set up the material node
194 this._materialNode = RDGE.createMaterialNode("parisMaterial" + "_" + world.generateUniqueNodeID()); 194 this._materialNode = RDGE.createMaterialNode("blueSkyMaterial" + "_" + world.generateUniqueNodeID());
195 this._materialNode.setShader(this._shader); 195 this._materialNode.setShader(this._shader);
196 196
197 this._time = 0; 197 this._time = 0;
@@ -206,9 +206,9 @@ var ParisMaterial = function ParisMaterial()
206} 206}
207 207
208 208
209ParisMaterial.prototype = new PulseMaterial(); 209BlueSkyMaterial.prototype = new PulseMaterial();
210if (typeof exports === "object") { 210if (typeof exports === "object") {
211 exports.ParisMaterial = ParisMaterial; 211 exports.BlueSkyMaterial = BlueSkyMaterial;
212} 212}
213 213
214 214