diff options
Diffstat (limited to 'assets/javascripts')
| -rw-r--r-- | assets/javascripts/rectangles/clipper.js | 4 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/draw.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/rect.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/vec2.js | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/assets/javascripts/rectangles/clipper.js b/assets/javascripts/rectangles/clipper.js index 5bbc155..bd0c521 100644 --- a/assets/javascripts/rectangles/clipper.js +++ b/assets/javascripts/rectangles/clipper.js @@ -86,11 +86,11 @@ var clipper = new function(){ document.addEventListener("mouseup", function(e){ if (clipper.creating) { if (mouse.height() != 0 && mouse.width() != 0) { - rects.push(mouse.normalize()) + rects.push(mouse.translate()) } } if (clipper.dragging) { - clipper.dragging.normalize() + clipper.dragging.translate() } mouse = new rect(e.pageX, e.pageY) clipper.creating = clipper.dragging = false diff --git a/assets/javascripts/rectangles/draw.js b/assets/javascripts/rectangles/draw.js index 8786b0b..560c281 100644 --- a/assets/javascripts/rectangles/draw.js +++ b/assets/javascripts/rectangles/draw.js @@ -42,7 +42,7 @@ function draw_mouse(mouse){ } else { ctx.fillStyle = "rgba(255,255,0,0.5)" - mouse.clone().normalize().fill() + mouse.clone().translate().fill() } } } diff --git a/assets/javascripts/rectangles/rect.js b/assets/javascripts/rectangles/rect.js index 3c6eedc..a539b74 100644 --- a/assets/javascripts/rectangles/rect.js +++ b/assets/javascripts/rectangles/rect.js @@ -28,7 +28,7 @@ window.rect = (function(){ rect.prototype.area = function(){ return this.x.length() * this.y.length() } - rect.prototype.normalize = function(){ + rect.prototype.translate = function(){ this.x.abs().add(this.translation.a) this.y.abs().add(this.translation.b) this.translation.a = this.translation.b = 0 diff --git a/assets/javascripts/rectangles/vec2.js b/assets/javascripts/rectangles/vec2.js index f4d6a84..4e2ad36 100644 --- a/assets/javascripts/rectangles/vec2.js +++ b/assets/javascripts/rectangles/vec2.js @@ -41,6 +41,11 @@ vec2.prototype.div = function(n){ this.a /= n this.b /= n } +vec2.normalize = function(){ + var dim = max(this.a, this.b) + this.a = this.a/dim + this.b = this.b/dim +} vec2.prototype.contains = function(n){ return this.a <= n && n <= this.b } |
