diff options
Diffstat (limited to 'assets/javascripts/rectangles/engine/mover.js')
| -rw-r--r-- | assets/javascripts/rectangles/engine/mover.js | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/assets/javascripts/rectangles/engine/mover.js b/assets/javascripts/rectangles/engine/mover.js index 90cabdd..5a1f7d9 100644 --- a/assets/javascripts/rectangles/engine/mover.js +++ b/assets/javascripts/rectangles/engine/mover.js @@ -13,13 +13,32 @@ var mover = new function(){ } base.update = function(pos){ - if (base.room && base.room.rect.contains(pos.x, pos.z)) return; + cam.y = pos.y - var intersects = [] - clipper.rooms.forEach(function(r){ - if (r.rect.contains(pos.x, pos.z)) { - intersects.push(r) + // if we were in a room + if (base.room) { + // check if we're still in the room + if (base.room.rect.contains(pos.x, pos.z)) { + cam.x = pos.x + cam.z = pos.z + return } + // check if we've crossed one of the walls.. clamp position if so + var collision = base.room.collides(pos.x, pos.z) + if (collision) { + if (! (collision & LEFT || collision & RIGHT)) { + cam.x = pos.x + } + if (! (collision & FRONT || collision & BACK)) { + cam.z = pos.z + } + return + } + } + + // otherwise we've either entered into a new room, or broken free + var intersects = clipper.rooms.filter(function(r){ + return r.rect.contains(pos.x, pos.z) }) $(".face.active").removeClass("active") @@ -32,6 +51,9 @@ var mover = new function(){ else { base.room = null } + + cam.x = pos.x + cam.z = pos.z } } |