scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-05 20:32:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Jürg Lehni 2011-07-08 21:01:47 +02:00
commit 48d61b46bf
3 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
examples/Scripts/HSLColor.html
View file

@ -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,
h,
s = 0.6,
l = 0.6,
d = view.size.width * 0.012;
p = new Point(),
r = view.size.width * .12;
for (s = 0; s <= 1; s+=0.2) {
for (h = 0; h < (s > 0 ? 360 : 1); h+= 20) {
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;
path = new Path.Circle(p, Math.max(d*Math.sqrt(s), 5));
path.fillColor = new HSLColor(h, s, 0.75);
p.x = center.x + 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.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);
var path;
var r = view.size.width * .12;
var offset = new Point(view.size.width / 3, 0);
var hCount = 40;
var sCount = 18;
for (var s = 0; s < sCount; s++) {
for (var h = 0; h < hCount; h++) {
var saturation = s / sCount;
var hue = (h / hCount) * 360;
var vector = new Point({
angle: hue - 90,
length: r * saturation
});
var color = new HSLColor(hue, saturation, 0.75);
var radius = Math.max(r / 10 * Math.sqrt(saturation), 5);
for (var i = 0; i < 3; i++) {
var center = view.center + vector + offset * (i - 1);
path = new Path.Circle(center, radius);
color.lightness = 0.25 + 0.25 * (2 - i);
path.fillColor = color.clone();
}
}
}
</script>

3
src/path/CurveLocation.js
View file

@ -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) {

2
src/path/Path.js
View file

@ -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);