Make fixes to bring box2d up to date

Author: PatrickHoward

src/CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2-image REQUIRED)
-find_package(unofficial-box2d CONFIG REQUIRED)
+find_package(box2d CONFIG REQUIRED)
 find_package(slikenet CONFIG REQUIRED)
 find_package(Ogg REQUIRED)
 
@@ -189,7 +189,7 @@ target_link_libraries(Strife.Engine PUBLIC
     SDL2::SDL2
     SDL2::SDL2main
     SDL2::SDL2_image
-    unofficial::box2d::box2d
+    box2d::box2d
     OALWrapper
     SLikeNet
     Strife.ML

src/Components/RigidBodyComponent.cpp

@@ -76,7 +76,7 @@ b2Body* RigidBodyComponent::CreateBody(b2BodyDef& bodyDef, bool createAtCurrentP
     ScaleToBox2D(bodyDef.position);
     ScaleToBox2D(bodyDef.linearVelocity);
 
-    bodyDef.userData = this;
+    bodyDef.userData.pointer = (uintptr_t)this;
 
     body = GetScene()->GetWorld()->CreateBody(&bodyDef);
 

src/Physics/ColliderHandle.cpp

@@ -16,7 +16,7 @@ Entity* ColliderHandle::OwningEntity() const
 
 RigidBodyComponent* ColliderHandle::OwningRigidBody() const
 {
-    return reinterpret_cast<RigidBodyComponent*>(_fixture->GetBody()->GetUserData());
+    return reinterpret_cast<RigidBodyComponent*>(_fixture->GetBody()->GetUserData().pointer);
 }
 
 Rectangle ColliderHandle::Bounds() const

src/Physics/Physics.cpp

@@ -33,9 +33,10 @@ void CollisionManager::UpdateEntityPositions()
 {
     for (auto body = _world->GetBodyList(); body != nullptr; body = body->GetNext())
     {
-        auto data = body->GetUserData();
+        // TODO: This should use the new box2d userdata integration
+        auto data = body->GetUserData().pointer;
 
-        if (data != nullptr)
+        if ((void*)data != nullptr)
         {
             auto rigidBody = reinterpret_cast<RigidBodyComponent*>(data);
             auto entity = rigidBody->owner;