store layouts and retrieve them

3 files changed, 11 insertions, 9 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 3046d1d..5e00eab 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -1,7 +1,7 @@
 /*
 */
 
-window.ctx = window.w = window.h = null;
+window.w = window.h = null;
 
 var Map = function(){
 	var base = this
@@ -26,8 +26,7 @@ var Map = function(){
 		base.zoom = pow(2, base.zoom_exponent)
 	}
 
-	var canvas = document.createElement("canvas")
-	var ctx = window.ctx = canvas.getContext("2d")
+	var canvas = base.canvas = document.createElement("canvas")
 	var w = window.w = canvas.width = base.dimensions.a
 	var h = window.h = canvas.height = base.dimensions.b
 	document.querySelector("#map").appendChild(canvas)
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 75e8ad1..7f55e51 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -2,10 +2,12 @@
 var MapDraw = function(map){
 
 	var draw = this
+	
+	var ctx = map.canvas.getContext("2d")
 
 	draw.animate = function(){
 		ctx.save()
-		draw.clear_canvas()
+		draw.clear()
 		draw.ruler()
 
 		ctx.translate( map.bounds.a * 1/2, map.bounds.b * 1/2)
@@ -21,7 +23,7 @@ var MapDraw = function(map){
 		ctx.restore()
 	}
 
-	draw.clear_canvas = function(){
+	draw.clear = function(){
 		ctx.fillStyle = "rgba(255,255,255,0.9)"
 		ctx.clearRect(0,0,w,h)
 		ctx.fillRect(0,0,w,h)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index a51edb9..bcfffcc 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -22,7 +22,7 @@ var Rooms = new function(){
 	base.add_with_rect = function(rect){
 		var room = new Room({
 			rect: rect,
-			height: 500 // quantize(randrange(300,800), 50),
+			height: 500
 		})
 		base.add(room)
 	}
@@ -38,6 +38,7 @@ var Rooms = new function(){
 	base.forEach = function(f){
 		return base.values().forEach(f)
 	}
+	
 	base.map = function(f){
 		return base.values().map(f)
 	}
@@ -50,12 +51,11 @@ var Rooms = new function(){
 		var rooms = base.map(function(room){
 			return room.serialize()
 		})
-		var rooms_data = { rooms: rooms }
-		return rooms_data
+		return rooms
 	}
 	
 	base.deserialize = function(rooms_data){
-		rooms_data.rooms.forEach(function(data){
+		rooms_data.forEach(function(data){
 			var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
 			var room = new Room({
 				id: data.id,
@@ -64,6 +64,7 @@ var Rooms = new function(){
 			})
 			base.add(room)
 		})
+		Rooms.clipper.update()
 	}
 
 	base.uid = (function(){