diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-20 22:33:14 +0100 |
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-20 22:33:14 +0100 |
| commit | 48f69cedaf16038d980071d43d32e22caae44c17 (patch) | |
| tree | d52db1e10dc82eb02c7d22dbe3fa8648c457c2ce /src/crepe/system/CollisionSystem.cpp | |
| parent | 6808307cf65a4b686621f08a58effecc0a9c6bb8 (diff) | |
| parent | da379a58033c0ef3c9c854326a3fca25d6e54319 (diff) | |
merge `loek/scripts` into `loek/collision-system`
Diffstat (limited to 'src/crepe/system/CollisionSystem.cpp')
| -rw-r--r-- | src/crepe/system/CollisionSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp index 2132b0d..1a30e3f 100644 --- a/src/crepe/system/CollisionSystem.cpp +++ b/src/crepe/system/CollisionSystem.cpp @@ -220,8 +220,8 @@ std::vector<std::pair<CollisionSystem::CollidedInfoStor,CollisionSystem::Collide // Check collision if (check_box_box_collision(boxcolliders[i], boxcolliders[j], transform1, transform2, rigidbody1, rigidbody2)) { collisions_ret.emplace_back(std::make_pair( - CollidedInfoStor{boxcolliders[i], transform1, rigidbody1}, - CollidedInfoStor{boxcolliders[j], transform2, rigidbody2} + CollidedInfoStor{boxcolliders[i], transform1, rigidbody1}, + CollidedInfoStor{boxcolliders[j], transform2, rigidbody2} )); } } |