Fix Python bindings

Signed-off-by: methylDragon <[email protected]>

Author: methylDragon

python/CMakeLists.txt

@@ -62,7 +62,7 @@ function(configure_build_install_location _library_name)
 endfunction()
 
 # TODO(CH3): Deprecated. Remove on tock. Duplicating to reduce work...
-pybind11_add_module(gazebo SHARED
+pybind11_add_module(sim SHARED
   src/gz/sim/_gz_sim_pybind11.cc
   src/gz/sim/EntityComponentManager.cc
   src/gz/sim/EventManager.cc

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_<gz::sim::EntityComponentManager>(
       module, "EntityComponentManager")

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

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_<gz::sim::EventManager>(module, "EventManager")
   .def(pybind11::init<>());

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

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, std::shared_ptr<TestFixture>> testFixture(module, "TestFixture");
 

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);
 }
 }
 }

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_<gz::sim::UpdateInfo>(module, "UpdateInfo")
   .def(pybind11::init<>())

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

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<const EntityComponentManager &>(

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

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_<gz::sim::World>(module, "World")
   .def(pybind11::init<gz::sim::Entity>())

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

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);
 }