merge

10 files changed, 40 insertions, 23 deletions

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 4b14a21..ecde3ca 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -17,14 +17,15 @@ environment.init = function(){
 		scene.camera.radius = 20
 	}
 	
-	app.movements.gravity(true)
-	
 	Rooms.init()
+	Walls.init()
 	Scenery.init()
 	
 	scene.update()
 	environment.update()
 	
+	app.movements.gravity(true)
+
 	var minimap_el = document.querySelector("#minimap .el")
 	if (minimap_el) {
 		window.minimap = new Map ({
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 02218ed..3c3347b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -213,7 +213,7 @@ Map.UI.Editor = function(map){
           undo: wheelState,
           redo: intersects[0].copy()
         })
-        Rooms.clipper.update()
+        Rooms.rebuild()
         wheelState = null
 			}, 500)
 		}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index d7280b9..fabbdb9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -7,7 +7,6 @@ Map.UI.Minimap = function(map){
 
 	base.creating = base.dragging = base.resizing = false
 
-/*
 	base.mouse = new mouse({
 		el: map.el,
 		down: down,
@@ -16,7 +15,6 @@ Map.UI.Minimap = function(map){
 		up: up,
 		rightclick: rightclick,
 	})
-*/
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 3603f0c..b901a25 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -59,18 +59,19 @@
 				height: 500
 			})
 			base.add(room)
+			Rooms.rebuild()
 			return room
 		}
 	
 		base.remove = function(room){
 			delete base.list[room.id]
-			Rooms.clipper.update()
+      Rooms.rebuild()
 		}
 	
 		base.removeAll = function(){
 			base.list = {}
 			base.regions = []
-			Rooms.clipper.update()
+      Rooms.rebuild()
 		}
 	
 		base.count = function(){
@@ -88,6 +89,16 @@
 		base.values = function(){
 			return _.values(base.list)
 		}
+		
+		base.rebuild = function(walls_data){
+      walls_data = walls_data || Walls.serialize()
+      Rooms.clipper.update()
+      Rooms.builder.rebuild()
+      Rooms.grouper.build()
+      Walls.paint()
+      Walls.deserialize(walls_data)
+      app.tube("rooms-built")
+		}
 	
 		base.serialize = function(){
 			var rooms = base.map(function(room){
@@ -96,7 +107,7 @@
 			return rooms
 		}
 	
-		base.deserialize = function(rooms_data){
+		base.deserialize = function(rooms_data, walls_data){
 			rooms_data.forEach(function(data){
 			  if (! data || ! data.rect) return
 				var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
@@ -107,7 +118,7 @@
 				})
 				base.add(room)
 			})
-			Rooms.clipper.update()
+      Rooms.rebuild(walls_data)
 		}
 		
 		base.report = function(){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 7ff472d..0da3b9a 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -38,6 +38,15 @@
 		base.floors = []
 		base.lookup = {}
 		base.colors = {}
+		
+		base.init = function(){
+      base.colors = {
+        wall: app.defaults.colors.wall.slice(),
+        outline: app.defaults.colors.outline.slice(),
+        floor: app.defaults.colors.floor.slice(),
+        ceiling: app.defaults.colors.ceiling.slice(),
+      }
+    }
 
 		base.first = function(){
 		  for (var i in base.list) {
@@ -90,7 +99,7 @@
 		base.values = function(){
 			return _.values(base.lookup)
 		}
-		
+
 		base.serialize = function(){
 		  var data = []
 			base.forEach(function(wall){
@@ -104,7 +113,6 @@
 			  if (! wall_data) { return }
 			  var wall = base.lookup[ wall_data.id ]
 			  if (! wall) {
-			    console.log(wall_data);
 			    return
 			  }
 			  wall.deserialize( wall_data )
@@ -118,6 +126,7 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
+        // TODO: SET WALLPAPER HERE
       })
       Rooms.forEach(function(room){
         room.setFloorColor(floorColor)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 6a89158..4619eb1 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -32,19 +32,16 @@
 		var els = []
 
 		base.init = function(){
-			base.bind()
+			// base.bind()
 		}
 
 		base.bind = function(){
-			app.on("clip", base.rebuild.bind(base))
 		}
 
 		base.rebuild = function(){
 			if (window.scene) {
 				base.clear()
 				base.build()
-				Rooms.grouper.build()
-				app.tube("rooms-built")
 			}
 		}
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
index 0382758..df83cc8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
@@ -38,7 +38,6 @@
 
 		base.update = function(){
 			base.solve_rects()
-			app.tube("clip")
 		}
 	
 		var regions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 57a0886..bee8c49 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -69,11 +69,11 @@
       type: "create-room",
       undo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
       redo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -83,14 +83,14 @@
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(state){
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -98,12 +98,12 @@
       type: "destroy-room",
       undo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
     },
     
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index c85682a..3a6c449 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -108,7 +108,7 @@
 		this.clamp_delta( this.bounds, dimension, position, delta )
 
 		var new_delta = delta.clone()
-		if (this.clamp_delta(old_bounds, dimension, position, new_delta).eq(delta)) {
+		if (old_bounds && this.clamp_delta(old_bounds, dimension, position, new_delta).eq(delta)) {
 			return old_bounds
 		}
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fcb2f5e..7ff9015 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -114,6 +114,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, pos)
           }
 					else {
 						app.controller.pickWall(base, pos)