Added collision with other sprites

1 files changed, 101 insertions, 29 deletions

@@ -54,50 +54,122 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
   vec2i oldTileDR = oldColDR / map.getTileSize();
   vec2i newTileDR = newColDR / map.getTileSize();
 
-  if (dirHasDir(sprite.dir, Direction::right) &&
-      newTileDR.x() > oldTileDR.x()) {
-    for (int y = newTileUL.y(); y <= newTileDR.y(); y++) {
-      if (map.isBlocked(newTileDR.x(), y)) {
-        result.horiz.blocked = true;
-        result.horiz.dir = Direction::right;
-
-        break;
+  if (dirHasDir(sprite.dir, Direction::right)) {
+    if (newTileDR.x() > oldTileDR.x()) {
+      for (int y = newTileUL.y(); y <= newTileDR.y(); y++) {
+        if (map.isBlocked(newTileDR.x(), y)) {
+          result.horiz.blocked = true;
+          result.horiz.dir = Direction::right;
+
+          break;
+        }
+      }
+    }
+
+    if (!result.horiz.blocked) {
+      auto it = rightCollidables_.lower_bound({oldColDR.x(), INT_MAX});
+      for (;
+           (it != std::end(rightCollidables_) &&
+            std::get<0>(it->first) <= newColDR.x());
+           it++) {
+        if (newColDR.y() >= it->second.lower &&
+            newColUL.y() <= it->second.upper) {
+          result.horiz.blocked = true;
+          result.horiz.dir = Direction::right;
+          result.horiz.colliderSprite = std::get<1>(it->first);
+
+          break;
+        }
       }
     }
   }
 
-  if (dirHasDir(sprite.dir, Direction::left) &&
-      newTileUL.x() < oldTileUL.x()) {
-    for (int y = newTileUL.y(); y <= newTileDR.y(); y++) {
-      if (map.isBlocked(newTileUL.x(), y)) {
-        result.horiz.blocked = true;
-        result.horiz.dir = Direction::left;
+  if (dirHasDir(sprite.dir, Direction::left)) {
+    if (newTileUL.x() < oldTileUL.x()) {
+      for (int y = newTileUL.y(); y <= newTileDR.y(); y++) {
+        if (map.isBlocked(newTileUL.x(), y)) {
+          result.horiz.blocked = true;
+          result.horiz.dir = Direction::left;
+
+          break;
+        }
+      }
+    }
 
-        break;
+    if (!result.horiz.blocked) {
+      auto it = leftCollidables_.lower_bound({oldColUL.x(), 0});
+      for (;
+           (it != std::end(leftCollidables_) &&
+            std::get<0>(it->first) >= newColUL.x());
+           it++) {
+        if (newColDR.y() >= it->second.lower &&
+            newColUL.y() <= it->second.upper) {
+          result.horiz.blocked = true;
+          result.horiz.dir = Direction::left;
+          result.horiz.colliderSprite = std::get<1>(it->first);
+
+          break;
+        }
       }
     }
   }
 
-  if (dirHasDir(sprite.dir, Direction::down) &&
-      newTileDR.y() > oldTileDR.y()) {
-    for (int x = newTileUL.x(); x <= newTileDR.x(); x++) {
-      if (map.isBlocked(x, newTileDR.y())) {
-        result.vert.blocked = true;
-        result.vert.dir = Direction::down;
+  if (dirHasDir(sprite.dir, Direction::down)) {
+    if (newTileDR.y() > oldTileDR.y()) {
+      for (int x = newTileUL.x(); x <= newTileDR.x(); x++) {
+        if (map.isBlocked(x, newTileDR.y())) {
+          result.vert.blocked = true;
+          result.vert.dir = Direction::down;
 
-        break;
+          break;
+        }
+      }
+    }
+
+    if (!result.vert.blocked) {
+      auto it = downCollidables_.lower_bound({oldColDR.y(), INT_MAX});
+      for (;
+           (it != std::end(downCollidables_) &&
+            std::get<0>(it->first) <= newColDR.y());
+           it++) {
+        if (newColDR.x() >= it->second.lower &&
+            newColUL.x() <= it->second.upper) {
+          result.vert.blocked = true;
+          result.vert.dir = Direction::down;
+          result.vert.colliderSprite = std::get<1>(it->first);
+
+          break;
+        }
       }
     }
   }
 
-  if (dirHasDir(sprite.dir, Direction::up) &&
-      newTileUL.y() < oldTileUL.y()) {
-    for (int x = newTileUL.x(); x <= newTileDR.x(); x++) {
-      if (map.isBlocked(x, newTileUL.y())) {
-        result.vert.blocked = true;
-        result.vert.dir = Direction::up;
+  if (dirHasDir(sprite.dir, Direction::up)) {
+    if (newTileUL.y() < oldTileUL.y()) {
+      for (int x = newTileUL.x(); x <= newTileDR.x(); x++) {
+        if (map.isBlocked(x, newTileUL.y())) {
+          result.vert.blocked = true;
+          result.vert.dir = Direction::up;
+
+          break;
+        }
+      }
+    }
 
-        break;
+    if (!result.vert.blocked) {
+      auto it = upCollidables_.lower_bound({oldColUL.y(), 0});
+      for (;
+           (it != std::end(upCollidables_) &&
+            std::get<0>(it->first) >= newColUL.y());
+           it++) {
+        if (newColDR.x() >= it->second.lower &&
+            newColUL.x() <= it->second.upper) {
+          result.vert.blocked = true;
+          result.vert.dir = Direction::up;
+          result.vert.colliderSprite = std::get<1>(it->first);
+
+          break;
+        }
       }
     }
   }