diff --git a/3rd/box2d/include/box2d_bindings.hpp b/3rd/box2d/include/box2d_bindings.hpp index bf28697f..eb51424a 100644 --- a/3rd/box2d/include/box2d_bindings.hpp +++ b/3rd/box2d/include/box2d_bindings.hpp @@ -23,8 +23,6 @@ inline PyObject* py_var(VM* vm, b2Vec2 v){ return py_var(vm, Vec2(v.x, v.y)); } -namespace imbox2d{ - inline PyObject* get_body_object(b2Body* p){ auto userdata = p->GetUserData().pointer; return reinterpret_cast(userdata); @@ -111,7 +109,6 @@ struct PyBody{ static void _register(VM* vm, PyObject* mod, PyObject* type); // methods - b2Vec2 get_position() const { return body->GetPosition(); } void set_position(b2Vec2 v){ body->SetTransform(v, body->GetAngle()); } float get_rotation() const { return body->GetAngle(); } @@ -148,12 +145,10 @@ struct PyWorld { static void _register(VM* vm, PyObject* mod, PyObject* type); }; -} // namespace imbox2d - - inline void add_module_box2d(VM* vm){ PyObject* mod = vm->new_module("box2d"); - imbox2d::PyBody::register_class(vm, mod); - imbox2d::PyWorld::register_class(vm, mod); + PyBody::register_class(vm, mod); + PyWorld::register_class(vm, mod); } + } // namespace pkpy \ No newline at end of file diff --git a/3rd/box2d/src/box2d_Body.cpp b/3rd/box2d/src/box2d_Body.cpp index 56b38f70..3d8f731a 100644 --- a/3rd/box2d/src/box2d_Body.cpp +++ b/3rd/box2d/src/box2d_Body.cpp @@ -4,7 +4,6 @@ #include "pocketpy/bindings.h" namespace pkpy{ -namespace imbox2d{ void PyBody::_register(VM* vm, PyObject* mod, PyObject* type){ vm->bind(type, "__new__(cls, world: World, node: _NodeLike = None)", @@ -84,5 +83,4 @@ void PyBody::_register(VM* vm, PyObject* mod, PyObject* type){ }); } -} // namespace imbox2d } // namespace pkpy \ No newline at end of file diff --git a/3rd/box2d/src/box2d_World.cpp b/3rd/box2d/src/box2d_World.cpp index 312fd3b0..c9c757aa 100644 --- a/3rd/box2d/src/box2d_World.cpp +++ b/3rd/box2d/src/box2d_World.cpp @@ -3,7 +3,6 @@ #include "box2d_bindings.hpp" namespace pkpy{ -namespace imbox2d{ struct MyRayCastCallback: b2RayCastCallback{ PK_ALWAYS_PASS_BY_POINTER(MyRayCastCallback) @@ -128,6 +127,4 @@ void PyWorld::_register(VM* vm, PyObject* mod, PyObject* type){ return vm->None; }); } - -} // namespace imbox2d } // namespace pkpy \ No newline at end of file