From 818582d389f504c915be0c9052fafa33e3e76c92 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 7 Mar 2012 16:48:48 -0800
Subject: File IO

---
 js/lib/rdge/materials/linear-gradient-material.js | 2 +-
 1 file changed, 1 insertion(+), 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 2c52c67d..8e05e23d 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -212,7 +212,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
 		this._shader.init();
 
 		// set up the material node
-		this._materialNode = createMaterialNode( this.getShaderName() );
+		this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
 		this._materialNode.setShader(this._shader);
 
 		// send the current values to the shader
-- 
cgit v1.2.3


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 <valerio@motorola.com>
---
 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