From fdeed8051c3af538d28ca3bc599121cea483c22c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 22 Mar 2012 15:47:56 -0700 Subject: Squashed commit of the following GL integration Signed-off-by: Valerio Virgillito --- js/lib/rdge/materials/linear-gradient-material.js | 53 +++++++++++++++++++++++ 1 file changed, 53 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 8e05e23d..0db6fc90 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -249,6 +249,59 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; + this.exportJSON = function() + { + var jObj = + { + 'material' : this.getShaderName(), + 'name' : this.getName(), + 'color1' : this.getColor1(), + 'color2' : this.getColor2(), + 'color3' : this.getColor3(), + 'color4' : this.getColor4(), + 'colorStop1' : this.getColorStop1(), + 'colorStop2' : this.getColorStop2(), + 'colorStop3' : this.getColorStop3(), + 'colorStop4' : this.getColorStop4(), + 'angle' : this.getAngle() + }; + + return jObj; + }; + + this.importJSON = function( jObj ) + { + if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" ); + this.setName( jObj.name ); + + try + { + var color1 = jObj.color1, + color2 = jObj.color2, + color3 = jObj.color3, + color4 = jObj.color4, + colorStop1 = jObj.colorStop1, + colorStop2 = jObj.colorStop2, + colorStop3 = jObj.colorStop3, + colorStop4 = jObj.colorStop4, + angle = jObj.angle; + + this.setProperty( "color1", color1 ); + this.setProperty( "color2", color2 ); + this.setProperty( "color3", color3 ); + this.setProperty( "color4", color4 ); + this.setProperty( "colorStop1", colorStop1 ); + this.setProperty( "colorStop2", colorStop2 ); + this.setProperty( "colorStop3", colorStop3 ); + this.setProperty( "colorStop4", colorStop4 ); + this.setProperty( "angle", angle ); + } + catch (e) + { + throw new Error( "could not import material: " + importStr ); + } + }; + this.export = function() { // every material needs the base type and instance name var exportStr = "material: " + this.getShaderName() + "\n"; -- cgit v1.2.3 From fb0a659c9ca3479fd6799325498b11f074689936 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 2 Apr 2012 14:57:31 -0700 Subject: -Namespaced all RDGE javascript. -Removed the following unused files from the build script /core/script/fx/blur.js /core/script/fx/ssao.js /core/script/animation.js - Fully removed the following from the build and from source control as they are unused or no longer needed /core/script/util/dbgpanel.js /core/script/util/fpsTracker.js /core/script/util/statTracker.js /core/script/input.js /core/script/TextureManager.js /core/script/ubershader.js --- js/lib/rdge/materials/linear-gradient-material.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 2c52c67d..d9307274 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -207,12 +207,12 @@ var LinearGradientMaterial = function LinearGradientMaterial() { this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = linearGradientMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode( this.getShaderName() ); + this._materialNode = RDGE.createMaterialNode(this.getShaderName()); this._materialNode.setShader(this._shader); // send the current values to the shader -- cgit v1.2.3 From 8d1cc709340da845d76f84220fe92c11e6217ff3 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 3 Apr 2012 09:36:14 -0700 Subject: Made use of semicolons consistent and updated new files to use the new RDGE namespace --- js/lib/rdge/materials/linear-gradient-material.js | 489 +++++++++++----------- 1 file changed, 241 insertions(+), 248 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 efeabf95..87e41ad6 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -11,36 +11,36 @@ var LinearGradientMaterial = function LinearGradientMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "LinearGradientMaterial"; - this._shaderName = "linearGradient"; - - 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._angle = 0.0; // the shader takes [cos(a), sin(a)] + this._name = "LinearGradientMaterial"; + this._shaderName = "linearGradient"; + + 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._angle = 0.0; // the shader takes [cos(a), sin(a)] /////////////////////////////////////////////////////////////////////// // Property Accessors /////////////////////////////////////////////////////////////////////// - this.getShaderName = function() { + this.getShaderName = function () { return this._shaderName; }; - this.getName = function() { + this.getName = function () { return this._name; }; - this.getColor1 = function() { + this.getColor1 = function () { return this._color1; }; - this.setColor1 = function(c) { + this.setColor1 = function (c) { this._color1 = c.slice(); if (this._shader && this._shader['default']) { @@ -48,11 +48,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; - this.getColor2 = function() { + this.getColor2 = function () { return this._color2; }; - this.setColor2 = function(c) { + this.setColor2 = function (c) { this._color2 = c.slice(); if (this._shader && this._shader['default']) { @@ -60,23 +60,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; - this.getColor3 = function() { + this.getColor3 = function () { return this._color3; }; - this.setColor3 = function(c) { + this.setColor3 = function (c) { this._color3 = c.slice(); - + if (this._shader && this._shader['default']) { this._shader['default'].u_color3.set(c); } }; - this.getColor4 = function() { - return this._color4; + this.getColor4 = function () { + return this._color4; }; - - this.setColor4 = function(c) { + + this.setColor4 = function (c) { this._color4 = c.slice(); if (this._shader && this._shader['default']) { @@ -84,11 +84,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; - this.getColorStop1 = function() { - return this._colorStop1; + this.getColorStop1 = function () { + return this._colorStop1; }; - - this.setColorStop1 = function(s) { + + this.setColorStop1 = function (s) { this._colorStop1 = s; if (this._shader && this._shader['default']) { @@ -96,11 +96,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; - this.getColorStop2 = function() { - return this._colorStop2; + this.getColorStop2 = function () { + return this._colorStop2; }; - - this.setColorStop2 = function(s) { + + this.setColorStop2 = function (s) { this._colorStop2 = s; if (this._shader && this._shader['default']) { @@ -108,23 +108,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; - this.getColorStop3 = function() { - return this._colorStop3; + this.getColorStop3 = function () { + return this._colorStop3; }; - - this.setColorStop3 = function(s) { + + 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.getColorStop4 = function () { + return this._colorStop4; }; - - this.setColorStop4 = function(s) { + + this.setColorStop4 = function (s) { this._colorStop4 = s; if (this._shader && this._shader['default']) { @@ -132,17 +132,17 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; -// 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.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.getAngle = function() { + this.getAngle = function () { return this._angle; }; - this.setAngle = function(a) { + this.setAngle = function (a) { this._angle = a; if (this._shader && this._shader['default']) { @@ -150,222 +150,215 @@ var LinearGradientMaterial = function LinearGradientMaterial() { } }; - this.isAnimated = function() { - return false; + this.isAnimated = function () { + return false; }; /////////////////////////////////////////////////////////////////////// // Material Property Accessors /////////////////////////////////////////////////////////////////////// - this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4", "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._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[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._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 ); + this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4", "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._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[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._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; - } - }; + 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; + } + }; /////////////////////////////////////////////////////////////////////// // Methods /////////////////////////////////////////////////////////////////////// - // duplcate method requirde - this.dup = function() { return new LinearGradientMaterial(); }; - - this.init = function( world ) { - this.setWorld( world ); - - // set up the shader - this._shader = new RDGE.jshader(); - this._shader.def = linearGradientMaterialDef; - this._shader.init(); - - // set up the material node - this._materialNode = RDGE.createMaterialNode(this.getShaderName() + "_" + world.generateUniqueNodeID()); - this._materialNode.setShader(this._shader); - - // send the current values to the shader - this.updateShaderValues(); - - //console.log( "**** LinearGradientMaterial initialized" ); - }; - - this.updateShaderValues= function() { - if (this._shader && this._shader['default']) { - //this._shader['default'].u_colorCount.set( [4] ); - - var c; - c = this.getColor1(); - this._shader['default'].u_color1.set( c ); - c = this.getColor2(); - this._shader['default'].u_color2.set( c ); - c = this.getColor3(); - this._shader['default'].u_color3.set( c ); - c = this.getColor4(); - this._shader['default'].u_color4.set( c ); - - var s; - s = this.getColorStop1(); - this._shader['default'].u_colorStop1.set( [s] ); - s = this.getColorStop2(); - this._shader['default'].u_colorStop2.set( [s] ); - s = this.getColorStop3(); - this._shader['default'].u_colorStop3.set( [s] ); - s = this.getColorStop4(); - this._shader['default'].u_colorStop4.set( [s] ); - - this.setAngle( this.getAngle() ); - } - }; + // duplcate method requirde + this.dup = function () { return new LinearGradientMaterial(); }; - this.exportJSON = function() - { - var jObj = - { - 'material' : this.getShaderName(), - 'name' : this.getName(), - 'color1' : this.getColor1(), - 'color2' : this.getColor2(), - 'color3' : this.getColor3(), - 'color4' : this.getColor4(), - 'colorStop1' : this.getColorStop1(), - 'colorStop2' : this.getColorStop2(), - 'colorStop3' : this.getColorStop3(), - 'colorStop4' : this.getColorStop4(), - 'angle' : this.getAngle() - }; + this.init = function (world) { + this.setWorld(world); - return jObj; - }; + // set up the shader + this._shader = new RDGE.jshader(); + this._shader.def = linearGradientMaterialDef; + this._shader.init(); - this.importJSON = function( jObj ) - { - if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" ); - this.setName( jObj.name ); + // set up the material node + this._materialNode = RDGE.createMaterialNode(this.getShaderName() + "_" + world.generateUniqueNodeID()); + this._materialNode.setShader(this._shader); + + // send the current values to the shader + this.updateShaderValues(); + + //console.log( "**** LinearGradientMaterial initialized" ); + }; + + this.updateShaderValues = function () { + if (this._shader && this._shader['default']) { + //this._shader['default'].u_colorCount.set( [4] ); + + var c; + c = this.getColor1(); + this._shader['default'].u_color1.set(c); + c = this.getColor2(); + this._shader['default'].u_color2.set(c); + c = this.getColor3(); + this._shader['default'].u_color3.set(c); + c = this.getColor4(); + this._shader['default'].u_color4.set(c); + + var s; + s = this.getColorStop1(); + this._shader['default'].u_colorStop1.set([s]); + s = this.getColorStop2(); + this._shader['default'].u_colorStop2.set([s]); + s = this.getColorStop3(); + this._shader['default'].u_colorStop3.set([s]); + s = this.getColorStop4(); + this._shader['default'].u_colorStop4.set([s]); + + this.setAngle(this.getAngle()); + } + }; - try + this.exportJSON = function () { + var jObj = { - var color1 = jObj.color1, - color2 = jObj.color2, - color3 = jObj.color3, - color4 = jObj.color4, - colorStop1 = jObj.colorStop1, - colorStop2 = jObj.colorStop2, - colorStop3 = jObj.colorStop3, - colorStop4 = jObj.colorStop4, + 'material': this.getShaderName(), + 'name': this.getName(), + 'color1': this.getColor1(), + 'color2': this.getColor2(), + 'color3': this.getColor3(), + 'color4': this.getColor4(), + 'colorStop1': this.getColorStop1(), + 'colorStop2': this.getColorStop2(), + 'colorStop3': this.getColorStop3(), + 'colorStop4': this.getColorStop4(), + 'angle': this.getAngle() + }; + + return jObj; + }; + + this.importJSON = function (jObj) { + if (this.getShaderName() != jObj.material) throw new Error("ill-formed material"); + this.setName(jObj.name); + + try { + var color1 = jObj.color1, + color2 = jObj.color2, + color3 = jObj.color3, + color4 = jObj.color4, + colorStop1 = jObj.colorStop1, + colorStop2 = jObj.colorStop2, + colorStop3 = jObj.colorStop3, + colorStop4 = jObj.colorStop4, angle = jObj.angle; - this.setProperty( "color1", color1 ); - this.setProperty( "color2", color2 ); - this.setProperty( "color3", color3 ); - this.setProperty( "color4", color4 ); - this.setProperty( "colorStop1", colorStop1 ); - this.setProperty( "colorStop2", colorStop2 ); - this.setProperty( "colorStop3", colorStop3 ); - this.setProperty( "colorStop4", colorStop4 ); - this.setProperty( "angle", angle ); - } - catch (e) - { - throw new Error( "could not import material: " + importStr ); - } - }; - - this.export = function() { - // every material needs the base type and instance name - var exportStr = "material: " + this.getShaderName() + "\n"; - exportStr += "name: " + this.getName() + "\n"; - - exportStr += "color1: " + this.getColor1() + "\n"; - exportStr += "color2: " + this.getColor2() + "\n"; - exportStr += "color3: " + this.getColor3() + "\n"; - exportStr += "color4: " + this.getColor4() + "\n"; - - exportStr += "colorStop1: " + this.getColorStop1() + "\n"; - exportStr += "colorStop2: " + this.getColorStop2() + "\n"; - exportStr += "colorStop3: " + this.getColorStop3() + "\n"; - exportStr += "colorStop4: " + this.getColorStop4() + "\n"; - - exportStr += "angle: " + this.getAngle() + "\n"; - - // every material needs to terminate like this - exportStr += "endMaterial\n"; - - return exportStr; - }; - - this.import = function( importStr ) { - var pu = new MaterialParser( importStr ); - var material = pu.nextValue( "material: " ); - if (material != this.getShaderName()) throw new Error( "ill-formed material" ); - this.setName( pu.nextValue( "name: ") ); - - var rtnStr; - try - { - var color1 = eval( "[" + pu.nextValue( "color1: " ) + "]" ), - color2 = eval( "[" + pu.nextValue( "color2: " ) + "]" ), - color3 = eval( "[" + pu.nextValue( "color3: " ) + "]" ), - color4 = eval( "[" + pu.nextValue( "color4: " ) + "]" ), - colorStop1 = Number(pu.nextValue( "colorStop1: " )), - colorStop2 = Number(pu.nextValue( "colorStop2: " )), - colorStop3 = Number(pu.nextValue( "colorStop3: " )), - colorStop4 = Number(pu.nextValue( "colorStop4: " )), - angle = Number(pu.nextValue( "angle: " ) ); - - var endKey = "endMaterial\n"; - var index = importStr.indexOf( endKey ); - index += endKey.length; - rtnStr = importStr.substr( index ); - - this.setProperty( "color1", color1 ); - this.setProperty( "color2", color2 ); - this.setProperty( "color3", color3 ); - this.setProperty( "color4", color4 ); - this.setProperty( "colorStop1", colorStop1 ); - this.setProperty( "colorStop2", colorStop2 ); - this.setProperty( "colorStop3", colorStop3 ); - this.setProperty( "colorStop4", colorStop4 ); - this.setProperty( "angle", angle ); - } - catch (e) - { - throw new Error( "could not import material: " + importStr ); - } - - return rtnStr; - }; + this.setProperty("color1", color1); + this.setProperty("color2", color2); + this.setProperty("color3", color3); + this.setProperty("color4", color4); + this.setProperty("colorStop1", colorStop1); + this.setProperty("colorStop2", colorStop2); + this.setProperty("colorStop3", colorStop3); + this.setProperty("colorStop4", colorStop4); + this.setProperty("angle", angle); + } + catch (e) { + throw new Error("could not import material: " + importStr); + } + }; + + this.export = function () { + // every material needs the base type and instance name + var exportStr = "material: " + this.getShaderName() + "\n"; + exportStr += "name: " + this.getName() + "\n"; + + exportStr += "color1: " + this.getColor1() + "\n"; + exportStr += "color2: " + this.getColor2() + "\n"; + exportStr += "color3: " + this.getColor3() + "\n"; + exportStr += "color4: " + this.getColor4() + "\n"; + + exportStr += "colorStop1: " + this.getColorStop1() + "\n"; + exportStr += "colorStop2: " + this.getColorStop2() + "\n"; + exportStr += "colorStop3: " + this.getColorStop3() + "\n"; + exportStr += "colorStop4: " + this.getColorStop4() + "\n"; + + exportStr += "angle: " + this.getAngle() + "\n"; + + // every material needs to terminate like this + exportStr += "endMaterial\n"; + + return exportStr; + }; + + this.import = function (importStr) { + var pu = new MaterialParser(importStr); + var material = pu.nextValue("material: "); + if (material != this.getShaderName()) throw new Error("ill-formed material"); + this.setName(pu.nextValue("name: ")); + + var rtnStr; + try { + var color1 = eval("[" + pu.nextValue("color1: ") + "]"), + color2 = eval("[" + pu.nextValue("color2: ") + "]"), + color3 = eval("[" + pu.nextValue("color3: ") + "]"), + color4 = eval("[" + pu.nextValue("color4: ") + "]"), + colorStop1 = Number(pu.nextValue("colorStop1: ")), + colorStop2 = Number(pu.nextValue("colorStop2: ")), + colorStop3 = Number(pu.nextValue("colorStop3: ")), + colorStop4 = Number(pu.nextValue("colorStop4: ")), + angle = Number(pu.nextValue("angle: ")); + + var endKey = "endMaterial\n"; + var index = importStr.indexOf(endKey); + index += endKey.length; + rtnStr = importStr.substr(index); + + this.setProperty("color1", color1); + this.setProperty("color2", color2); + this.setProperty("color3", color3); + this.setProperty("color4", color4); + this.setProperty("colorStop1", colorStop1); + this.setProperty("colorStop2", colorStop2); + this.setProperty("colorStop3", colorStop3); + this.setProperty("colorStop4", colorStop4); + this.setProperty("angle", angle); + } + catch (e) { + throw new Error("could not import material: " + importStr); + } + + return rtnStr; + }; }; /////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 18609d375e7aab9cb48c9b3f5b291f85cbd28683 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 3 Apr 2012 13:39:32 -0700 Subject: removed old unused import and export functions. --- js/lib/rdge/materials/linear-gradient-material.js | 63 ----------------------- 1 file changed, 63 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 87e41ad6..51a7430c 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -296,69 +296,6 @@ var LinearGradientMaterial = function LinearGradientMaterial() { throw new Error("could not import material: " + importStr); } }; - - this.export = function () { - // every material needs the base type and instance name - var exportStr = "material: " + this.getShaderName() + "\n"; - exportStr += "name: " + this.getName() + "\n"; - - exportStr += "color1: " + this.getColor1() + "\n"; - exportStr += "color2: " + this.getColor2() + "\n"; - exportStr += "color3: " + this.getColor3() + "\n"; - exportStr += "color4: " + this.getColor4() + "\n"; - - exportStr += "colorStop1: " + this.getColorStop1() + "\n"; - exportStr += "colorStop2: " + this.getColorStop2() + "\n"; - exportStr += "colorStop3: " + this.getColorStop3() + "\n"; - exportStr += "colorStop4: " + this.getColorStop4() + "\n"; - - exportStr += "angle: " + this.getAngle() + "\n"; - - // every material needs to terminate like this - exportStr += "endMaterial\n"; - - return exportStr; - }; - - this.import = function (importStr) { - var pu = new MaterialParser(importStr); - var material = pu.nextValue("material: "); - if (material != this.getShaderName()) throw new Error("ill-formed material"); - this.setName(pu.nextValue("name: ")); - - var rtnStr; - try { - var color1 = eval("[" + pu.nextValue("color1: ") + "]"), - color2 = eval("[" + pu.nextValue("color2: ") + "]"), - color3 = eval("[" + pu.nextValue("color3: ") + "]"), - color4 = eval("[" + pu.nextValue("color4: ") + "]"), - colorStop1 = Number(pu.nextValue("colorStop1: ")), - colorStop2 = Number(pu.nextValue("colorStop2: ")), - colorStop3 = Number(pu.nextValue("colorStop3: ")), - colorStop4 = Number(pu.nextValue("colorStop4: ")), - angle = Number(pu.nextValue("angle: ")); - - var endKey = "endMaterial\n"; - var index = importStr.indexOf(endKey); - index += endKey.length; - rtnStr = importStr.substr(index); - - this.setProperty("color1", color1); - this.setProperty("color2", color2); - this.setProperty("color3", color3); - this.setProperty("color4", color4); - this.setProperty("colorStop1", colorStop1); - this.setProperty("colorStop2", colorStop2); - this.setProperty("colorStop3", colorStop3); - this.setProperty("colorStop4", colorStop4); - this.setProperty("angle", angle); - } - catch (e) { - throw new Error("could not import material: " + importStr); - } - - return rtnStr; - }; }; /////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3