dcrubro/letnik3koncni-prap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit, fix boxcollider

Browse Source
This commit is contained in:
DcruBro
2026-04-15 07:52:14 +02:00
parent dc55af5323
commit ab3baf5cbb
4 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/object/components/boxcollider.cpp
View File

@@ -1,5 +1,8 @@
#include <object/components/boxcollider.hpp>
#include <object/entity.hpp>
#include <renderer/texture.hpp>
#include <algorithm>
namespace Game::Object::Components {
BoxCollider::BoxCollider(const BoxCollider& other) : Component(other) {
@@ -32,44 +35,68 @@ namespace Game::Object::Components {
void BoxCollider::update(float deltaTime, Object::Entity* thisEntity) {
// Collision detection and response logic can go here
(void)deltaTime;
if (!thisEntity) {
return;
}
// Make box bounds
Transform* transform = thisEntity->getTransform();
float halfWidth = transform->scaleX * UNIVERSAL_SCALE_COEFFICIENT * 0.5f;
float halfHeight = transform->scaleY * UNIVERSAL_SCALE_COEFFICIENT * 0.5f;
float left = transform->x - halfWidth;
float right = transform->x + halfWidth;
float top = transform->y - halfHeight;
float bottom = transform->y + halfHeight;
if (!transform) {
return;
}
float width = 1.f;
float height = 1.f;
if (const auto tex = thisEntity->getTexture()) {
width = tex->getWidth() * transform->scaleX * UNIVERSAL_SCALE_COEFFICIENT;
height = tex->getHeight() * transform->scaleY * UNIVERSAL_SCALE_COEFFICIENT;
} else {
width = transform->scaleX * UNIVERSAL_SCALE_COEFFICIENT;
height = transform->scaleY * UNIVERSAL_SCALE_COEFFICIENT;
}
width = std::max(1.f, width);
height = std::max(1.f, height);
// Transform position is used as top-left in rendering, so match that convention for collision bounds.
float left = transform->x;
float right = transform->x + width;
float top = transform->y;
float bottom = transform->y + height;
mBounds = {left, right, top, bottom};
// Check for collisions with other entities that have box colliders
// For simplicity, just check each
std::unordered_set<Entity*> currentCollisions;
std::vector<Entity*> entities = State::GameState::getInstance().getEntitiesSnapshot();
for (Entity* other : entities) {
if (other == thisEntity) continue; // Don't check collision with self
if (!other || other == thisEntity || !other->isActive()) continue; // Don't check collision with self/inactive entities
BoxCollider* otherCollider = other->getComponent<BoxCollider>();
if (!otherCollider) continue; // No collider, skip
if (!otherCollider || !otherCollider->isActive()) continue; // No active collider, skip
BoxColliderBounds otherBounds = otherCollider->getBounds();
if (left < otherBounds.right && right > otherBounds.left && top < otherBounds.bottom && bottom > otherBounds.top) {
bool isOverlapping = left < otherBounds.right && right > otherBounds.left && top < otherBounds.bottom && bottom > otherBounds.top;
if (isOverlapping) {
currentCollisions.insert(other);
// Collision detected
if (!mIsColliding) {
mIsColliding = true;
if (!mCollidingWith.contains(other)) {
thisEntity->onCollisionEnter(other);
other->onCollisionEnter(thisEntity);
//other->onCollisionEnter(thisEntity);
} else {
thisEntity->onCollisionStay(other);
other->onCollisionStay(thisEntity);
}
} else {
// No collision
if (mIsColliding) {
mIsColliding = false;
thisEntity->onCollisionExit(other);
other->onCollisionExit(thisEntity);
//other->onCollisionStay(thisEntity);
}
}
}
for (Entity* wasColliding : mCollidingWith) {
if (!currentCollisions.contains(wasColliding)) {
thisEntity->onCollisionExit(wasColliding);
//wasColliding->onCollisionExit(thisEntity);
}
}
mCollidingWith = std::move(currentCollisions);
}
}