From b0d8d439a95b5912c57c3d8fa21cc834976843b5 Mon Sep 17 00:00:00 2001
From: chris viau <christopheviau@gmail.com>
Date: Tue, 7 Jun 2011 00:59:18 -0400
Subject: [PATCH] added more shapes

---
 d3.js | 51 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/d3.js b/d3.js
index 1a8a4d36..e07c63bc 100644
--- a/d3.js
+++ b/d3.js
@@ -3305,17 +3305,26 @@ d3.svg.tweenable = function() {
 
 d3.svg.tweenableTypes = [
 	"circle",
+	"ellipse",
+	"drop",
 	"cross",
+	"malteseCross",
 	"diamond",
 	"square",
+	"rectangle",
 	"triangle",
 	"star",
-	"ellipse",
+	"roundedStar",
 	"pentagon",
 	"hexagon",
 	"heptagon",
 	"gear",
-	"drop"
+	"butterfly",
+	"bean",
+	"asterisk",
+	"clover",
+	"heart",
+	"cloverFour"
 ];
 
 function d3_svg_tweenableSize() {
@@ -3346,10 +3355,11 @@ var superformulator = {
 		}
 		var radiusMult = (diameter/2) / rMax;
 		var x, y;
+		var ang = Math.PI * (s.ang/180);
 		for(var i=0; i<thetaSteps;i++){
-			x = r[i]*radiusMult*Math.cos(thetaStepSize*i+rotationAngle);
+			x = r[i]*radiusMult*Math.cos(thetaStepSize*i+ang);
 			x = Math.round(x*100)/100;
-			y = r[i]*radiusMult*Math.sin(thetaStepSize*i+rotationAngle);
+			y = r[i]*radiusMult*Math.sin(thetaStepSize*i+ang);
 			y = Math.round(y*100)/100;
 			path[i] = [x, y];
 		}
@@ -3369,18 +3379,27 @@ var superformulator = {
 }
 
 var d3_svg_tweenables = {
-	"circle": function(size) {return superformulator.getSVGPath({'m':4, 'n1':2, 'n2':2, 'n3':2, 'a':1, 'b':1}, Math.sqrt(size));},
-	"cross": function(size) {return superformulator.getSVGPath({'m':8, 'n1':1.3, 'n2':0.01, 'n3':8, 'a':1, 'b':1}, Math.sqrt(size));},
-	"diamond": function(size) {return superformulator.getSVGPath({'m':4, 'n1':1, 'n2':1, 'n3':1, 'a':1, 'b':1}, Math.sqrt(size));},
-	"square": function(size, d) {return superformulator.getSVGPath({'m':4, 'n1':100, 'n2':100, 'n3':100, 'a':1, 'b':1}, Math.sqrt(size));},
-	"triangle": function(size) {return superformulator.getSVGPath({'m':3, 'n1':100, 'n2':200, 'n3':200, 'a':1, 'b':1}, Math.sqrt(size));},
-	"star": function(size) {return superformulator.getSVGPath({'m':5, 'n1':30, 'n2':100, 'n3':100, 'a':1, 'b':1}, Math.sqrt(size));},
-	"ellipse": function(size) {return superformulator.getSVGPath({'m':4, 'n1':2, 'n2':2, 'n3':2, 'a':9, 'b':6}, Math.sqrt(size));},
-	"pentagon": function(size) {return superformulator.getSVGPath({'m':5, 'n1':1000, 'n2':600, 'n3':600, 'a':1, 'b':1}, Math.sqrt(size));},
-	"hexagon": function(size) {return superformulator.getSVGPath({'m':6, 'n1':1000, 'n2':400, 'n3':400, 'a':1, 'b':1}, Math.sqrt(size));},
-	"heptagon": function(size) {return superformulator.getSVGPath({'m':6, 'n1':1000, 'n2':400, 'n3':400, 'a':1, 'b':1}, Math.sqrt(size));},
-	"gear": function(size) {return superformulator.getSVGPath({'m':19, 'n1':100, 'n2':50, 'n3':50, 'a':1, 'b':1}, Math.sqrt(size));},
-	"drop": function(size) {return superformulator.getSVGPath({'m':1, 'n1':0.5, 'n2':0.5, 'n3':0.5, 'a':1, 'b':1}, Math.sqrt(size));}
+	"circle": function(size) {return superformulator.getSVGPath({'m':4, 'n1':2, 'n2':2, 'n3':2, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"cross": function(size) {return superformulator.getSVGPath({'m':8, 'n1':1.3, 'n2':0.01, 'n3':8, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"cloverFour": function(size) {return superformulator.getSVGPath({'m':8, 'n1':10, 'n2':-1, 'n3':-8, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"malteseCross": function(size) {return superformulator.getSVGPath({'m':8, 'n1':0.9, 'n2':0.1, 'n3':100, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"diamond": function(size) {return superformulator.getSVGPath({'m':4, 'n1':1, 'n2':1, 'n3':1, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"square": function(size, d) {return superformulator.getSVGPath({'m':4, 'n1':100, 'n2':100, 'n3':100, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"rectangle": function(size, d) {return superformulator.getSVGPath({'m':4, 'n1':100, 'n2':100, 'n3':100, 'a':2, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"triangle": function(size) {return superformulator.getSVGPath({'m':3, 'n1':100, 'n2':200, 'n3':200, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"star": function(size) {return superformulator.getSVGPath({'m':5, 'n1':30, 'n2':100, 'n3':100, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"roundedStar": function(size) {return superformulator.getSVGPath({'m':5, 'n1':2, 'n2':7, 'n3':7, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"ellipse": function(size) {return superformulator.getSVGPath({'m':4, 'n1':2, 'n2':2, 'n3':2, 'a':9, 'b':6, 'ang':0}, Math.sqrt(size));},
+	"pentagon": function(size) {return superformulator.getSVGPath({'m':5, 'n1':1000, 'n2':600, 'n3':600, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"hexagon": function(size) {return superformulator.getSVGPath({'m':6, 'n1':1000, 'n2':400, 'n3':400, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"heptagon": function(size) {return superformulator.getSVGPath({'m':7, 'n1':1000, 'n2':300, 'n3':300, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"gear": function(size) {return superformulator.getSVGPath({'m':19, 'n1':100, 'n2':50, 'n3':50, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"drop": function(size) {return superformulator.getSVGPath({'m':1, 'n1':0.5, 'n2':0.5, 'n3':0.5, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"butterfly": function(size) {return superformulator.getSVGPath({'m':3, 'n1':1, 'n2':6, 'n3':2, 'a':0.6, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"bean": function(size) {return superformulator.getSVGPath({'m':2, 'n1':1, 'n2':4, 'n3':8, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"asterisk": function(size) {return superformulator.getSVGPath({'m':12, 'n1':0.3, 'n2':0, 'n3':10, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"clover": function(size) {return superformulator.getSVGPath({'m':6, 'n1':0.3, 'n2':0, 'n3':10, 'a':1, 'b':1, 'ang':0}, Math.sqrt(size));},
+	"heart": function(size) {return superformulator.getSVGPath({'m':1, 'n1':0.8, 'n2':1, 'n3':-8, 'a':1, 'b':0.18, 'ang':0}, Math.sqrt(size));}
 };
 
 d3.svg.symbol = function() {