diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-12-07 15:43:00 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-12-07 15:43:00 +0100 |
| commit | fe8f985d2c7ea672a5f886d7d0df064f26bd2cb4 (patch) | |
| tree | c09952570ac3732dfd821ae00fe379330e513e7c /src/crepe/system/CollisionSystem.cpp | |
| parent | 478f5f6232c46e1a60c023bf5dcbe2a934f42d84 (diff) | |
improved physics for AI
Diffstat (limited to 'src/crepe/system/CollisionSystem.cpp')
| -rw-r--r-- | src/crepe/system/CollisionSystem.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp index 6b1954e..0483693 100644 --- a/src/crepe/system/CollisionSystem.cpp +++ b/src/crepe/system/CollisionSystem.cpp @@ -182,11 +182,7 @@ CollisionSystem::collision_handler(CollisionInternal & data1, CollisionInternal vec2 collider_pos2 = this->get_current_position(collider2.offset, data2.transform, data2.rigidbody); resolution = this->get_circle_box_resolution(collider1, collider2, collider_pos1, -<<<<<<< HEAD collider_pos2); -======= - collider_pos2, false); ->>>>>>> 33a072db28d71ba65e59f9491abd42dbf9695fc4 break; } } @@ -272,12 +268,7 @@ vec2 CollisionSystem::get_circle_circle_resolution(const CircleCollider & circle vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_collider, const BoxCollider & box_collider, const vec2 & circle_position, -<<<<<<< HEAD const vec2 & box_position) const { -======= - const vec2 & box_position, - bool inverse) const { ->>>>>>> 33a072db28d71ba65e59f9491abd42dbf9695fc4 vec2 delta = circle_position - box_position; // Compute half-dimensions of the box @@ -299,11 +290,6 @@ vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_co // Compute penetration depth float penetration_depth = circle_collider.radius - distance; -<<<<<<< HEAD - -======= - if (inverse) collision_normal = -collision_normal; ->>>>>>> 33a072db28d71ba65e59f9491abd42dbf9695fc4 // Compute the resolution vector vec2 resolution = collision_normal * penetration_depth; |