From a8d9543c29272dae76de1bc9c7fb4b2ae5855561 Mon Sep 17 00:00:00 2001
From: StratiX0 <jerome.hussenet@sfr.fr>
Date: Fri, 26 Apr 2024 13:20:35 +0200
Subject: [PATCH] refactor: detection collision

refactor:

+ Collision pour tout les objets, les objets differents d'une sphere seront traites comme des cubes
---
 enginecustom/imgui.ini   |  2 +-
 enginecustom/physics.cpp | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini
index 0385078..e960a3f 100644
--- a/enginecustom/imgui.ini
+++ b/enginecustom/imgui.ini
@@ -7,7 +7,7 @@ Pos=1139,42
 Size=392,214
 
 [Window][Objects]
-Pos=53,55
+Pos=20,556
 Size=637,299
 
 [Window][Terrain]
diff --git a/enginecustom/physics.cpp b/enginecustom/physics.cpp
index 36370b3..497deb2 100644
--- a/enginecustom/physics.cpp
+++ b/enginecustom/physics.cpp
@@ -83,14 +83,6 @@ bool Physics::IsColliding(Object* object1, Object* object2)
     std::string type1 = object1->GetName();
     std::string type2 = object2->GetName();
 
-    // Treat "plane" objects as "cube"
-    if (type1 == "plane") type1 = "cube";
-    if (type2 == "plane") type2 = "cube";
-
-    if (type1 == "cube" && type2 == "cube")
-    {
-        return CubesOverlap(object1, object2);
-    }
     if (type1 == "sphere" && type2 == "sphere")
     {
 		return SpheresOverlap(object1, object2);
@@ -106,6 +98,10 @@ bool Physics::IsColliding(Object* object1, Object* object2)
             return SphereCubeOverlap(object2, object1);
         }
     }
+    else
+    {
+        return CubesOverlap(object1, object2);
+    }
 
     return false;
 }