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

Add support for optional matrix in Path#contains(), Path#getNearestLocation(), Curve#getValues(), Curve#getCrossings(), Curve#getNearestLocation()

Browse source
This commit is contained in:
Jürg Lehni 2011-07-07 16:07:29 +02:00
parent 2851d8e403
commit 4a53503130
2 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/path/Curve.js
View file

@ -208,8 +208,17 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
this.getHandle2().setSelected(selected);
},
getValues: function() {
return Curve.getValues(this._segment1, this._segment2);
getValues: function(matrix) {
return Curve.getValues(this._segment1, this._segment2, matrix);
},
getPoints: function(matrix) {
// Convert to array of absolute points
var coords = this.getValues(matrix),
points = [];
for (var i = 0; i < 8; i += 2)
points.push(Point.create(coords[i], coords[i + 1]));
return points;
},
// DOCS: document Curve#getLength(from, to)
@ -317,12 +326,12 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
return Curve.getParameter.apply(Curve, args);
},
getCrossings: function(point, prevSlope) {
getCrossings: function(point, matrix, prevSlope) {
// Implement the crossing number algorithm:
// http://en.wikipedia.org/wiki/Point_in_polygon
// Solve the y-axis cubic polynominal for point.y and count all
// solutions to the right of point.x as crossings.
var vals = this.getValues(),
var vals = this.getValues(matrix),
roots = Curve.solveCubic(vals[1], vals[3], vals[5], vals[7],
point.y),
crossings = 0;
@ -389,17 +398,20 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
return curve;
},
getValues: function(segment1, segment2) {
getValues: function(segment1, segment2, matrix) {
var p1 = segment1._point,
h1 = segment1._handleOut,
h2 = segment2._handleIn,
p2 = segment2._point;
return [
p1._x, p1._y,
p1._x + h1._x, p1._y + h1._y,
p2._x + h2._x, p2._y + h2._y,
p2._x, p2._y
];
p2 = segment2._point,
coords = [
p1._x, p1._y,
p1._x + h1._x, p1._y + h1._y,
p2._x + h2._x, p2._y + h2._y,
p2._x, p2._y
];
return matrix
? matrix._transformCoordinates(coords, 0, coords, 0, 4)
: coords;
},
evaluate: function(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t, type) {
@ -845,13 +857,8 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
}
return {
getNearestLocation: function(point) {
var p1 = this._segment1._point,
h1 = this._segment1._handleOut,
h2 = this._segment2._handleIn,
p2 = this._segment2._point;
var w = toBezierForm([p1, p1.add(h1), p2.add(h2), p2], point);
getNearestLocation: function(point, matrix) {
var w = toBezierForm(this.getPoints(matrix), point);
// Also look at beginning and end of curve (t = 0 / 1)
var roots = findRoots(w, 0).concat([0, 1]);
var minDist = Infinity,
@ -870,8 +877,8 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
return new CurveLocation(this, minRoot, minPoint, minDist);
},
getNearestPoint: function(point) {
return this.getNearestLocation(point).getPoint();
getNearestPoint: function(point, matrix) {
return this.getNearestLocation(point, matrix).getPoint();
}
};
});

12
src/path/Path.js
View file

@ -1162,12 +1162,12 @@ var Path = this.Path = PathItem.extend(/** @lends Path# */{
return loc && loc.getNormal();
},
getNearestLocation: function(point) {
getNearestLocation: function(point, matrix) {
var curves = this.getCurves(),
minDist = Infinity,
minLoc = null;
for (var i = 0, l = curves.length; i < l; i++) {
var loc = curves[i].getNearestLocation(point);
var loc = curves[i].getNearestLocation(point, matrix);
if (loc._distance < minDist) {
minDist = loc._distance;
minLoc = loc;
@ -1176,13 +1176,13 @@ var Path = this.Path = PathItem.extend(/** @lends Path# */{
return minLoc;
},
getNearestPoint: function(point) {
return this.getNearestLocation(point).getPoint();
getNearestPoint: function(point, matrix) {
return this.getNearestLocation(point, matrix).getPoint();
},
contains: function(point) {
contains: function(point, matrix) {
point = Point.read(arguments);
if (!this._closed || !this.getBounds().contains(point))
if (!this._closed || !this.getBounds(matrix).contains(point))
return false;
// Use the crossing number algorithm, by counting the crossings of the
// beam in right y-direction with the shape, and see if it's an odd