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

Rectangle: minor changes.

Browse source
This commit is contained in:
Jonathan Puckey 2011-04-28 14:15:12 +02:00
parent e0b5dbad21
commit b4ee975cfb
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/basic/Rectangle.js
View file

@ -209,23 +209,24 @@ var Rectangle = this.Rectangle = Base.extend({
} }
}, new function() { // Scope for injecting intersect, unite and include. }, new function() { // Scope for injecting intersect, unite and include.
return Base.each({ return Base.each({
// 1st = intersect, 2nd = isPoint
intersect: [true, false], intersect: [true, false],
unite: [false, false], unite: [false, false],
include: [false, true] include: [false, true]
}, function(values, name) { }, function(values, name) {
var intersect = values[0], var intersect = values[0],
isPoint = values[1], isPoint = values[1],
math1 = Math[intersect ? 'max' : 'min'], op1 = Math[intersect ? 'max' : 'min'],
math2 = Math[intersect ? 'min' : 'max']; op2 = Math[intersect ? 'min' : 'max'];
this[name] = function() { this[name] = function() {
var object = (isPoint ? Point : Rectangle).read(arguments), var object = (isPoint ? Point : Rectangle).read(arguments),
x1 = math1(this.x, object.x), x1 = op1(this.x, object.x),
y1 = math1(this.y, object.y), y1 = op1(this.y, object.y),
x2 = math2(this.x + this.width, x2 = op2(this.x + this.width,
object.x + (isPoint ? 0 : object.width)), object.x + (isPoint ? 0 : object.width)),
y2 = math2(this.y + this.height, y2 = op2(this.y + this.height,
object.y + (isPoint ? 0 : object.height)); object.y + (isPoint ? 0 : object.height));
return Rectangle.create(x1, y1, x2 - x1, y2 - y1); return Rectangle.create(x1, y1, x2 - x1, y2 - y1);
}; };
}, {}); }, {});
}, new function() { }, new function() {