diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-08-26 13:36:53 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-08-26 13:36:53 -0400 |
| commit | 977429a9b945e6be0175b1672dd5802e49682c9b (patch) | |
| tree | 8d4dd38da2c993a52c9b8466c4468c06c047fe77 | |
| parent | a9bee350c2bb468c9abc46321b46f5c5dcbbe10d (diff) | |
mover working with new layouts
| -rw-r--r-- | public/assets/javascripts/rectangles/models/room.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index 0ef76e4..1abe2ba 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -31,7 +31,7 @@ var Room = function(opt){ this.id = opt.id || Rooms.uid("room_") this.rect = opt.rect - this.regions = [] + this.regions = opt.regions || [] this.height = opt.height || 200 this.focused = false @@ -129,6 +129,7 @@ Room.prototype.collidesDisc = function(src, dest, radius){ var x = dest.x, y = dest.z var collision = 0, wall_collision, contains_x, contains_y + this.regions.forEach(function(r){ if (! r.sides) return |