fix box2d

.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 ../

3rd/box2d/include/box2d_bindings.hpp → 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);
 

3rd/box2d/src/box2d_Body.cpp

@@ -1,4 +1,4 @@
-#include "box2d_bindings.hpp"
+#include "box2dw.hpp"
 
 namespace pkpy{
 

3rd/box2d/src/box2d_DebugDraw.cpp

@@ -1,4 +1,4 @@
-#include "box2d_bindings.hpp"
+#include "box2dw.hpp"
 
 namespace pkpy{
 

3rd/box2d/src/box2d_World.cpp

@@ -1,4 +1,4 @@
-#include "box2d_bindings.hpp"
+#include "box2dw.hpp"
 
 namespace pkpy{
 

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

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{