loading rooms into editor

1 files changed, 10 insertions, 3 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index d4281ad..5c9945c 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -127,14 +127,16 @@
       Rooms.rebuild(walls_data)
 		}
 
-		base.deserializeFromShapes = function(shapes_data, walls_data) {
+		base.deserializeFromShapes = function(data, walls_data) {
+		  walls_data = walls_data || Walls.serialize()
 		  base.shapesMode = true
       window.viewHeight = data.viewHeight || app.defaults.viewHeight
       window.wallHeight = data.wallHeight || app.defaults.wallHeight
       $(".units").val( data.units )
 
       shapes.deserialize( data.shapes )
-      shapes.build()
+      // shapes.build()
+      var regions = RegionList.build()
 
       regions.forEach(function(region){
         var room = new Room({
@@ -142,12 +144,17 @@
           regions: [region],
           height: wallHeight,
         })
+
         room.sides = region.sides
         region.id = Rooms.uid("room_")
         Rooms.list[ region.id ] = room
-        Rooms.builder.build(region)
+        var mx_walls = Rooms.builder.build_walls(region)
         room.mx_floor = Rooms.builder.make_floor(room, region)
         room.mx_ceiling = Rooms.builder.make_ceiling(room, region)
+
+        mx_walls.forEach(function(mx){ scene.add(mx) })
+        scene.add(room.mx_floor)
+        scene.add(room.mx_ceiling)
       })
 
       Rooms.grouper.build()