Merge remote-tracking branch 'origin/master'

examples/Scripts/HSLColor.html

@@ -6,32 +6,27 @@
 	<link rel="stylesheet" href="../css/style.css">
 	<script type="text/javascript" src="../../dist/paper.js"></script>
 	<script type="text/paperscript" canvas="canvas">
-		var center = view.center;
+		var path;
-
+		var r = view.size.width * .12;
-		var path,
+		var offset = new Point(view.size.width / 3, 0);
-			h,
+		var hCount = 40;
-			s = 0.6,
+		var sCount = 18;
-			l = 0.6,
+		for (var s = 0; s < sCount; s++) {
-			d = view.size.width * 0.012;
+			for (var h = 0; h < hCount; h++) {
-			p = new Point(),
+				var saturation = s / sCount;
-			r = view.size.width * .12;
+				var hue = (h / hCount) * 360;
-
+				var vector = new Point({
-		for (s = 0; s <= 1; s+=0.2) {
+					angle: hue - 90,
-			for (h = 0; h < (s > 0 ? 360 : 1); h+= 20) {
+					length: r * saturation
-				p.x = (center.x - r)*0.5 + Math.cos((h-90)/180*Math.PI) * r*s;
+				});
-				p.y = center.y + Math.sin((h-90)/180*Math.PI) * r*s;
+				var color = new HSLColor(hue, saturation, 0.75);
-				path = new Path.Circle(p, Math.max(d*Math.sqrt(s), 5));
+				var radius = Math.max(r / 10 * Math.sqrt(saturation), 5);
-				path.fillColor =  new HSLColor(h, s, 0.75);
+				for (var i = 0; i < 3; i++) {
-
+					var center = view.center + vector + offset * (i - 1);
-				p.x = center.x + Math.cos((h-90)/180*Math.PI) * r*s;
+					path = new Path.Circle(center, radius);
-				p.y = center.y + Math.sin((h-90)/180*Math.PI) * r*s;
+					color.lightness = 0.25 + 0.25 * (2 - i);
-				path = new Path.Circle(p, Math.max(d*Math.sqrt(s), 5));
+					path.fillColor = color.clone();
-				path.fillColor =  new HSLColor(h, s, 0.5);
+				}
-
-				p.x = center.x + (center.x + r) * .5 + Math.cos((h-90)/180*Math.PI) * r*s;
-				p.y = center.y + Math.sin((h-90)/180*Math.PI) * r*s;
-				path = new Path.Circle(p, Math.max(d*Math.sqrt(s), 5));
-				path.fillColor =  new HSLColor(h, s, 0.25);
 			}
 		}
 	</script>

src/path/CurveLocation.js

@@ -53,7 +53,8 @@ CurveLocation = Base.extend(/** @lends CurveLocation# */{
 	 */
 	getSegment: function() {
 		if (!this._segment) {
-			var parameter = this.getParameter();
+			var curve = this._curve,
+				parameter = this.getParameter();
 			if (parameter == 0) {
 				this._segment = curve._segment1;
 			} else if (parameter == 1) {

src/path/Path.js

@@ -1215,7 +1215,7 @@ var Path = this.Path = PathItem.extend(/** @lends Path# */{
 		// Now query stroke if we haven't already
 		if (!loc && radius > 0)
 			loc = this.getNearestLocation(point, matrix);
-		if (loc._distance <= radius)
+		if (loc && loc._distance <= radius)
 			return options.stroke
 					? new HitResult('stroke', loc)
 					: new HitResult('fill', this);