From 8578322c60adaaf65f37ba96f2a0f7ed9de8e1dc Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 27 Feb 2012 10:28:03 -0800
Subject: Fixed various rendering bugs.

---
 js/helper-classes/RDGE/GLCircle.js    |  4 ++--
 js/helper-classes/RDGE/GLGeomObj.js   |  4 ++--
 js/helper-classes/RDGE/GLLine.js      |  2 +-
 js/helper-classes/RDGE/GLRectangle.js | 24 +++++++++++++++---------
 js/helper-classes/RDGE/GLWorld.js     |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 656657f6..15ed6b6d 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -47,8 +47,8 @@ function GLCircle()
         
 			this._strokeWidth = strokeSize;
 			this._innerRadius = innerRadius;
-			this._strokeColor = strokeColor;
-			this._fillColor = fillColor;
+			if (strokeColor)  this._strokeColor = strokeColor;
+			if (fillColor)  this._fillColor = fillColor;
 
 			this._strokeStyle = strokeStyle;
 		}
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js
index 5d7497ad..c1ee01ba 100755
--- a/js/helper-classes/RDGE/GLGeomObj.js
+++ b/js/helper-classes/RDGE/GLGeomObj.js
@@ -38,8 +38,8 @@ function GLGeomObj()
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor;
-    this._fillColor;
+    this._strokeColor	= [0,0,0,0];
+    this._fillColor		= [0,0,0,0];
 
 	// stroke and fill materials
 	this._fillMaterial;
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 5228ac09..5b966896 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -43,7 +43,7 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
 
 		this._slope = slope;
 		this._strokeWidth = strokeSize;
-		this._strokeColor = strokeColor;
+		if (strokeCOlor)this._strokeColor = strokeColor;
 
 		this._strokeStyle = strokeStyle;
 		this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index cf9c123e..a801d3c4 100755
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -400,27 +400,33 @@ function GLRectangle()
 		var	w = world.getViewportWidth(),
 			h = world.getViewportHeight();
 		
-		// set the fill
+		// render the fill
 		ctx.beginPath();
 		if (this._fillColor)
 		{
 			var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
 			ctx.fillStyle = c;
+
+			ctx.lineWidth	= lw;
+			var inset = Math.ceil( lw ) + 0.5;
+			this.renderPath( inset, ctx );
+			ctx.fill();
+			ctx.closePath();
 		}
 
-		// set the stroke
+		// render the stroke
+		ctx.beginPath();
 		if (this._strokeColor)
 		{
 			var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
 			ctx.strokeStyle = c;
-		}
 
-		ctx.lineWidth	= lw;
-		var inset = Math.ceil( 0.5*lw ) + 0.5;
-		this.renderPath( inset, ctx );
-		if (this._fillColor)	ctx.fill();
-		if (this._strokeColor)	ctx.stroke();
-		ctx.closePath();
+			ctx.lineWidth	= lw;
+			var inset = Math.ceil( 0.5*lw ) + 0.5;
+			this.renderPath( inset, ctx );
+			ctx.stroke();
+			ctx.closePath();
+		}
     }
 
 	this.createStroke = function(ctr,  width,  height,  strokeWidth,  tlRad, blRad, brRad, trRad, material)
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index 0addcadc..646faa24 100755
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -157,7 +157,7 @@ function GLWorld( canvas, use3D )
 
 		// change clear color
 		//this.renderer.setClearFlags(g_Engine.getContext().DEPTH_BUFFER_BIT);
-		this.renderer.setClearColor([1.0, 1.0, 1.0, 0.0]);
+		this.renderer.setClearColor([0.0, 0.0, 0.0, 0.0]);
 		//this.renderer.NinjaWorld = this;
         
 		// create an empty scene graph
-- 
cgit v1.2.3