From 8f39b26b9d3591dfbd38ea1d5cf48d5fe4b1acf4 Mon Sep 17 00:00:00 2001
From: Ulysse Cura <ulysse.cura@gmail.com>
Date: Sun, 8 Sep 2024 14:05:19 +0200
Subject: [PATCH] Undo hitbox gestion

---
 .gitignore           | 34 ++--------------------------------
 ECS/PlayerSystem.hpp | 21 ---------------------
 2 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index e257658..2f0cc37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,4 @@
 # ---> C++
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
 
+# Executable
+2D_Engine
\ No newline at end of file
diff --git a/ECS/PlayerSystem.hpp b/ECS/PlayerSystem.hpp
index d90b905..f3f679d 100644
--- a/ECS/PlayerSystem.hpp
+++ b/ECS/PlayerSystem.hpp
@@ -161,8 +161,6 @@ class PlayerSystem : public Component {
                             if(i == 0) m_transform->velocity.x = 0;
                             if(i == 1) m_transform->velocity.y = 0;
 
-                            m_resolveCollisions(entityHitboxR);
-
                             break;
                         }
                     }
@@ -246,25 +244,6 @@ class PlayerSystem : public Component {
         }
     }
 
-    void m_resolveCollisions(SDL_Rect &entityHitboxR)
-    {
-        SDL_Rect intersectR;
-
-        if (SDL_IntersectRect(&m_hitbox->hitboxR, &entityHitboxR, &intersectR))
-        {
-            float overlapY = static_cast<float>(intersectR.h);
-
-            if(m_transform->position.y + m_transform->dimension.y * m_transform->scale < static_cast<float>(entityHitboxR.y))
-            {
-                m_transform->position.y -= overlapY;
-            }
-            else
-            {
-                m_transform->position.y += overlapY;
-            }
-        }
-    }
-
     bool m_isInRange(const SDL_Rect &entityR)
     {
         SDL_Rect intersectR {entityR};