diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-12-12 15:06:17 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-12-12 15:06:17 +0100 |
| commit | 3de0a0f12d9d91e120f92975bda6f9915e5b8fcb (patch) | |
| tree | d3da29d03914f4a7a644d6fbd47ed513b1270eaf /src/crepe/system/CollisionSystem.cpp | |
| parent | 641e202607b0f694df6662532f0165022c0f8621 (diff) | |
| parent | a6350aa70a80e0fe1a6eade3b5eefd240b4942f2 (diff) | |
merge physics
Diffstat (limited to 'src/crepe/system/CollisionSystem.cpp')
| -rw-r--r-- | src/crepe/system/CollisionSystem.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp index dc5270e..0483693 100644 --- a/src/crepe/system/CollisionSystem.cpp +++ b/src/crepe/system/CollisionSystem.cpp @@ -290,10 +290,6 @@ 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; |