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/radial-blur-material.js | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

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

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 46cdda74..e76b302f 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -157,6 +157,42 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		}
 	};
 
+	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(),
+			'color'			: this._propValues["color"],
+			'texture'		: this._propValues[this._propNames[0]]
+		};
+
+		return jObj;
+	};
+
+	this.importJSON = function( importStr )
+	{
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName( jObj.name );
+
+		var rtnStr;
+        try
+        {
+            this._propValues[this._propNames[0]] = jObj.texture;
+			this.updateTexture();
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + importStr );
+        }
+		
+		return rtnStr;
+	}
+
 	this.export = function() {
 		// every material needs the base type and instance name
 		var exportStr = "material: " + this.getShaderName() + "\n";
-- 
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/radial-blur-material.js | 29 ++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

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

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index e76b302f..d67a3d43 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -174,7 +174,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		return jObj;
 	};
 
-	this.importJSON = function( importStr )
+	this.importJSON = function( jObj )
 	{
         if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
         this.setName( jObj.name );
@@ -278,10 +278,33 @@ var radialBlurMaterialDef =
 	}
 };
 
+
+/*
+var RaidersMaterial = function RaidersMaterial()
+{
+	// initialize the inherited members
+	this.inheritedFrom = RadialBlurMaterial;
+	this.inheritedFrom();
+
+	this._name = "RaidersMaterial";
+	this._shaderName = "radialBlur";
+
+	this._texMap = 'assets/images/raiders.png';
+	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+}
+
+RaidersMaterial.prototype = new Material();
+
+if (typeof exports === "object")
+{
+	exports.RaidersMaterial = RaidersMaterial;
+}
+*/
+
+
 RadialBlurMaterial.prototype = new Material();
 
-if (typeof exports === "object") {
+if (typeof exports === "object")
     exports.RadialBlurMaterial = RadialBlurMaterial;
-}
 
 
-- 
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/radial-blur-material.js | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index d67a3d43..91eebcff 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -159,10 +159,6 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 
 	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 31e924e1b8b8da8342b3ff2341c8284915486c0b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 22 Mar 2012 15:32:19 -0700
Subject: Added Paris and Raiders materials

---
 js/lib/rdge/materials/radial-blur-material.js | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 91eebcff..f4a4baa2 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -275,7 +275,6 @@ var radialBlurMaterialDef =
 };
 
 
-/*
 var RaidersMaterial = function RaidersMaterial()
 {
 	// initialize the inherited members
@@ -295,7 +294,6 @@ if (typeof exports === "object")
 {
 	exports.RaidersMaterial = RaidersMaterial;
 }
-*/
 
 
 RadialBlurMaterial.prototype = new Material();
-- 
cgit v1.2.3