texture abstraction integration

2 files changed, 8 insertions, 3 deletions

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index e3490134..b12e9dd5 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -4,7 +4,6 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Texture = require("js/lib/rdge/texture").Texture;
 var Material = require("js/lib/rdge/materials/material").Material;
 ///////////////////////////////////////////////////////////////////////
@@ -220,7 +219,7 @@ var PulseMaterial = function PulseMaterial()
         }
         }
 
-
+    /*
         this.export = function() {
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";
@@ -261,6 +260,7 @@ var PulseMaterial = function PulseMaterial()
 
                 return rtnStr;
         }
+    */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js
index 52c40543..24fc885f 100644
--- a/js/lib/rdge/materials/relief-tunnel-material.js
+++ b/js/lib/rdge/materials/relief-tunnel-material.js
@@ -6,8 +6,10 @@
 
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
-var ReliefTunnelMaterial = function ReliefTunnelMaterial() {
+var ReliefTunnelMaterial = function ReliefTunnelMaterial()
+{
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -62,6 +64,9 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() {
                         this._shader['default'].u_time.set( [this._time] );
         }
 
+        var texMapName = this._propValues[this._propNames[0]];
+        this._glTex = new Texture( world, texMapName );
+
                 // set the shader values in the shader
                 this.updateTexture();
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );