From a0d23354802ebc6b437698acb4b18d3395d47cd1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 16 Mar 2012 12:26:30 -0700
Subject: Conversion to JSON based file IO for canvas2D and WebGL rendering

---
 js/lib/rdge/materials/pulse-material.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'js/lib/rdge/materials/pulse-material.js')

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 81db36c6..1e2cd2a9 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -174,6 +174,38 @@ var PulseMaterial = function PulseMaterial() {
 		}
 	};
 
+	// JSON export
+	this.exportJSON = function()
+	{
+		var world = this.getWorld();
+		if (!world)
+			throw new Error( "no world in material.export, " + this.getName() );
+
+		var jObj =
+		{
+			'material'		: this.getShaderName(),
+			'name'			: this.getName(),
+			'texture'		: this._propValues[this._propNames[0]]
+		};
+
+		return jObj;
+	};
+
+	this.importJSON = function( jObj )
+	{
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+
+        try {
+			this._propValues[this._propNames[0]] = jObj.texture;
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + jObj );
+        }
+	}
+
+
 	this.export = function() {
 		// every material needs the base type and instance name
 		var exportStr = "material: " + this.getShaderName() + "\n";
-- 
cgit v1.2.3


From 43ea2515f1482eeb77454f407111f0568c056f72 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 16 Mar 2012 15:32:23 -0700
Subject: removing dead code

---
 js/lib/rdge/materials/pulse-material.js | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'js/lib/rdge/materials/pulse-material.js')

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 1e2cd2a9..6f19ab2b 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -125,18 +125,6 @@ var PulseMaterial = function PulseMaterial() {
 				var texMapName = this._propValues[this._propNames[0]];
 				var wrap = 'REPEAT',  mips = true;
 				var tex = this.loadTexture( texMapName, wrap, mips );
-				
-				/*
-				var glTex = new GLTexture( this.getWorld() );
-				var prevWorld = this.findPreviousWorld();
-				if (prevWorld)
-				{
-					var srcCanvas = prevWorld.getCanvas();
-					tex = glTex.loadFromCanvas( srcCanvas );
-				}
-				else
-					tex = glTex.loadFromFile( texMapName, wrap, mips );
-				*/
 
 				if (tex) {
 					technique.u_tex0.set( tex );
-- 
cgit v1.2.3


From 98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 20 Mar 2012 16:26:52 -0700
Subject: Bug Fixes for Canvas & WebGL File IO

---
 js/lib/rdge/materials/pulse-material.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/lib/rdge/materials/pulse-material.js')

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 6f19ab2b..fd2cbe0b 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -186,6 +186,7 @@ var PulseMaterial = function PulseMaterial() {
 
         try {
 			this._propValues[this._propNames[0]] = jObj.texture;
+			this._texMap = jObj.texture;
         }
         catch (e)
         {
-- 
cgit v1.2.3


From eb59a523258cad3351cba9bf8de986e90a8e5b1c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 21 Mar 2012 15:17:58 -0700
Subject: Added material library data to the canvas data.

---
 js/lib/rdge/materials/pulse-material.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'js/lib/rdge/materials/pulse-material.js')

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index fd2cbe0b..e6be69b4 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -165,10 +165,6 @@ var PulseMaterial = function PulseMaterial() {
 	// JSON export
 	this.exportJSON = function()
 	{
-		var world = this.getWorld();
-		if (!world)
-			throw new Error( "no world in material.export, " + this.getName() );
-
 		var jObj =
 		{
 			'material'		: this.getShaderName(),
-- 
cgit v1.2.3


From 4cd4d29ae10b87f7b280d537b8980d207a22dd43 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 21 Mar 2012 16:51:05 -0700
Subject: Synchronized material animation speed for pulse material between
 Ninja and runtime.

---
 js/lib/rdge/materials/pulse-material.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/pulse-material.js')

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index e6be69b4..2075d1ff 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -169,7 +169,8 @@ var PulseMaterial = function PulseMaterial() {
 		{
 			'material'		: this.getShaderName(),
 			'name'			: this.getName(),
-			'texture'		: this._propValues[this._propNames[0]]
+			'texture'		: this._propValues[this._propNames[0]],
+            'dTime'         : this._dTime
 		};
 
 		return jObj;
@@ -183,6 +184,8 @@ var PulseMaterial = function PulseMaterial() {
         try {
 			this._propValues[this._propNames[0]] = jObj.texture;
 			this._texMap = jObj.texture;
+            if (jObj.dTime)
+                this._dTime = jObj.dTime;
         }
         catch (e)
         {
-- 
cgit v1.2.3