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

(limited to 'js/lib/geom/line.js')

diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index da63b21c..e8d967f0 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -167,7 +167,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		if (!world._useWebGL)  return;
 		
 		// make sure RDGE has the correct context
-		g_Engine.setContext( world.getCanvas().rdgeid );
+		RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
 
 		 // create the gl buffer
 		var gl = world.getGLContext();
@@ -328,7 +328,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 			indices.push( index );  index++;
 		}
 
-		var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, g_Engine.getContext().renderer.TRIANGLES, indices.length);
+		var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length);
 
 		var strokeMaterial = this.makeStrokeMaterial();
 
-- 
cgit v1.2.3


From 18609d375e7aab9cb48c9b3f5b291f85cbd28683 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 13:39:32 -0700
Subject: removed old unused import and export functions.

---
 js/lib/geom/line.js | 70 -----------------------------------------------------
 1 file changed, 70 deletions(-)

(limited to 'js/lib/geom/line.js')

diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index 1af02bcd..1b2dd4fc 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -140,76 +140,6 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		this.importMaterialsJSON( jObj.materials );
 	};
 
-	this.export = function() {
-		var rtnStr = "type: " + this.geomType() + "\n";
-
-		rtnStr += "xoff: "			+ this._xOffset		+ "\n";
-		rtnStr += "yoff: "			+ this._yOffset		+ "\n";
-		rtnStr += "width: "			+ this._width		+ "\n";
-		rtnStr += "height: "		+ this._height		+ "\n";
-		rtnStr += "xAdj: "		    + this._xAdj		+ "\n";
-		rtnStr += "yAdj: "		    + this._yAdj		+ "\n";
-		rtnStr += "strokeWidth: "	+ this._strokeWidth	+ "\n";
-
-        if(this._strokeColor.gradientMode) {
-            rtnStr += "strokeGradientMode: "	+ this._strokeColor.gradientMode	+ "\n";
-            rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
-        } else {
-            rtnStr += "strokeColor: "	+ String(this._strokeColor)  + "\n";
-        }
-
-		rtnStr += "strokeStyle: "	+ this._strokeStyle	+ "\n";
-		rtnStr += "slope: "	        + String(this._slope)	+ "\n";
-
-		rtnStr += "strokeMat: ";
-		if (this._strokeMaterial) {
-			rtnStr += this._strokeMaterial.getName();
-        } else {
-			rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-
-		rtnStr += "\n";
-		return rtnStr;
-	};
-
-	this.import = function( importStr ) {
-		this._xOffset			= Number( this.getPropertyFromString( "xoff: ",			importStr )  );
-		this._yOffset			= Number( this.getPropertyFromString( "yoff: ",			importStr )  );
-		this._width				= Number( this.getPropertyFromString( "width: ",		importStr )  );
-		this._height			= Number( this.getPropertyFromString( "height: ",		importStr )  );
-		this._xAdj			    = Number( this.getPropertyFromString( "xAdj: ",			importStr )  );
-		this._yAdj			    = Number( this.getPropertyFromString( "yAdj: ",			importStr )  );
-		this._strokeWidth		= Number( this.getPropertyFromString( "strokeWidth: ",	importStr )  );
-		var slope 		        = this.getPropertyFromString( "slope: ",	importStr );
-
-		if(isNaN(Number(slope))) {
-			this._slope		    = slope;
-        } else {
-			this._slope         = Number(slope);
-        }
-
-		var strokeMaterialName	= this.getPropertyFromString( "strokeMat: ",	importStr );
-		this._strokeStyle		= this.getPropertyFromString( "strokeStyle: ",	importStr );
-
-        if(importStr.indexOf("strokeGradientMode: ") < 0)
-        {
-            this._strokeColor		=  eval( "[" + this.getPropertyFromString( "strokeColor: ",	importStr ) + "]" );
-        } else {
-            this._strokeColor = {};
-            this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ",	importStr );
-            this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ",	importStr ));
-        }
-
-		var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
-		if (!strokeMat) {
-			console.log( "object material not found in library: " + strokeMaterialName );
-			strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
-		}
-
-		this._strokeMaterial = strokeMat;
-
-	};
-
 	///////////////////////////////////////////////////////////////////////
 	// Methods
 	///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3