From 22cbc9644b79df60b3f6336f9563debd47fb3ea1 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 28 Jun 2012 11:44:15 -0700 Subject: Added capability to split a mesh into multiiple parts to avoid buffer overflow situations. --- js/lib/rdge/materials/bump-metal-material.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'js/lib/rdge/materials/bump-metal-material.js') diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js index 99a80da2..ea3322cf 100755 --- a/js/lib/rdge/materials/bump-metal-material.js +++ b/js/lib/rdge/materials/bump-metal-material.js @@ -20,6 +20,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() { this._shaderName = "bumpMetal"; + this._defaultLightDiff = [0.3, 0.3, 0.3, 1.0]; this._defaultDiffuseTexture = "assets/images/metal.png"; this._defaultSpecularTexture = "assets/images/silver.png"; this._defaultNormalTexture = "assets/images/normalMap.png"; @@ -43,7 +44,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() { this._propTypes = ["color", "file", "file", "file" ]; this._propValues = []; - this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0]; + this._propValues[ this._propNames[0] ] = this._defaultLightDiff; this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0); this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0); this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0); @@ -72,8 +73,19 @@ var BumpMetalMaterial = function BumpMetalMaterial() { this.setShaderValues(); this.update(0); }; + + this.resetToDefault = function() + { + this._propValues[ this._propNames[0] ] = this._defaultLightDiff; + this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0); + this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0); + this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0); + for (var i=0; i<4; i++) + this.setProperty( this._propNames[i], this._propValues[this._propNames[i]] ); + }; }; + /////////////////////////////////////////////////////////////////////////////////////// // RDGE shader -- cgit v1.2.3