diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-08-27 12:47:05 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-08-27 12:47:05 -0400 |
| commit | 098a330fab261885a86c7ae9a5b2ed294987dc6b (patch) | |
| tree | f74d98f414dd8eff9e1c10497b39f2bf7e8c2469 /public/assets/javascripts/rectangles/engine/rooms/grouper.js | |
| parent | 36b90395b85d6859dd78af9eb71c3df343e24841 (diff) | |
fix tests
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/rooms/grouper.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/rooms/grouper.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js index cde9fbb..2ec1ee7 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js +++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js @@ -83,7 +83,10 @@ collection.sort( useX ? sort.compare_zx : sort.compare_xz ) collection.forEach(function(mx){ - if (last_mx && last_mx.rect.eq(mx.rect)) { + if (mx.culled) { + return + } + if (last_mx && mx && last_mx.rect.eq(mx.rect)) { // culls half-walls if (last_mx.rect.id == mx.rect.id) { last_mx.height += mx.height/2 @@ -91,9 +94,11 @@ last_mx.face.y.b += mx.height/2 } last_mx.side = side - mx.culled = true - mx.destroy() - scene.remove(mx) + if (! mx.culled) { + scene.remove(mx) + mx.destroy() + mx.culled = true + } return } widthVec = mx.rect[useX ? 'x' : 'y'].clone() |
