From 91a9e02bff0397ec9b1f55fdf61cef72eb0d8a0f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 8 May 2012 15:53:35 -0700
Subject: Radial gradients to match CSS

---
 js/lib/geom/circle.js          |  3 +++
 js/lib/geom/rectangle.js       | 13 ++-----------
 js/lib/geom/shape-primitive.js | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 0f1f49a9..afeed449 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -279,6 +279,7 @@ var Circle = function GLCircle() {
 
 		if (fillPrim) {
             fillMaterial = this.makeFillMaterial();
+			fillMaterial.fitToPrimitive( fillPrim );
 
             this._primArray.push( fillPrim );
             this._materialNodeArray.push( fillMaterial.getMaterialNode() );
@@ -286,6 +287,7 @@ var Circle = function GLCircle() {
 
 		if (strokePrim0) {
             strokeMaterial0 = this.makeStrokeMaterial();
+			strokeMaterial0.fitToPrimitive( strokePrim0 );
 
             this._primArray.push( strokePrim0 );
             this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
@@ -293,6 +295,7 @@ var Circle = function GLCircle() {
 
 		if (strokePrim1) {
             strokeMaterial2 = this.makeStrokeMaterial();
+			strokeMaterial2.fitToPrimitive( strokePrim1 );
 
             this._primArray.push( strokePrim1 );
             this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 490a9a6f..296ed024 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -57,13 +57,10 @@ var Rectangle = function GLRectangle() {
 			this._strokeStyle = strokeStyle;
 
 			this._matrix = Matrix.I(4);
-			//this._matrix[12] = xoffset;
-			//this._matrix[13] = yoffset;
 		}
 
 		// the overall radius includes the fill and the stroke.  separate the two based onthe stroke width
 		//  this._fillRad = this._radius - this._strokeWidth;
-		//    var err = 0.05;
 		var err = 0;
 		this._fillWidth = this._width - this._strokeWidth  + err;
 		this._fillHeight = this._height - this._strokeWidth + err;
@@ -116,18 +113,10 @@ var Rectangle = function GLRectangle() {
         return this._strokeColor;
     };
 
-	//this.setStrokeColor = function(c) {
-	// this._strokeColor = c;
-	// };
-
 	this.getFillColor = function() {
         return this._fillColor;
     };
 
-	//this.setFillColor = function(c) {
-	// this._fillColor = c.slice(0);
-	// };
-
 	this.getTLRadius = function() {
         return this._tlRadius;
     };
@@ -324,6 +313,7 @@ var Rectangle = function GLRectangle() {
 		// stroke
 		var strokeMaterial = this.makeStrokeMaterial();
 		var strokePrim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial);
+		strokeMaterial.fitToPrimitive( strokePrim );
         this._primArray.push( strokePrim );
 		this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
@@ -337,6 +327,7 @@ var Rectangle = function GLRectangle() {
 		var fillMaterial = this.makeFillMaterial();
 		//console.log( "fillMaterial: " + fillMaterial.getName() );
 		var fillPrim = this.createFill([x,y],  2*xFill,  2*yFill,  tlRadius, blRadius, brRadius, trRadius, fillMaterial);
+		fillMaterial.fitToPrimitive( fillPrim );
         this._primArray.push( fillPrim );
 		this._materialNodeArray.push( fillMaterial.getMaterialNode() );
 
diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index 97873d32..9864a8e9 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -49,6 +49,33 @@ ShapePrimitive.create = function(coords,  normals,  uvs,  indices, primType, ver
 	return prim;
 };
 
+ShapePrimitive.getBounds = function( prim )
+{
+	var verts = prim.bufferStreams[0];
+	var nVerts = verts.length;
+	var xMin = verts[0],  xMax = verts[0],
+		yMin = verts[1],  yMax = verts[1],
+		zMin = verts[2],  zMax = verts[2];
+
+	for (var index=3;  index<verts.length;  )
+	{
+		if (verts[index] < xMin)  xMin = verts[index];
+		else if (verts[index] > xMax)  xMax = verts[index];
+
+		index++;
+		if (verts[index] < yMin)  yMin = verts[index];
+		else if (verts[index] > yMax)  yMax = verts[index];
+
+		index++;
+		if (verts[index] < zMin)  zMin = verts[index];
+		else if (verts[index] > zMax)  zMax = verts[index];
+
+		index++;
+	}
+
+	return [xMin, yMin, zMin,  xMax, yMax, zMax];
+};
+
 if (typeof exports === "object") {
     exports.ShapePrimitive = ShapePrimitive;
 }
\ No newline at end of file
-- 
cgit v1.2.3