From d4ca478ad313c6c20834e410ba14ad3a5e7b20bf Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 12 Jun 2012 10:28:26 -0700 Subject: Material cleanup & bug fixes. --- js/lib/rdge/materials/radial-gradient-material.js | 274 ++-------------------- 1 file changed, 23 insertions(+), 251 deletions(-) (limited to 'js/lib/rdge/materials/radial-gradient-material.js') diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js index 67a85041..b5ffd01a 100755 --- a/js/lib/rdge/materials/radial-gradient-material.js +++ b/js/lib/rdge/materials/radial-gradient-material.js @@ -15,201 +15,49 @@ var RadialGradientMaterial = function RadialGradientMaterial() { this._name = "RadialGradientMaterial"; this._shaderName = "radialGradient"; - this._color1 = [1, 0, 0, 1]; - this._color2 = [0, 1, 0, 1]; - this._color3 = [0, 0, 1, 1]; - this._color4 = [0, 1, 1, 1]; - this._colorStop1 = 0.0; - this._colorStop2 = 0.3; - this._colorStop3 = 0.6; - this._colorStop4 = 1.0; - // this._colorCount = 4; + this._defaultColor1 = [1, 0, 0, 1]; + this._defaultColor2 = [0, 1, 0, 1]; + this._defaultColor3 = [0, 0, 1, 1]; + this._defaultColor4 = [0, 1, 1, 1]; + this._defaultColorStop1 = 0.0; + this._defaultColorStop2 = 0.3; + this._defaultColorStop3 = 0.6; + this._defaultColorStop4 = 1.0; + // this._defaultColorCount = 4; this._textureTransform = [1,0,0, 0,1,0, 0,0,1]; /////////////////////////////////////////////////////////////////////// // Property Accessors /////////////////////////////////////////////////////////////////////// - this.getName = function () { - return this._name; - }; - - this.getShaderName = function () { - return this._shaderName; - }; - - this.getColor1 = function () { - return this._color1; - }; - - this.setColor1 = function (c) { - this._color1 = c.slice(); - this._propValues[this._propNames[0]] = this._color1.slice(0); - if (this._shader && this._shader['default']) { - this._shader['default'].u_color1.set(c); - } - }; - - this.getColor2 = function () { - return this._color2; - }; - - this.setColor2 = function (c) { - this._color2 = c.slice(); - this._propValues[this._propNames[1]] = this._color2.slice(0); - if (this._shader && this._shader['default']) { - this._shader['default'].u_color2.set(c); - } - - }; - - this.getColor3 = function () { - return this._color3; - }; - - this.setColor3 = function (c) { - this._color3 = c.slice(); - this._propValues[this._propNames[2]] = this._color3.slice(0); - if (this._shader && this._shader['default']) { - this._shader['default'].u_color3.set(c); - } - }; - - this.getColor4 = function () { - return this._color4; - }; - - this.setColor4 = function (c) { - this._color4 = c.slice(); - this._propValues[this._propNames[3]] = this._color4.slice(0); - if (this._shader && this._shader['default']) { - this._shader['default'].u_color4.set(c); - } - }; - - this.getColorStop1 = function () { - return this._colorStop1; - }; - - this.setColorStop1 = function (s) { - this._colorStop1 = s; - if (this._shader && this._shader['default']) { - this._shader['default'].u_colorStop1.set([s]); - } - }; - - this.getColorStop2 = function () { - return this._colorStop2; - }; - - this.setColorStop2 = function (s) { - this._colorStop2 = s; - if (this._shader && this._shader['default']) { - this._shader['default'].u_colorStop2.set([s]); - } - }; - - this.getColorStop3 = function () { - return this._colorStop3; - }; - - this.setColorStop3 = function (s) { - this._colorStop3 = s; - if (this._shader && this._shader['default']) { - this._shader['default'].u_colorStop3.set([s]); - } - }; - - this.getColorStop4 = function () { - return this._colorStop4; - }; - - this.setColorStop4 = function (s) { - this._colorStop4 = s; - if (this._shader && this._shader['default']) { - this._shader['default'].u_colorStop4.set([s]); - } - }; - - this.getColorCount = function () { - return this._colorCount; - }; - - this.setColorCount = function (c) { - this._colorCount = c; - if (this._shader && this._shader['default']) { - this._shader['default'].u_colorCount.set([c]); - } - }; - - this.isAnimated = function () { - return false; - }; + + this.isAnimated = function () { return false; }; + this.getShaderDef = function() { return radialGradientMaterialDef; }; /////////////////////////////////////////////////////////////////////// // Material Property Accessors /////////////////////////////////////////////////////////////////////// - this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4" ]; + this._propNames = ["u_color1", "u_color2", "u_color3", "u_color4", "u_colorStop1", "u_colorStop2", "u_colorStop3", "u_colorStop4" ]; this._propLabels = ["Color 1", "Color 2", "Color 3", "Color 4", "Color Stop 1", "Color Stop 2", "Color Stop 3", "Color Stop 4" ]; this._propTypes = ["color", "color", "color", "color", "float", "float", "float", "float" ]; this._propValues = []; - this._propValues[this._propNames[0]] = this._color1.slice(0); - this._propValues[this._propNames[1]] = this._color2.slice(0); - this._propValues[this._propNames[2]] = this._color3.slice(0); - this._propValues[this._propNames[3]] = this._color4.slice(0); + this._propValues[this._propNames[0]] = this._defaultColor1.slice(0); + this._propValues[this._propNames[1]] = this._defaultColor2.slice(0); + this._propValues[this._propNames[2]] = this._defaultColor3.slice(0); + this._propValues[this._propNames[3]] = this._defaultColor4.slice(0); - this._propValues[this._propNames[4]] = this._colorStop1; - this._propValues[this._propNames[5]] = this._colorStop2; - this._propValues[this._propNames[6]] = this._colorStop3; - this._propValues[this._propNames[7]] = this._colorStop4; - - this.setProperty = function (prop, value) { - if (prop === "color") prop = "color1"; - - // make sure we have legitimate imput - var ok = this.validateProperty(prop, value); - if (!ok) { - console.log("invalid property in Radial Gradient Material:" + prop + " : " + value); - } - - switch (prop) { - case "color1": this.setColor1(value); break; - case "color2": this.setColor2(value); break; - case "color3": this.setColor3(value); break; - case "color4": this.setColor4(value); break; - case "colorStop1": this.setColorStop1(value); break; - case "colorStop2": this.setColorStop2(value); break; - case "colorStop3": this.setColorStop3(value); break; - case "colorStop4": this.setColorStop4(value); break; - } - - //this.updateValuesInShader(); - }; + this._propValues[this._propNames[4]] = this._defaultColorStop1; + this._propValues[this._propNames[5]] = this._defaultColorStop2; + this._propValues[this._propNames[6]] = this._defaultColorStop3; + this._propValues[this._propNames[7]] = this._defaultColorStop4; /////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////// // Methods /////////////////////////////////////////////////////////////////////// - // duplcate method requirde - this.dup = function () { - // allocate a new material - var newMat = new RadialGradientMaterial(); - - // copy over the current values; - var propNames = [], propValues = [], propTypes = [], propLabels = []; - this.getAllProperties( propNames, propValues, propTypes, propLabels); - var n = propNames.length; - for (var i=0; i