diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-30 18:00:09 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-30 18:00:09 -0400 |
| commit | 72270af02efb9609482ea50e918fe6d2ca7785a2 (patch) | |
| tree | 058880c7147b6e4927e2663082faa9a9b4638ba2 /public/assets/javascripts/rectangles/models/room.js | |
| parent | 1efe4601867053e297e91e70388b48e90b12b61f (diff) | |
| parent | 75f6a29f57f6147c83c8fb60bc5d36d8c6268f72 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/models/room.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/room.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index b0344a1..26bf055 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -122,7 +122,8 @@ return collision } - Room.prototype.collidesDisc = function(x,y,radius){ + 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 @@ -152,9 +153,6 @@ if (contains_y) { collision |= wall_collision & LEFT_RIGHT } -// if (bitcount(wall_collision) > 1) { -// collision |= wall_collision -// } }) return collision } |