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

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

diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 86b1a93c..b04d8451 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -67,6 +67,24 @@ var PlasmaMaterial = function PlasmaMaterial() {
 		this._time += this._dTime;
 	}
 
+	this.exportJSON = function()
+	{
+		var jObj =
+		{
+			'material'		: this.getShaderName(),
+			'name'			: this.getName(),
+			'speed'			: this._speed,
+			'dTime'			: this._dTime
+		}
+
+		return jObj;
+	}
+
+	this.importJSON = function( jObj )
+	{
+		this._speed = jObj.speed;
+		this._dTime = jObj.dTime;
+	}
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
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/plasma-material.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 9ecc2b48..d52f4b88 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -56,7 +56,7 @@ var PlasmaMaterial = function PlasmaMaterial() {
 
 	this.init = function() {
 		// set up the shader
-		this._shader = new jshader();
+	    this._shader = new RDGE.jshader();
 		this._shader.def = plasmaShaderDef;
 		this._shader.init();
 
@@ -66,7 +66,7 @@ var PlasmaMaterial = function PlasmaMaterial() {
 		this.setProperty( "color", [this._time, 0, 0,  1] );
 
 		// set up the material node
-		this._materialNode = createMaterialNode("plasmaMaterial");
+		this._materialNode = RDGE.createMaterialNode("plasmaMaterial");
 		this._materialNode.setShader(this._shader);
 	};
 
-- 
cgit v1.2.3