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

Prebuilt module for commit 830a80a33f83356bd1c6e742bf3816195b25996c

Browse source
This commit is contained in:
Paper.js Bot 2017-03-18 15:40:15 +00:00
parent f5f88fc2dc
commit b8e69b7cbb
6 changed files with 110 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dist/docs/assets/js/paper.js vendored
View file

@ -9,7 +9,7 @@
*
* All rights reserved.
*
* Date: Sun Mar 12 11:11:14 2017 +0100
* Date: Sat Mar 18 16:35:34 2017 +0100
*
***
*
@ -1927,19 +1927,12 @@ var Rectangle = Base.extend({
},
intersects: function() {
var rect = Rectangle.read(arguments);
return rect.x + rect.width > this.x
&& rect.y + rect.height > this.y
&& rect.x < this.x + this.width
&& rect.y < this.y + this.height;
},
touches: function() {
var rect = Rectangle.read(arguments);
return rect.x + rect.width >= this.x
&& rect.y + rect.height >= this.y
&& rect.x <= this.x + this.width
&& rect.y <= this.y + this.height;
var rect = Rectangle.read(arguments),
epsilon = Base.read(arguments) || 0;
return rect.x + rect.width > this.x - epsilon
&& rect.y + rect.height > this.y - epsilon
&& rect.x < this.x + this.width + epsilon
&& rect.y < this.y + this.height + epsilon;
},
intersect: function() {
@ -7048,7 +7041,8 @@ new function() {
var straight1 = Curve.isStraight(v1),
straight2 = Curve.isStraight(v2),
straight = straight1 && straight2,
flip = straight1 && !straight2;
flip = straight1 && !straight2,
before = locations.length;
(straight
? addLineIntersection
: straight1 || straight2
@ -7058,6 +7052,23 @@ new function() {
flip ? c2 : c1, flip ? c1 : c2,
locations, include, flip,
0, 0, 0, 1, 0, 1);
if (!(straight && locations.length > before)) {
for (var i = 0; i < 4; i++) {
var t1 = i >> 1,
t2 = i & 1,
i1 = t1 * 6,
i2 = t2 * 6,
p1 = new Point(v1[i1], v1[i1 + 1]),
p2 = new Point(v2[i2], v2[i2 + 1]);
console.log(t1, t2);
if (p1.isClose(p2, epsilon)) {
addLocation(locations, include,
c1, t1, p1,
c2, t2, p2);
}
}
}
}
}
return locations;
@ -7721,7 +7732,8 @@ var PathItem = Item.extend({
matrix1 = this._matrix._orNullIfIdentity(),
matrix2 = self ? matrix1
: (_matrix || path._matrix)._orNullIfIdentity();
return self || this.getBounds(matrix1).touches(path.getBounds(matrix2))
return self || this.getBounds(matrix1).intersects(
path.getBounds(matrix2), 1e-12)
? Curve.getIntersections(
this.getCurves(), !self && path.getCurves(), include,
matrix1, matrix2, _returnFirst)

13
dist/docs/classes/Rectangle.html vendored
View file

@ -1169,11 +1169,11 @@ function onMouseMove(event) {
<div id="intersects-rect" class="member">
<div class="member-link">
<a name="intersects-rect" href="#intersects-rect"><tt><b>intersects</b>(rect)</tt></a>
<a name="intersects-rect" href="#intersects-rect"><tt><b>intersects</b>(rect[, epsilon])</tt></a>
</div>
<div class="member-description hidden">
<div class="member-text">
<p>Tests if the interior of this rectangle intersects the interior of another rectangle. Rectangles just touching each other are considered as non-intersecting.</p>
<p>Tests if the interior of this rectangle intersects the interior of another rectangle. Rectangles just touching each other are considered as non-intersecting, except if a <code>epsilon</code> value is specified by which this rectangle&rsquo;s dimensions are increased before comparing.</p>
<ul class="member-list">
@ -1184,6 +1184,13 @@ function onMouseMove(event) {
<a href="../classes/Rectangle.html"><tt>Rectangle</tt></a>
&mdash;&nbsp;the specified rectangle
</li>
<li>
<tt>epsilon:</tt>
<tt>Number</tt>
&mdash;&nbsp;the epsilon against which to compare the rectangle&rsquo;s dimensions
&mdash;&nbsp;optional, default: <tt>0</tt>
</li>
</ul>
@ -1193,7 +1200,7 @@ function onMouseMove(event) {
<h4>Returns:</h4>
<li>
<tt><tt>Boolean</tt></tt>&nbsp;&mdash;&nbsp;<tt>true</tt> if the rectangle and the specified rectangle intersect each other, <tt>false</tt> otherwise
<tt><tt>Boolean</tt></tt>&nbsp;&mdash;&nbsp;<tt>true</tt> if the rectangle and the specified rectangle intersect each other, <tt>false</tt> otherwise
</li>

44
dist/paper-core.js vendored
View file

@ -9,7 +9,7 @@
*
* All rights reserved.
*
* Date: Sun Mar 12 11:11:14 2017 +0100
* Date: Sat Mar 18 16:35:34 2017 +0100
*
***
*
@ -1927,19 +1927,12 @@ var Rectangle = Base.extend({
},
intersects: function() {
var rect = Rectangle.read(arguments);
return rect.x + rect.width > this.x
&& rect.y + rect.height > this.y
&& rect.x < this.x + this.width
&& rect.y < this.y + this.height;
},
touches: function() {
var rect = Rectangle.read(arguments);
return rect.x + rect.width >= this.x
&& rect.y + rect.height >= this.y
&& rect.x <= this.x + this.width
&& rect.y <= this.y + this.height;
var rect = Rectangle.read(arguments),
epsilon = Base.read(arguments) || 0;
return rect.x + rect.width > this.x - epsilon
&& rect.y + rect.height > this.y - epsilon
&& rect.x < this.x + this.width + epsilon
&& rect.y < this.y + this.height + epsilon;
},
intersect: function() {
@ -7048,7 +7041,8 @@ new function() {
var straight1 = Curve.isStraight(v1),
straight2 = Curve.isStraight(v2),
straight = straight1 && straight2,
flip = straight1 && !straight2;
flip = straight1 && !straight2,
before = locations.length;
(straight
? addLineIntersection
: straight1 || straight2
@ -7058,6 +7052,23 @@ new function() {
flip ? c2 : c1, flip ? c1 : c2,
locations, include, flip,
0, 0, 0, 1, 0, 1);
if (!(straight && locations.length > before)) {
for (var i = 0; i < 4; i++) {
var t1 = i >> 1,
t2 = i & 1,
i1 = t1 * 6,
i2 = t2 * 6,
p1 = new Point(v1[i1], v1[i1 + 1]),
p2 = new Point(v2[i2], v2[i2 + 1]);
console.log(t1, t2);
if (p1.isClose(p2, epsilon)) {
addLocation(locations, include,
c1, t1, p1,
c2, t2, p2);
}
}
}
}
}
return locations;
@ -7721,7 +7732,8 @@ var PathItem = Item.extend({
matrix1 = this._matrix._orNullIfIdentity(),
matrix2 = self ? matrix1
: (_matrix || path._matrix)._orNullIfIdentity();
return self || this.getBounds(matrix1).touches(path.getBounds(matrix2))
return self || this.getBounds(matrix1).intersects(
path.getBounds(matrix2), 1e-12)
? Curve.getIntersections(
this.getCurves(), !self && path.getCurves(), include,
matrix1, matrix2, _returnFirst)

16
dist/paper-core.min.js vendored
View file

File diff suppressed because one or more lines are too long

44
dist/paper-full.js vendored
View file

@ -9,7 +9,7 @@
*
* All rights reserved.
*
* Date: Sun Mar 12 11:11:14 2017 +0100
* Date: Sat Mar 18 16:35:34 2017 +0100
*
***
*
@ -1927,19 +1927,12 @@ var Rectangle = Base.extend({
},
intersects: function() {
var rect = Rectangle.read(arguments);
return rect.x + rect.width > this.x
&& rect.y + rect.height > this.y
&& rect.x < this.x + this.width
&& rect.y < this.y + this.height;
},
touches: function() {
var rect = Rectangle.read(arguments);
return rect.x + rect.width >= this.x
&& rect.y + rect.height >= this.y
&& rect.x <= this.x + this.width
&& rect.y <= this.y + this.height;
var rect = Rectangle.read(arguments),
epsilon = Base.read(arguments) || 0;
return rect.x + rect.width > this.x - epsilon
&& rect.y + rect.height > this.y - epsilon
&& rect.x < this.x + this.width + epsilon
&& rect.y < this.y + this.height + epsilon;
},
intersect: function() {
@ -7048,7 +7041,8 @@ new function() {
var straight1 = Curve.isStraight(v1),
straight2 = Curve.isStraight(v2),
straight = straight1 && straight2,
flip = straight1 && !straight2;
flip = straight1 && !straight2,
before = locations.length;
(straight
? addLineIntersection
: straight1 || straight2
@ -7058,6 +7052,23 @@ new function() {
flip ? c2 : c1, flip ? c1 : c2,
locations, include, flip,
0, 0, 0, 1, 0, 1);
if (!(straight && locations.length > before)) {
for (var i = 0; i < 4; i++) {
var t1 = i >> 1,
t2 = i & 1,
i1 = t1 * 6,
i2 = t2 * 6,
p1 = new Point(v1[i1], v1[i1 + 1]),
p2 = new Point(v2[i2], v2[i2 + 1]);
console.log(t1, t2);
if (p1.isClose(p2, epsilon)) {
addLocation(locations, include,
c1, t1, p1,
c2, t2, p2);
}
}
}
}
}
return locations;
@ -7721,7 +7732,8 @@ var PathItem = Item.extend({
matrix1 = this._matrix._orNullIfIdentity(),
matrix2 = self ? matrix1
: (_matrix || path._matrix)._orNullIfIdentity();
return self || this.getBounds(matrix1).touches(path.getBounds(matrix2))
return self || this.getBounds(matrix1).intersects(
path.getBounds(matrix2), 1e-12)
? Curve.getIntersections(
this.getCurves(), !self && path.getCurves(), include,
matrix1, matrix2, _returnFirst)

16
dist/paper-full.min.js vendored
View file

File diff suppressed because one or more lines are too long