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

Optimize Curve.getArea().

Browse source
This commit is contained in:
Jürg Lehni 2013-04-25 17:47:11 -07:00
parent 898e216668
commit 74f6a93b33
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/path/Curve.js
View file

@ -57,7 +57,7 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
*/ */
initialize: function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) { initialize: function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
var count = arguments.length; var count = arguments.length;
if (count == 0) { if (count === 0) {
this._segment1 = new Segment(); this._segment1 = new Segment();
this._segment2 = new Segment(); this._segment2 = new Segment();
} else if (count == 1) { } else if (count == 1) {
@ -258,7 +258,7 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
getLength: function(/* from, to */) { getLength: function(/* from, to */) {
var from = arguments[0], var from = arguments[0],
to = arguments[1], to = arguments[1],
fullLength = arguments.length == 0 || from == 0 && to == 1; fullLength = arguments.length === 0 || from === 0 && to === 1;
if (fullLength && this._length != null) if (fullLength && this._length != null)
return this._length; return this._length;
var length = Curve.getLength(this.getValues(), from, to); var length = Curve.getLength(this.getValues(), from, to);
@ -996,16 +996,16 @@ new function() { // Scope for methods that require numerical integration
c2x = v[4], c2y = v[5], c2x = v[4], c2y = v[5],
p2x = v[6], p2y = v[7]; p2x = v[6], p2y = v[7];
// http://objectmix.com/graphics/133553-area-closed-bezier-curve.html // http://objectmix.com/graphics/133553-area-closed-bezier-curve.html
return 3 / 10 * c1y * p1x - 3 / 20 * c1y * c2x return ( 3.0 * c1y * p1x - 1.5 * c1y * c2x
- 3 / 20 * c1y * p2x - 3 / 10 * p1y * c1x - 1.5 * c1y * p2x - 3.0 * p1y * c1x
- 3 / 20 * p1y * c2x - 1 / 20 * p1y * p2x - 1.5 * p1y * c2x - 0.5 * p1y * p2x
+ 3 / 20 * c2y * p1x + 3 / 20 * c2y * c1x + 1.5 * c2y * p1x + 1.5 * c2y * c1x
- 3 / 10 * c2y * p2x + 1 / 20 * p2y * p1x - 3.0 * c2y * p2x + 0.5 * p2y * p1x
+ 3 / 20 * p2y * c1x + 3 / 10 * p2y * c2x; + 1.5 * p2y * c1x + 3.0 * p2y * c2x) / 10;
}, },
getParameterAt: function(v, offset, start) { getParameterAt: function(v, offset, start) {
if (offset == 0) if (offset === 0)
return start; return start;
// See if we're going forward or backward, and handle cases // See if we're going forward or backward, and handle cases
// differently // differently
@ -1137,7 +1137,7 @@ new function() { // Scope for methods that require numerical integration
left = [], left = [],
right = []; right = [];
for (var j = 0; j <= 5; j++) for (var j = 0; j <= 5; j++)
p[0][j] = new Point(w[j]); p[0][j] = new Point(w[j]);
// Triangle computation // Triangle computation
for (var i = 1; i <= 5; i++) { for (var i = 1; i <= 5; i++) {