From e6b89a12063b3fd06d04596cd508a44a68522ca2 Mon Sep 17 00:00:00 2001 From: blueloveTH Date: Sun, 1 Oct 2023 22:54:08 +0800 Subject: [PATCH] fix box2d --- .github/workflows/main.yml | 2 +- 3rd/box2d/include/{box2d_bindings.hpp => box2dw.hpp} | 6 +++--- 3rd/box2d/src/box2d_Body.cpp | 2 +- 3rd/box2d/src/box2d_DebugDraw.cpp | 2 +- 3rd/box2d/src/box2d_World.cpp | 2 +- amalgamate.py | 2 +- src/pocketpy.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename 3rd/box2d/include/{box2d_bindings.hpp => box2dw.hpp} (96%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea7095a6..27f8dd68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,7 @@ jobs: mkdir build cd build cmake .. - cmake --build . --config Release + cmake --build . --config Release -DPK_USE_BOX2D=ON cp main ../output/linux/x86_64 cp libpocketpy.so ../output/linux/x86_64 cp main ../ diff --git a/3rd/box2d/include/box2d_bindings.hpp b/3rd/box2d/include/box2dw.hpp similarity index 96% rename from 3rd/box2d/include/box2d_bindings.hpp rename to 3rd/box2d/include/box2dw.hpp index 37f7e3cf..d0c22e23 100644 --- a/3rd/box2d/include/box2d_bindings.hpp +++ b/3rd/box2d/include/box2dw.hpp @@ -79,9 +79,9 @@ struct PyBody{ } } - PyBody& _() { return *this; } - b2Body& _b2Body() { return *body; } - b2Fixture& _b2Fixture() { return *fixture; } + PyBody* _() { return this; } + b2Body* _b2Body() { return body; } + b2Fixture* _b2Fixture() { return fixture; } static void _register(VM* vm, PyObject* mod, PyObject* type); diff --git a/3rd/box2d/src/box2d_Body.cpp b/3rd/box2d/src/box2d_Body.cpp index 782c1aee..d724ff35 100644 --- a/3rd/box2d/src/box2d_Body.cpp +++ b/3rd/box2d/src/box2d_Body.cpp @@ -1,4 +1,4 @@ -#include "box2d_bindings.hpp" +#include "box2dw.hpp" namespace pkpy{ diff --git a/3rd/box2d/src/box2d_DebugDraw.cpp b/3rd/box2d/src/box2d_DebugDraw.cpp index c403782a..dd85e327 100644 --- a/3rd/box2d/src/box2d_DebugDraw.cpp +++ b/3rd/box2d/src/box2d_DebugDraw.cpp @@ -1,4 +1,4 @@ -#include "box2d_bindings.hpp" +#include "box2dw.hpp" namespace pkpy{ diff --git a/3rd/box2d/src/box2d_World.cpp b/3rd/box2d/src/box2d_World.cpp index 06593420..4ef06a3d 100644 --- a/3rd/box2d/src/box2d_World.cpp +++ b/3rd/box2d/src/box2d_World.cpp @@ -1,4 +1,4 @@ -#include "box2d_bindings.hpp" +#include "box2dw.hpp" namespace pkpy{ diff --git a/amalgamate.py b/amalgamate.py index 9840efad..91d0ea27 100644 --- a/amalgamate.py +++ b/amalgamate.py @@ -34,7 +34,7 @@ def remove_copied_include(text): key = m.group(1) if key.startswith("pocketpy/"): key = key[9:] - if key in ["user_config.h", "box2d_bindings.hpp"]: + if key in ["user_config.h", "box2dw.hpp"]: return m.group(0) if key == "opcodes.h": return OPCODES_TEXT diff --git a/src/pocketpy.cpp b/src/pocketpy.cpp index ff1b1332..5c943198 100644 --- a/src/pocketpy.cpp +++ b/src/pocketpy.cpp @@ -1,7 +1,7 @@ #include "pocketpy/pocketpy.h" #ifdef PK_USE_BOX2D -#include "box2d_bindings.hpp" +#include "box2dw.hpp" #endif namespace pkpy{