From f6424c4756de2045648de0980de14a32b0126df7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 17 Apr 2014 12:27:51 -0400 Subject: scale map --- assets/javascripts/rectangles/map/ui.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'assets/javascripts/rectangles/map/ui.js') diff --git a/assets/javascripts/rectangles/map/ui.js b/assets/javascripts/rectangles/map/ui.js index cc9a560..9faebea 100644 --- a/assets/javascripts/rectangles/map/ui.js +++ b/assets/javascripts/rectangles/map/ui.js @@ -24,8 +24,8 @@ map.ui = new function(){ // function down (e, cursor){ - cursor.x.add( map.center.a + map.bounds.a/2 ) - cursor.y.add( -map.center.b - map.bounds.b/2 ) + cursor.x.div(map.zoom).add( map.center.a + map.bounds.a/2 ) + cursor.y.div(map.zoom).add( -map.center.b - map.bounds.b/2 ) var intersects = clipper.rooms.filter(function(r){ return r.focused = r.rect.contains(cursor.x.a, cursor.y.a) @@ -44,14 +44,13 @@ map.ui = new function(){ } function move (e, cursor) { - cursor.x.add( map.center.a + map.bounds.a/2 ) - cursor.y.add( -map.center.b - map.bounds.b/2 ) - z=true + cursor.x.div(map.zoom).add( map.center.a + map.bounds.a/2 ) + cursor.y.div(map.zoom).add( -map.center.b - map.bounds.b/2 ) } function drag (e, cursor) { - cursor.x.b += map.center.a + map.bounds.a/2 - cursor.y.b += -map.center.b - map.bounds.b/2 + cursor.x.b = (cursor.x.b / map.zoom) + map.center.a + map.bounds.a/2 + cursor.y.b = (cursor.y.b / map.zoom) - map.center.b - map.bounds.b/2 if (base.dragging) { base.dragging.rect.translation.a = cursor.x.magnitude() -- cgit v1.2.3-70-g09d2