diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-12-12 15:05:33 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-12-12 15:05:33 +0100 |
| commit | 641e202607b0f694df6662532f0165022c0f8621 (patch) | |
| tree | 0701bbfe705a95b670c8dfcb5eaabf6007556831 /src/crepe/system/CollisionSystem.cpp | |
| parent | dd7d5cf6b01b8a6a4238b66c27861ee76522067e (diff) | |
| parent | 05a33d4793520fa84a93bc79882ef29d39cd08e5 (diff) | |
merge master
Diffstat (limited to 'src/crepe/system/CollisionSystem.cpp')
| -rw-r--r-- | src/crepe/system/CollisionSystem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp index 0483693..dc5270e 100644 --- a/src/crepe/system/CollisionSystem.cpp +++ b/src/crepe/system/CollisionSystem.cpp @@ -290,6 +290,10 @@ vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_co // Compute penetration depth float penetration_depth = circle_collider.radius - distance; +<<<<<<< HEAD +======= + +>>>>>>> 05a33d4793520fa84a93bc79882ef29d39cd08e5 // Compute the resolution vector vec2 resolution = collision_normal * penetration_depth; |