aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/system/CollisionSystem.cpp
diff options
context:
space:
mode:
authorJAROWMR <jarorutjes07@gmail.com>2024-12-01 22:44:23 +0100
committerJAROWMR <jarorutjes07@gmail.com>2024-12-01 22:44:23 +0100
commit34cc1fb027168768a1ddfdcac77cdd56d504154e (patch)
treecb2559da10b7b21ae2de3b93151b4a77fa1c7add /src/crepe/system/CollisionSystem.cpp
parent7566fa3d50093935315598aabcb0dc0a9e7cca57 (diff)
improved doxygen comments
Diffstat (limited to 'src/crepe/system/CollisionSystem.cpp')
-rw-r--r--src/crepe/system/CollisionSystem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 362378d..6a621fa 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -104,7 +104,7 @@ std::pair<vec2,CollisionSystem::Direction> CollisionSystem::collision_handler(Co
const BoxCollider & collider2 = std::get<std::reference_wrapper<BoxCollider>>(data2.collider);
vec2 collider_pos1 = current_position(collider1.offset, data1.transform, data1.rigidbody);
vec2 collider_pos2 = current_position(collider2.offset, data2.transform, data2.rigidbody);
- move_back = box_box_move_back(collider1,collider2,collider_pos1,collider_pos2);
+ move_back = box_box_resolution(collider1,collider2,collider_pos1,collider_pos2);
}
case CollisionInternalType::BOX_CIRCLE: {
@@ -133,7 +133,7 @@ std::pair<vec2,CollisionSystem::Direction> CollisionSystem::collision_handler(Co
return {move_back,move_back_direction};
}
-vec2 CollisionSystem::box_box_move_back(const BoxCollider& box_collider1,const BoxCollider& box_collider2,vec2 final_position1,vec2 final_position2)
+vec2 CollisionSystem::box_box_resolution(const BoxCollider& box_collider1,const BoxCollider& box_collider2,vec2 final_position1,vec2 final_position2)
{
vec2 resolution; // Default resolution vector
vec2 delta = final_position2 - final_position1;