diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-18 23:57:34 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-18 23:57:34 -0400 |
| commit | ca54810c810e8dd08b20dce5e901630d0d36fe25 (patch) | |
| tree | ab5a1dfbd60363d44ed4a75c735b99c1fdaf5cc7 /public/assets/javascripts/rectangles/models/vec2.js | |
| parent | 056d78d21aa3ae3985f5711fbfe0c14d3e3d4791 (diff) | |
| parent | 559799f707a8c7fbd0d6296dfbce81ac6f9b376a (diff) | |
ok
Diffstat (limited to 'public/assets/javascripts/rectangles/models/vec2.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/vec2.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js index 214feb9..a36c614 100644 --- a/public/assets/javascripts/rectangles/models/vec2.js +++ b/public/assets/javascripts/rectangles/models/vec2.js @@ -123,12 +123,12 @@ } vec2.prototype.union = function(v){ if (this.intersects(v)) { - return new vec2( min(this.a,v.a), max(this.b, v.b) ) + return new vec2( Math.min(this.a,v.a), Math.max(this.b, v.b) ) } } vec2.prototype.intersection = function(v){ if (this.intersects(v)) { - return new vec2( max(this.a,v.a), min(this.b, v.b) ) + return new vec2( Math.max(this.a,v.a), Math.min(this.b, v.b) ) } } |
