From a91321725a3a2db451055ee7d5e4a40576b83c5c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 10 Jun 2014 13:37:27 -0400
Subject: rename map stuff so we can use alternate drawing ui

---
 .../javascripts/rectangles/engine/map/_map.js      |  5 +++-
 .../javascripts/rectangles/engine/map/draw.js      | 30 +++++++++++-----------
 .../assets/javascripts/rectangles/engine/map/ui.js |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine')

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index b62a813..855ca5d 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -3,7 +3,7 @@
 
 window.ctx = window.w = window.h = null;
 
-var map = new function(){
+var Map = function(){
 	var base = this
 	base.el = document.querySelector("#map")
 	
@@ -31,6 +31,9 @@ var map = new function(){
 	var w = window.w = canvas.width = base.dimensions.a
 	var h = window.h = canvas.height = base.dimensions.b
 	document.querySelector("#map").appendChild(canvas)
+	
+	base.draw = new MapDraw (base)
+	base.ui = new MapUI (base)
 
 	base.update = function(){
 		base.draw.animate()
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index ec60d31..f4cb1d2 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -1,33 +1,33 @@
 
-map.draw = new function(){
+var MapDraw = function(map){
 
-	var base = this
+	var draw = this
 
-	base.animate = function(){
+	draw.animate = function(){
 		ctx.save()
-		map.draw.clear_canvas()
-		map.draw.ruler()
+		draw.clear_canvas()
+		draw.ruler()
 
 		ctx.translate( map.bounds.a * 1/2, map.bounds.b * 1/2)
 		ctx.scale( map.zoom, map.zoom )
 		ctx.translate( map.center.a,  map.center.b)
 		ctx.scale( -1, 1 )
 
-		map.draw.regions(Rooms.regions)
-		map.draw.mouse(map.ui.mouse.cursor)
-		map.draw.coords()
-		scene && map.draw.camera(scene.camera)
+		draw.regions(Rooms.regions)
+		draw.mouse(map.ui.mouse.cursor)
+		draw.coords()
+		scene && draw.camera(scene.camera)
 
 		ctx.restore()
 	}
 
-	base.clear_canvas = function(){
+	draw.clear_canvas = function(){
 		ctx.fillStyle = "rgba(255,255,255,0.9)"
 		ctx.clearRect(0,0,w,h)
 		ctx.fillRect(0,0,w,h)
 	}
 
-	base.ruler = function (){
+	draw.ruler = function (){
 		ctx.strokeStyle = "rgba(80,80,80,0.5)"
 		ctx.lineWidth = 1
 		var len = 5
@@ -37,7 +37,7 @@ map.draw = new function(){
 		}
 	}
 
-	base.regions = function(regions){
+	draw.regions = function(regions){
 		for (var i = 0; i < regions.length; i++) {
 			if (regions[i].dupe) continue
 			ctx.fillStyle = colors[i % colors.length]
@@ -46,7 +46,7 @@ map.draw = new function(){
 		}
 	}
 
-	base.mouse = function(mouse){
+	draw.mouse = function(mouse){
 		var radius = 3 / map.zoom
 	
 		ctx.fillStyle = "rgba(255,0,0,0.4)";
@@ -65,7 +65,7 @@ map.draw = new function(){
 		}
 	}
 	
-	base.camera = function(cam){
+	draw.camera = function(cam){
  		ctx.lineWidth = 0.5
 
 		ctx.save()
@@ -88,7 +88,7 @@ map.draw = new function(){
 		ctx.restore()
 	}
 
-	base.coords = function(){
+	draw.coords = function(){
 		ctx.fillStyle = "#888";
 		dot_at(0,0)
 		ctx.fillStyle = "#bbb";
diff --git a/public/assets/javascripts/rectangles/engine/map/ui.js b/public/assets/javascripts/rectangles/engine/map/ui.js
index 6e9a5ab..63e8e18 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui.js
@@ -1,5 +1,5 @@
 
-map.ui = new function(){
+var MapUI = function(map){
 
 	var base = this
 
-- 
cgit v1.2.3-70-g09d2