diff --git a/python/src/gz/sim/EntityComponentManager.cc b/python/src/gz/sim/EntityComponentManager.cc index 506c837957..db73a792d3 100644 --- a/python/src/gz/sim/EntityComponentManager.cc +++ b/python/src/gz/sim/EntityComponentManager.cc @@ -24,7 +24,7 @@ namespace sim namespace python { ///////////////////////////////////////////////// -void defineGazeboEntityComponentManager(pybind11::object module) +void defineSimEntityComponentManager(pybind11::object module) { pybind11::class_( module, "EntityComponentManager") diff --git a/python/src/gz/sim/EntityComponentManager.hh b/python/src/gz/sim/EntityComponentManager.hh index 1c111ecfce..6e288e3930 100644 --- a/python/src/gz/sim/EntityComponentManager.hh +++ b/python/src/gz/sim/EntityComponentManager.hh @@ -32,7 +32,7 @@ namespace python * \param[in] module a pybind11 module to add the definition to */ void -defineGazeboEntityComponentManager(pybind11::object module); +defineSimEntityComponentManager(pybind11::object module); } // namespace python } // namespace sim } // namespace gz diff --git a/python/src/gz/sim/EventManager.cc b/python/src/gz/sim/EventManager.cc index 3203893839..9db0d28312 100644 --- a/python/src/gz/sim/EventManager.cc +++ b/python/src/gz/sim/EventManager.cc @@ -27,7 +27,7 @@ namespace sim namespace python { ///////////////////////////////////////////////// -void defineGazeboEventManager(pybind11::object module) +void defineSimEventManager(pybind11::object module) { pybind11::class_(module, "EventManager") .def(pybind11::init<>()); diff --git a/python/src/gz/sim/EventManager.hh b/python/src/gz/sim/EventManager.hh index fcc76b30a0..b03fca88db 100644 --- a/python/src/gz/sim/EventManager.hh +++ b/python/src/gz/sim/EventManager.hh @@ -31,7 +31,7 @@ namespace python * \param[in] module a pybind11 module to add the definition to */ void -defineGazeboEventManager(pybind11::object module); +defineSimEventManager(pybind11::object module); } // namespace python } // namespace sim } // namespace gz diff --git a/python/src/gz/sim/TestFixture.cc b/python/src/gz/sim/TestFixture.cc index 4bcd54d45f..991f1f6b14 100644 --- a/python/src/gz/sim/TestFixture.cc +++ b/python/src/gz/sim/TestFixture.cc @@ -30,7 +30,7 @@ namespace sim namespace python { void -defineGazeboTestFixture(pybind11::object module) +defineSimTestFixture(pybind11::object module) { pybind11::class_> testFixture(module, "TestFixture"); diff --git a/python/src/gz/sim/TestFixture.hh b/python/src/gz/sim/TestFixture.hh index c4d012293b..cf61488dc9 100644 --- a/python/src/gz/sim/TestFixture.hh +++ b/python/src/gz/sim/TestFixture.hh @@ -30,7 +30,7 @@ namespace python * \param[in] module a pybind11 module to add the definition to */ void -defineGazeboTestFixture(pybind11::object module); +defineSimTestFixture(pybind11::object module); } } } diff --git a/python/src/gz/sim/UpdateInfo.cc b/python/src/gz/sim/UpdateInfo.cc index 11462a6111..40a6ef359c 100644 --- a/python/src/gz/sim/UpdateInfo.cc +++ b/python/src/gz/sim/UpdateInfo.cc @@ -28,7 +28,7 @@ namespace sim { namespace python { -void defineGazeboUpdateInfo(pybind11::object module) +void defineSimUpdateInfo(pybind11::object module) { pybind11::class_(module, "UpdateInfo") .def(pybind11::init<>()) diff --git a/python/src/gz/sim/UpdateInfo.hh b/python/src/gz/sim/UpdateInfo.hh index 6673ed1101..bd9a5dab9d 100644 --- a/python/src/gz/sim/UpdateInfo.hh +++ b/python/src/gz/sim/UpdateInfo.hh @@ -31,7 +31,7 @@ namespace python * \param[in] module a pybind11 module to add the definition to */ void -defineGazeboUpdateInfo(pybind11::object module); +defineSimUpdateInfo(pybind11::object module); } // namespace python } // namespace sim } // namespace gz diff --git a/python/src/gz/sim/Util.cc b/python/src/gz/sim/Util.cc index a502f8b40b..005e5d6f3e 100644 --- a/python/src/gz/sim/Util.cc +++ b/python/src/gz/sim/Util.cc @@ -29,7 +29,7 @@ namespace sim { namespace python { -void defineGazeboUtil(pybind11::module &_module) +void defineSimUtil(pybind11::module &_module) { _module.def("world_entity", pybind11::overload_cast( diff --git a/python/src/gz/sim/Util.hh b/python/src/gz/sim/Util.hh index 519db28ed4..cc7c2df715 100644 --- a/python/src/gz/sim/Util.hh +++ b/python/src/gz/sim/Util.hh @@ -29,7 +29,7 @@ namespace python { /// Define a pybind11 wrapper for a gz::sim::Util /// \param[in] _module a pybind11 module to add the definition to -void defineGazeboUtil(pybind11::module &_module); +void defineSimUtil(pybind11::module &_module); } // namespace python } // namespace sim } // namespace gz diff --git a/python/src/gz/sim/World.cc b/python/src/gz/sim/World.cc index c2cb5c7a9d..d21187bdf0 100644 --- a/python/src/gz/sim/World.cc +++ b/python/src/gz/sim/World.cc @@ -28,7 +28,7 @@ namespace sim { namespace python { -void defineGazeboWorld(pybind11::object module) +void defineSimWorld(pybind11::object module) { pybind11::class_(module, "World") .def(pybind11::init()) diff --git a/python/src/gz/sim/World.hh b/python/src/gz/sim/World.hh index 4261f059b1..6a3fde2c70 100644 --- a/python/src/gz/sim/World.hh +++ b/python/src/gz/sim/World.hh @@ -32,7 +32,7 @@ namespace python * \param[in] module a pybind11 module to add the definition to */ void -defineGazeboWorld(pybind11::object module); +defineSimWorld(pybind11::object module); } // namespace python } // namespace sim } // namespace gz diff --git a/python/src/gz/sim/_gz_sim_pybind11.cc b/python/src/gz/sim/_gz_sim_pybind11.cc index edfc67112f..c6fec8c7bc 100644 --- a/python/src/gz/sim/_gz_sim_pybind11.cc +++ b/python/src/gz/sim/_gz_sim_pybind11.cc @@ -25,15 +25,28 @@ #include "Util.hh" #include "World.hh" -PYBIND11_MODULE(gazebo, m) { - m.doc() = "Gazebo Python Library."; +PYBIND11_MODULE(sim, m) { + m.doc() = "Gazebo Sim Python Library."; - gz::sim::python::defineGazeboEntityComponentManager(m); - gz::sim::python::defineGazeboEventManager(m); + gz::sim::python::defineSimEntityComponentManager(m); + gz::sim::python::defineSimEventManager(m); gz::sim::python::defineSimServer(m); gz::sim::python::defineSimServerConfig(m); - gz::sim::python::defineGazeboTestFixture(m); - gz::sim::python::defineGazeboUpdateInfo(m); - gz::sim::python::defineGazeboWorld(m); - gz::sim::python::defineGazeboUtil(m); + gz::sim::python::defineSimTestFixture(m); + gz::sim::python::defineSimUpdateInfo(m); + gz::sim::python::defineSimWorld(m); + gz::sim::python::defineSimUtil(m); +} + +PYBIND11_MODULE(gazebo, m) { // TODO(CH3): Deprecated. Remove on tock. + m.doc() = "Gazebo Sim Python Library."; + + gz::sim::python::defineSimEntityComponentManager(m); + gz::sim::python::defineSimEventManager(m); + gz::sim::python::defineSimServer(m); + gz::sim::python::defineSimServerConfig(m); + gz::sim::python::defineSimTestFixture(m); + gz::sim::python::defineSimUpdateInfo(m); + gz::sim::python::defineSimWorld(m); + gz::sim::python::defineSimUtil(m); }