dragging

4 files changed, 7 insertions, 5 deletions

diff --git a/assets/javascripts/rectangles/engine/builder.js b/assets/javascripts/rectangles/engine/builder.js
index edca2ed..7248689 100644
--- a/assets/javascripts/rectangles/engine/builder.js
+++ b/assets/javascripts/rectangles/engine/builder.js
@@ -9,7 +9,7 @@ var builder = new function(){
 	}
 
 	base.bind = function(){
-		base.tube.on("clipper:update", rebuild)
+		base.tube.on("clip", rebuild)
 	}
 
 	base.wheel = new wheel({
diff --git a/assets/javascripts/rectangles/engine/clipper.js b/assets/javascripts/rectangles/engine/clipper.js
index 13fc378..2ca8444 100644
--- a/assets/javascripts/rectangles/engine/clipper.js
+++ b/assets/javascripts/rectangles/engine/clipper.js
@@ -18,7 +18,7 @@ var clipper = new function(){
 
 	base.update = function(){
 		clipper.solve_rects()
-		builder.tube("clipper:update")
+		builder.tube("clip")
 	}
 	
 	base.add_room = function(r){
diff --git a/assets/javascripts/rectangles/map/draw.js b/assets/javascripts/rectangles/map/draw.js
index eb3dece..40bb483 100644
--- a/assets/javascripts/rectangles/map/draw.js
+++ b/assets/javascripts/rectangles/map/draw.js
@@ -39,7 +39,7 @@ function draw_mouse(mouse){
 	ctx.fill();
 
 	if (mouse.width() != 0 && mouse.height() != 0) {
-		if (clipper.dragging) {
+		if (map.ui.dragging) {
 			stroke_rect(mouse)
 		}
 		else {
diff --git a/assets/javascripts/rectangles/map/ui.js b/assets/javascripts/rectangles/map/ui.js
index 05fad90..8c2b668 100644
--- a/assets/javascripts/rectangles/map/ui.js
+++ b/assets/javascripts/rectangles/map/ui.js
@@ -32,7 +32,9 @@ var map = new function(){
 map.ui = new function(){
 	var base = this
 	base.el = document.querySelector("#map")
-	
+
+	base.creating = base.dragging = false
+
 	base.mouse = new mouse({
 		el: base.el,
 		down: down,
@@ -53,7 +55,7 @@ map.ui = new function(){
 		cursor.y.add( map.center.b - map.bounds.b/2 )
 
 		var intersects = clipper.rooms.filter(function(r){
-			return r.focused = r.rect.contains(cursor)
+			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
 
 		if (intersects.length){