From 27c1ba250a7db26cf24dd456d20af9ff1649e638 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 23 Apr 2012 17:04:48 -0700
Subject: canvas interaction

---
 js/lib/geom/circle.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 1073c2db..896803bf 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -46,6 +46,10 @@ var Circle = function GLCircle() {
 			this._fillColor = fillColor;
 
 			this._strokeStyle = strokeStyle;
+
+			this._matrix = Matrix.I(4);
+			//this._matrix[12] = xOffset;
+			//this._matrix[13] = yOffset;
 		}
 
 		this.m_world = world;
@@ -187,7 +191,7 @@ var Circle = function GLCircle() {
 		// get the normalized device coordinates (NDC) for
 		// all position and dimensions.
 		var	vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-		var	xNDC = 2*this._xOffset/vpw,  yNDC = 2*this._yOffset/vph,
+		var	xNDC = 2*this._xOffset/vpw,  yNDC = -2*this._yOffset/vph,
 			xRadNDC = this._width/vpw,  yRadNDC = this._height/vph,
 			xStrokeNDC = 2*this._strokeWidth/vpw,  yStrokeNDC = 2*this._strokeWidth/vph,
 			xInnRadNDC = this._innerRadius*xRadNDC,  yInnRadNDC = this._innerRadius*yRadNDC;
@@ -725,7 +729,7 @@ var Circle = function GLCircle() {
 		// get the normalized device coordinates (NDC) for
 		// the position and radii.
 		var	vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-		var	xNDC = 2*this._xOffset/vpw,  yNDC = 2*this._yOffset/vph,
+		var	xNDC = 2*this._xOffset/vpw,  yNDC = -2*this._yOffset/vph,
 			xRadNDC = this._width/vpw,  yRadNDC = this._height/vph;
 		var projMat = world.makePerspectiveMatrix();
 		var z = -world.getViewDistance();
-- 
cgit v1.2.3