From ec10bf44c711e9c552780d2cd9ac0baef21de445 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Mon, 5 Mar 2012 15:16:52 -0800 Subject: WebGL & Canvas2D file IO --- js/helper-classes/RDGE/Materials/BumpMetalMaterial.js | 2 +- js/helper-classes/RDGE/Materials/RadialGradientMaterial.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'js/helper-classes/RDGE/Materials') diff --git a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js index 1a6c54c9..52332ab8 100755 --- a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js +++ b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js @@ -65,7 +65,7 @@ function BumpMetalMaterial() this.setProperty = function( prop, value ) { // every material should do something with the "color" property - if (prop === "color") prop = "lightDiff"; + if (prop === "color") return; //prop = "lightDiff"; // make sure we have legitimate imput var ok = this.validateProperty( prop, value ); diff --git a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js index 4ebb1f30..45b260ef 100755 --- a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js +++ b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js @@ -146,8 +146,10 @@ function RadialGradientMaterial() // duplcate method requirde this.dup = function() { return new RadialGradientMaterial(); } - this.init = function() + this.init = function( world ) { + this.setWorld( world ); + // set up the shader this._shader = new jshader(); this._shader.def = radialGradientMaterialDef; -- cgit v1.2.3