--remove superfluous RIgidBaseManager

facebookresearch · Dec 19, 2024 · c7e46f6 · c7e46f6
1 parent 338fb2f
commit c7e46f6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 62 deletions.
diff --git a/src/esp/CMakeLists.txt b/src/esp/CMakeLists.txt
@@ -393,7 +393,6 @@ set(
   physics/objectManagers/ArticulatedObjectManager.cpp
   physics/objectManagers/ArticulatedObjectManager.h
   physics/objectManagers/PhysicsObjectBaseManager.h
-  physics/objectManagers/RigidBaseManager.h
   physics/objectManagers/RigidObjectManager.cpp
   physics/objectManagers/RigidObjectManager.h
   physics/objectWrappers/ManagedArticulatedObject.h

diff --git a/src/esp/bindings/PhysicsWrapperManagerBindings.cpp b/src/esp/bindings/PhysicsWrapperManagerBindings.cpp
@@ -8,7 +8,6 @@
 #include "esp/physics/bullet/objectWrappers/ManagedBulletRigidObject.h"
 #include "esp/physics/objectManagers/ArticulatedObjectManager.h"
 #include "esp/physics/objectManagers/PhysicsObjectBaseManager.h"
-#include "esp/physics/objectManagers/RigidBaseManager.h"
 #include "esp/physics/objectManagers/RigidObjectManager.h"
 #include "esp/physics/objectWrappers/ManagedRigidObject.h"
 
@@ -21,7 +20,6 @@ using PhysWraps::ManagedBulletArticulatedObject;
 using PhysWraps::ManagedBulletRigidObject;
 using PhysWraps::ManagedRigidObject;
 using PhysWraps::PhysicsObjectBaseManager;
-using PhysWraps::RigidBaseManager;
 using PhysWraps::RigidObjectManager;
 
 namespace esp {
@@ -189,37 +187,19 @@ void declareBaseWrapperManager(py::module& m,
            "search_str"_a = "", "contains"_a = true);
 }  // declareBaseWrapperManager
 
-template <typename T>
-void declareRigidBaseWrapperManager(py::module& m,
-                                    CORRADE_UNUSED const std::string& objType,
-                                    const std::string& classStrPrefix) {
-  using MgrClass = RigidBaseManager<T>;
-  std::string pyclass_name =
-      classStrPrefix + std::string("_RigidBaseWrapperManager");
-
-  py::class_<MgrClass, PhysicsObjectBaseManager<T>, std::shared_ptr<MgrClass>>(
-      m, pyclass_name.c_str());
-
-}  //
-
 void initPhysicsWrapperManagerBindings(pybind11::module& m) {
 #ifdef ESP_BUILD_WITH_BULLET
   declareBaseWrapperManager<ManagedRigidObject, ManagedBulletRigidObject>(
       m, "BulletRigidObject", "BulletRigidObject");
 
-  declareRigidBaseWrapperManager<ManagedRigidObject>(m, "BulletRigidObject",
-                                                     "BulletRigidObject");
-
 #else
   // if dynamics library not being used, just use base rigid object
   declareBaseWrapperManager<ManagedRigidObject, ManagedRigidObject>(
       m, "RigidObject", "RigidObject");
 
-  declareRigidBaseWrapperManager<ManagedRigidObject>(m, "RigidObject",
-                                                     "RigidObject");
 #endif
   // RigidObject wrapper manager
-  py::class_<RigidObjectManager, RigidBaseManager<ManagedRigidObject>,
+  py::class_<RigidObjectManager, PhysicsObjectBaseManager<ManagedRigidObject>,
              std::shared_ptr<RigidObjectManager>>(m, "RigidObjectManager")
       .def(
           "add_object_by_template_id",

diff --git a/src/esp/physics/objectManagers/RigidBaseManager.h b/src/esp/physics/objectManagers/RigidBaseManager.h
diff --git a/src/esp/physics/objectManagers/RigidObjectManager.cpp b/src/esp/physics/objectManagers/RigidObjectManager.cpp
@@ -7,8 +7,8 @@ namespace esp {
 namespace physics {
 
 RigidObjectManager::RigidObjectManager()
-    : esp::physics::RigidBaseManager<ManagedRigidObject>::RigidBaseManager(
-          "RigidObject") {
+    : esp::physics::PhysicsObjectBaseManager<
+          ManagedRigidObject>::PhysicsObjectBaseManager("RigidObject") {
   // build this manager's copy constructor map, keyed by the type name of the
   // wrappers it will manage
   this->copyConstructorMap_["ManagedRigidObject"] =

diff --git a/src/esp/physics/objectManagers/RigidObjectManager.h b/src/esp/physics/objectManagers/RigidObjectManager.h
@@ -5,7 +5,7 @@
 #ifndef ESP_PHYSICS_RIGIDOBJECTMANAGER_H
 #define ESP_PHYSICS_RIGIDOBJECTMANAGER_H
 
-#include "RigidBaseManager.h"
+#include "PhysicsObjectBaseManager.h"
 #include "esp/physics/bullet/objectWrappers/ManagedBulletRigidObject.h"
 #include "esp/physics/objectWrappers/ManagedRigidObject.h"
 namespace esp {
@@ -16,7 +16,7 @@ namespace physics {
  * managing all @ref esp::physics::ManagedRigidObject wrappers.
  */
 class RigidObjectManager
-    : public esp::physics::RigidBaseManager<ManagedRigidObject> {
+    : public esp::physics::PhysicsObjectBaseManager<ManagedRigidObject> {
  public:
   RigidObjectManager();