Fixed size_t error in Lua callbacks

supernovaengine · Dec 4, 2023 · 9c95083 · 9c95083
1 parent 000e0cd
commit 9c95083
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/engine/core/script/LuaFunctionBase.cpp b/engine/core/script/LuaFunctionBase.cpp
@@ -97,6 +97,10 @@ void LuaFunctionBase::push_value(lua_State *vm, long n){
     lua_pushnumber(vm, n); 
 }
 
+void LuaFunctionBase::push_value(lua_State *vm, unsigned long n){
+    lua_pushnumber(vm, n); 
+}
+
 void LuaFunctionBase::push_value(lua_State *vm, bool b){
     lua_pushboolean(vm, b);
 }
@@ -109,10 +113,6 @@ void LuaFunctionBase::push_value(lua_State *vm, wchar_t s){
     lua_pushstring(vm, StringUtils::toUTF8(s).c_str());
 }
 
-void LuaFunctionBase::push_value(lua_State *vm, size_t n){
-    lua_pushnumber(vm, n); 
-}
-
 void LuaFunctionBase::push_value(lua_State *vm, Vector3 o){
     if (!luabridge::push<Vector3>(vm, o))
         throw luabridge::makeErrorCode(luabridge::ErrorCode::LuaStackOverflow);

diff --git a/engine/core/script/LuaFunctionBase.h b/engine/core/script/LuaFunctionBase.h
@@ -42,10 +42,10 @@ namespace Supernova{
         void push_value(lua_State *vm, unsigned int n);
         void push_value(lua_State *vm, float n);
         void push_value(lua_State *vm, long n);
+        void push_value(lua_State *vm, unsigned long n);
         void push_value(lua_State *vm, bool b);
         void push_value(lua_State *vm, const std::string &s);
         void push_value(lua_State *vm, wchar_t s);
-        void push_value(lua_State *vm, size_t n);
         void push_value(lua_State *vm, Vector3 n);
         void push_value(lua_State *vm, Body2D o);
         void push_value(lua_State *vm, Contact2D o);

diff --git a/engine/core/script/binding/CoreClassesLua.cpp b/engine/core/script/binding/CoreClassesLua.cpp
@@ -233,10 +233,10 @@ void LuaBinding::registerCoreClasses(lua_State *L){
         .endClass();
 
     luabridge::getGlobalNamespace(L)
-        .beginClass<FunctionSubscribe<bool(Body2D, size_t, Body2D, size_t)>>("FunctionSubscribe_B_B2SB2S")
-        .addFunction("__call", &FunctionSubscribe<bool(Body2D, size_t, Body2D, size_t)>::call)
-        .addFunction("call", &FunctionSubscribe<bool(Body2D, size_t, Body2D, size_t)>::call)
-        .addFunction("add", (bool (FunctionSubscribe<bool(Body2D, size_t, Body2D, size_t)>::*)(const std::string&, lua_State*))&FunctionSubscribe<bool(Body2D, size_t, Body2D, size_t)>::add)
+        .beginClass<FunctionSubscribe<bool(Body2D, unsigned long, Body2D, unsigned long)>>("FunctionSubscribe_B_B2ULB2UL")
+        .addFunction("__call", &FunctionSubscribe<bool(Body2D, unsigned long, Body2D, unsigned long)>::call)
+        .addFunction("call", &FunctionSubscribe<bool(Body2D, unsigned long, Body2D, unsigned long)>::call)
+        .addFunction("add", (bool (FunctionSubscribe<bool(Body2D, unsigned long, Body2D, unsigned long)>::*)(const std::string&, lua_State*))&FunctionSubscribe<bool(Body2D, unsigned long, Body2D, unsigned long)>::add)
         .endClass();
 
     luabridge::getGlobalNamespace(L)

diff --git a/engine/core/subsystem/PhysicsSystem.h b/engine/core/subsystem/PhysicsSystem.h
@@ -77,7 +77,7 @@ namespace Supernova{
 		FunctionSubscribe<void(Contact2D, Manifold2D)> preSolve2D;
 		FunctionSubscribe<void(Contact2D, ContactImpulse2D)> postSolve2D;
 
-		FunctionSubscribe<bool(Body2D, size_t, Body2D, size_t)> shouldCollide2D;
+		FunctionSubscribe<bool(Body2D, unsigned long, Body2D, unsigned long)> shouldCollide2D;
 
 		FunctionSubscribe<void(Body3D)> onBodyActivated3D;
 		FunctionSubscribe<void(Body3D)> onBodyDeactivated3D;

diff --git a/engine/core/util/Box2DAux.h b/engine/core/util/Box2DAux.h
@@ -24,11 +24,11 @@ namespace Supernova{
         }
 
         bool ShouldCollide(b2Fixture* fixtureA, b2Fixture* fixtureB){
-            size_t shapeIndexA = fixtureA->GetUserData().pointer;
+            unsigned long shapeIndexA = fixtureA->GetUserData().pointer;
             Entity entityA = fixtureA->GetBody()->GetUserData().pointer;
             Body2D bodyA(scene, entityA);
 
-            size_t shapeIndexB = fixtureB->GetUserData().pointer;
+            unsigned long shapeIndexB = fixtureB->GetUserData().pointer;
             Entity entityB = fixtureB->GetBody()->GetUserData().pointer;
             Body2D bodyB(scene, entityB);