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

Fixing bonus collisions

Browse Source
This commit is contained in:
Zoe Roux
2021-06-17 14:37:34 +02:00
parent fcb1c91044
commit e9c3f8e083
5 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/Collision/CollisionSystem.cpp
+6 -6
View File
@@ -64,25 +64,25 @@ namespace BBM
continue;
auto pointB = posB.position + colB.positionOffset;
int collidedAxis = 0;
CollisionComponent::CollidedAxis collidedAxis = CollisionComponent::NONE;
// TODO if B is also a movable we don't check with it's changing position
Vector3f minB = Vector3f::min(pointB, pointB + colB.bound);
Vector3f maxB = Vector3f::max(pointB, pointB + colB.bound);
if (boxesCollide(minAx, maxAx, minB, maxB)) {
collidedAxis += vel.isNull() ? 7 : CollisionComponent::CollidedAxis::X;
collidedAxis |= vel.isNull() ? CollisionComponent::ALL : CollisionComponent::X;
}
if (!vel.isNull()) {
if (boxesCollide(minAy, maxAy, minB, maxB)) {
collidedAxis += CollisionComponent::CollidedAxis::Y;
collidedAxis |= CollisionComponent::Y;
}
if (boxesCollide(minAz, maxAz, minB, maxB)) {
collidedAxis += CollisionComponent::CollidedAxis::Z;
collidedAxis |= CollisionComponent::Z;
}
}
if (collidedAxis) {
colA.onCollide(entity, other, static_cast<CollisionComponent::CollidedAxis>(collidedAxis));
colB.onCollided(entity, other, static_cast<CollisionComponent::CollidedAxis>(collidedAxis));
colA.onCollide(entity, other, collidedAxis);
colB.onCollided(entity, other, collidedAxis);
}
}
}