aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-24 15:46:16 -0700
committerJohn Mayhew2012-07-24 15:46:16 -0700
commit9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch)
tree407564eaa6466e8d4cf2eeee0c56dc623243586f /js/lib/rdge
parentd25359c75089215ee48838db081fd3d51cbbd85f (diff)
parent21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff)
downloadninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja
Diffstat (limited to 'js/lib/rdge')
-rwxr-xr-xjs/lib/rdge/materials/material.js4
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js14
-rw-r--r--js/lib/rdge/materials/water-material.js14
3 files changed, 18 insertions, 14 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index e8571e9d..227a772a 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -263,6 +263,10 @@ var Material = function GLMaterial( world ) {
263 var material = this._materialNode; 263 var material = this._materialNode;
264 if (material) technique = material.shaderProgram[this.getTechniqueName()]; 264 if (material) technique = material.shaderProgram[this.getTechniqueName()];
265 265
266 // make sure RDGE has the correct context
267 if (this.getWorld())
268 RDGE.globals.engine.setContext( this.getWorld().getCanvas().rdgeid );
269
266 if(prop === "gradient") { 270 if(prop === "gradient") {
267 this.setGradientData(value); 271 this.setGradientData(value);
268 } else { 272 } else {
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 =
176}; 176};
177 177
178 178
179var RaidersMaterial = function RaidersMaterial() { 179var DarkBlurMaterial = function DarkBlurMaterial() {
180 // initialize the inherited members 180 // initialize the inherited members
181 this.inheritedFrom = RadialBlurMaterial; 181 this.inheritedFrom = RadialBlurMaterial;
182 this.inheritedFrom(); 182 this.inheritedFrom();
183 183
184 this._name = "Raiders"; 184 this._name = "Dark Blur";
185 this._shaderName = "raiders"; 185 this._shaderName = "darkBlur";
186 186
187 this._texMap = 'assets/images/raiders.png'; 187 this._texMap = 'assets/images/darkblur.png';
188 this._propValues[this._propNames[0]] = this._texMap.slice(0); 188 this._propValues[this._propNames[0]] = this._texMap.slice(0);
189 189
190 190
191 // duplicate method required 191 // duplicate method required
192 this.dup = function (world) { 192 this.dup = function (world) {
193 // allocate a new uber material 193 // allocate a new uber material
194 var newMat = new RaidersMaterial(); 194 var newMat = new DarkBlurMaterial();
195 195
196 // copy over the current values; 196 // copy over the current values;
197 var propNames = [], propValues = [], propTypes = [], propLabels = []; 197 var propNames = [], propValues = [], propTypes = [], propLabels = [];
@@ -204,10 +204,10 @@ var RaidersMaterial = function RaidersMaterial() {
204 }; 204 };
205} 205}
206 206
207RaidersMaterial.prototype = new Material(); 207DarkBlurMaterial.prototype = new Material();
208 208
209if (typeof exports === "object") { 209if (typeof exports === "object") {
210 exports.RaidersMaterial = RaidersMaterial; 210 exports.DarkBlurMaterial = DarkBlurMaterial;
211} 211}
212 212
213 213
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