Update collisionable.h

Fixing case (Box2D 2.4 went all lowercase)
daid · Mar 19, 2023 · ceb5a69 · ceb5a69
1 parent a672a31
commit ceb5a69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/collisionable.cpp b/src/collisionable.cpp
@@ -39,7 +39,7 @@ class QueryCallback : public b2QueryCallback
 	/// @return false to terminate the query.
 	virtual bool ReportFixture(b2Fixture* fixture) override
 	{
-        P<Collisionable> ptr = (Collisionable*)fixture->GetBody()->GetUserData();
+        P<Collisionable> ptr = reinterpret_cast<Collisionable*>(fixture->GetBody()->GetUserData().pointer);
         if (ptr)
             list.push_back(ptr);
         return true;
@@ -84,8 +84,8 @@ void CollisionManager::handleCollisions(float delta)
     {
         if (contact->IsTouching() && contact->IsEnabled())
         {
-            Collisionable* A = (Collisionable*)contact->GetFixtureA()->GetBody()->GetUserData();
-            Collisionable* B = (Collisionable*)contact->GetFixtureB()->GetBody()->GetUserData();
+            Collisionable* A = reinterpret_cast<Collisionable*>(contact->GetFixtureA()->GetBody()->GetUserData().pointer);
+            Collisionable* B = reinterpret_cast<Collisionable*>(contact->GetFixtureB()->GetBody()->GetUserData().pointer);
             if (!A->isDestroyed() && !B->isDestroyed())
             {
                 float collision_force = 0.0f;
@@ -289,7 +289,7 @@ void Collisionable::createBody(b2Shape* shape)
     }else{
         b2BodyDef bodyDef;
         bodyDef.type = static_physics ? b2_kinematicBody : b2_dynamicBody;
-        bodyDef.userData = this;
+        bodyDef.userData.pointer = reinterpret_cast<uintptr_t>(this);
         bodyDef.allowSleep = false;
         bodyDef.position = v2b(this->position);
         bodyDef.angle = glm::radians(this->rotation);
@@ -409,8 +409,8 @@ std::vector<glm::vec2> Collisionable::getCollisionShape() const
     case b2Shape::e_polygon:
         {
             b2PolygonShape* cs = static_cast<b2PolygonShape*>(s);
-            for(int n=0; n<cs->GetVertexCount(); n++)
-                ret.push_back(b2v(cs->GetVertex(n)));
+            for(int n=0; n<cs->m_count; n++)
+                ret.push_back(b2v(cs->m_vertices[n]));
         }
         break;
     default:

diff --git a/src/collisionable.h b/src/collisionable.h
@@ -7,6 +7,8 @@ class b2World;
 class b2Body;
 class b2Shape;
 
+#include "box2d/box2d.h"
+
 class Collisionable;
 class CollisionManager
 {