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/tunnel-material.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js
index fe787d16..53a2d4f2 100644
--- a/js/lib/rdge/materials/tunnel-material.js
+++ b/js/lib/rdge/materials/tunnel-material.js
@@ -51,12 +51,12 @@ var TunnelMaterial = function TunnelMaterial() {
 		if (world)  this.setWorld( world );
 
 		// set up the shader
-		this._shader = new jshader();
+		this._shader = new RDGE.jshader();
 		this._shader.def = tunnelMaterialDef;
 		this._shader.init();
 
 		// set up the material node
-		this._materialNode = createMaterialNode("tunnelMaterial");
+		this._materialNode = RDGE.createMaterialNode("tunnelMaterial");
 		this._materialNode.setShader(this._shader);
 
 		this._time = 0;
-- 
cgit v1.2.3


From 8d1cc709340da845d76f84220fe92c11e6217ff3 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 09:36:14 -0700
Subject: Made use of semicolons consistent and updated new files to use the
 new RDGE namespace

---
 js/lib/rdge/materials/tunnel-material.js | 79 ++++++++++++++++----------------
 1 file changed, 39 insertions(+), 40 deletions(-)

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

diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js
index 13cafc4f..83bf9021 100644
--- a/js/lib/rdge/materials/tunnel-material.js
+++ b/js/lib/rdge/materials/tunnel-material.js
@@ -11,64 +11,63 @@ var TunnelMaterial = function TunnelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "TunnelMaterial";
-	this._shaderName = "tunnel";
+    this._name = "TunnelMaterial";
+    this._shaderName = "tunnel";
 
-	this._texMap = 'assets/images/rocky-normal.jpg';
+    this._texMap = 'assets/images/rocky-normal.jpg';
 
-	this._time = 0.0;
-	this._dTime = 0.001;
+    this._time = 0.0;
+    this._dTime = 0.001;
 
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-	// all defined in parent PulseMaterial.js
-	// load the local default value
-	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+    // all defined in parent PulseMaterial.js
+    // load the local default value
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new TunnelMaterial();
-
-		// copy over the current values;
-		var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
-		this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
-		var n = propNames.length;
-		for (var i=0;  i<n;  i++) {
-			newMat.setProperty( propNames[i], propValues[i] );
+    // duplcate method requirde
+    this.dup = function (world) {
+        // allocate a new uber material
+        var newMat = new TunnelMaterial();
+
+        // copy over the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        var n = propNames.length;
+        for (var i = 0; i < n; i++) {
+            newMat.setProperty(propNames[i], propValues[i]);
         }
 
-		return newMat;
-	};
+        return newMat;
+    };
 
-	this.init = function( world )
-	{
-		// save the world
-		if (world)  this.setWorld( world );
+    this.init = function (world) {
+        // save the world
+        if (world) this.setWorld(world);
 
-		// set up the shader
-		this._shader = new RDGE.jshader();
-		this._shader.def = tunnelMaterialDef;
-		this._shader.init();
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = tunnelMaterialDef;
+        this._shader.init();
 
-		// set up the material node
-		this._materialNode = RDGE.createMaterialNode("tunnelMaterial" + "_" + world.generateUniqueNodeID());
-		this._materialNode.setShader(this._shader);
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("tunnelMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
 
-		this._time = 0;
-		if (this._shader && this._shader['default']) {
-			this._shader['default'].u_time.set( [this._time] );
+        this._time = 0;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_time.set([this._time]);
         }
 
-		// set the shader values in the shader
-		this.updateTexture();
-		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-		this.update( 0 );
-	}
+        // set the shader values in the shader
+        this.updateTexture();
+        this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
+        this.update(0);
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3