zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-22 22:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

public onCollide and onCollided

Browse Source
This commit is contained in:
Bluub
2021-06-01 17:45:09 +02:00
parent 2bd387195f
commit d0205b68e6
4 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/Collision/CollisionSystem.cpp
+4 -4
View File
@@ -36,16 +36,16 @@ namespace BBM
for (auto &other : _wal.scene->getEntities()) {
if (&other == &entity)
continue;
if (!other.hasComponent(typeid(CollisionComponent)) ||
!other.hasComponent(typeid(PositionComponent)))
if (!other.hasComponent<CollisionComponent>() ||
!other.hasComponent<PositionComponent>())
continue;
auto colB = other.getComponent<CollisionComponent>();
auto posB = other.getComponent<PositionComponent>().position;
Vector3f minB = Vector3f::min(posB, posB + colB.bound);
Vector3f maxB = Vector3f::max(posB, posB + colB.bound);
if (collide(minA, maxA, minB, maxB)) {
col.getOnCollide()(entity, other);
colB.getOnCollided()(entity, other);
col.onCollide(entity, other);
colB.onCollided(entity, other);
}
}
}