From cad4d6cb3f667f6174ec05cecead675b244285b9 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 5 Mar 2012 04:51:31 -0800
Subject: Added more materials/canvas2D drawing to runtime.

---
 js/helper-classes/RDGE/Materials/PulseMaterial.js | 3 +++
 js/helper-classes/RDGE/Materials/WaterMaterial.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/helper-classes/RDGE/Materials')

diff --git a/js/helper-classes/RDGE/Materials/PulseMaterial.js b/js/helper-classes/RDGE/Materials/PulseMaterial.js
index 28f2a430..b0fbd998 100644
--- a/js/helper-classes/RDGE/Materials/PulseMaterial.js
+++ b/js/helper-classes/RDGE/Materials/PulseMaterial.js
@@ -185,6 +185,9 @@ function PulseMaterial()
 		// every material needs the base type and instance name
 		var exportStr = "material: " + this.getShaderName() + "\n";
 		exportStr += "name: " + this.getName() + "\n";
+
+		var texMapName = this._propValues[this._propNames[0]];
+		exportStr += "texture: " + texMapName;
 		
 		// every material needs to terminate like this
 		exportStr += "endMaterial\n";
diff --git a/js/helper-classes/RDGE/Materials/WaterMaterial.js b/js/helper-classes/RDGE/Materials/WaterMaterial.js
index 9ece3b45..49761c58 100644
--- a/js/helper-classes/RDGE/Materials/WaterMaterial.js
+++ b/js/helper-classes/RDGE/Materials/WaterMaterial.js
@@ -22,7 +22,7 @@ function WaterMaterial()
 	this._name = "WaterMaterial";
 	this._shaderName = "water";
 
-	this._texMap = 'assets/images/rocky-normal.jpg';
+	this._texMap = 'assets/images/rocky-normal.jpg\n';
 
 	this._time = 0.0;
 	this._dTime = 0.01;
-- 
cgit v1.2.3