From 5a1965bf2ed9a54601ca16fd67555335c510ce08 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 26 Apr 2012 16:40:05 -0700 Subject: Update materials to the new texture model. Create local world for deleted source canvases --- js/lib/rdge/materials/linear-gradient-material.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'js/lib/rdge/materials/linear-gradient-material.js') diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js index 51a7430c..2d8e6ca7 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -200,7 +200,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() { // Methods /////////////////////////////////////////////////////////////////////// // duplcate method requirde - this.dup = function () { return new LinearGradientMaterial(); }; + this.dup = function () + { + // get the current values; + var propNames = [], propValues = [], propTypes = [], propLabels = []; + this.getAllProperties(propNames, propValues, propTypes, propLabels); + + // allocate a new material + var newMat = new LinearGradientMaterial(); + + // copy over the current values; + var n = propNames.length; + for (var i = 0; i < n; i++) + newMat.setProperty(propNames[i], propValues[i]); + + return newMat; + } + this.init = function (world) { this.setWorld(world); -- cgit v1.2.3 From 8eac5582b72115969a9f915f4303535c22018033 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 2 May 2012 17:00:12 -0700 Subject: Material editor --- js/lib/rdge/materials/linear-gradient-material.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/lib/rdge/materials/linear-gradient-material.js') diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js index 2d8e6ca7..586948bb 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -42,6 +42,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() { 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); @@ -54,6 +55,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() { 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); @@ -66,6 +68,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() { 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); @@ -78,6 +81,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() { 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); -- cgit v1.2.3 From db2bb0ab5d2747f0d07878e3b8a7d2d10c755110 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 7 Jun 2012 17:07:21 -0700 Subject: Material cleanup --- js/lib/rdge/materials/linear-gradient-material.js | 252 +--------------------- 1 file changed, 8 insertions(+), 244 deletions(-) (limited to 'js/lib/rdge/materials/linear-gradient-material.js') diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js index 2df76d61..80824ee3 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -31,136 +31,14 @@ var LinearGradientMaterial = function LinearGradientMaterial() { /////////////////////////////////////////////////////////////////////// // Property Accessors /////////////////////////////////////////////////////////////////////// - this.getShaderName = function () { - return this._shaderName; - }; - - this.getName = function () { - return this._name; - }; - - 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.getAngle = function () { - return this._angle; - }; - - this.setAngle = function (a) { - this._angle = a; - - if (this._shader && this._shader['default']) { - this._shader['default'].u_cos_sin_angle.set([Math.cos(a), Math.sin(a)]); - } - }; - - this.isAnimated = function () { - return false; - }; + this.getShaderDef = function() { return linearGradientMaterialDef; } /////////////////////////////////////////////////////////////////////// // Material Property Accessors /////////////////////////////////////////////////////////////////////// - this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4", "angle"]; + this._propNames = ["u_color1", "u_color2", "u_color3", "u_color4", "u_colorStop1", "u_colorStop2", "u_colorStop3", "u_colorStop4", "u_cos_sin_angle"]; this._propLabels = ["Color 1", "Color 2", "Color 3", "Color 4", "Color Stop 1", "Color Stop 2", "Color Stop 3", "Color Stop 4", "Angle"]; - this._propTypes = ["color", "color", "color", "color", "float", "float", "float", "float", "float"]; + this._propTypes = ["color", "color", "color", "color", "float", "float", "float", "float", "vector2d"]; this._propValues = []; this._propValues[this._propNames[0]] = this._color1.slice(0); @@ -173,49 +51,12 @@ var LinearGradientMaterial = function LinearGradientMaterial() { this._propValues[this._propNames[6]] = this._colorStop3; this._propValues[this._propNames[7]] = this._colorStop4; - this._propValues[this._propNames[8]] = this._angle; - - 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 Linear 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; - case "angle": this.setAngle(value); break; - } - }; + this._propValues[this._propNames[8]] = [ Math.cos(this._angle), Math.sin(this._angle) ]; /////////////////////////////////////////////////////////////////////// // Methods /////////////////////////////////////////////////////////////////////// // duplcate method requirde - this.dup = function () { - // allocate a new material - var newMat = new LinearGradientMaterial(); - - // 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