Leverage forward declarations to improve compile times (#990)

.github/workflows/windows.yml

@@ -35,6 +35,7 @@ jobs:
         token: ${{ github.token }}
         cache-key: ci-${{ matrix.os }}
         github-binarycache: true
+        revision: 2024.01.12
     - name: configure-msvc
       uses: ilammy/msvc-dev-cmd@v1
       with:

tesseract_collision/bullet/include/tesseract_collision/bullet/bullet_factories.h

@@ -52,25 +52,29 @@ namespace tesseract_collision::tesseract_collision_bullet
 class BulletDiscreteBVHManagerFactory : public DiscreteContactManagerFactory
 {
 public:
-  DiscreteContactManager::UPtr create(const std::string& name, const YAML::Node& config) const override final;
+  std::unique_ptr<DiscreteContactManager> create(const std::string& name,
+                                                 const YAML::Node& config) const override final;
 };
 
 class BulletDiscreteSimpleManagerFactory : public DiscreteContactManagerFactory
 {
 public:
-  DiscreteContactManager::UPtr create(const std::string& name, const YAML::Node& config) const override final;
+  std::unique_ptr<DiscreteContactManager> create(const std::string& name,
+                                                 const YAML::Node& config) const override final;
 };
 
 class BulletCastBVHManagerFactory : public ContinuousContactManagerFactory
 {
 public:
-  ContinuousContactManager::UPtr create(const std::string& name, const YAML::Node& config) const override final;
+  std::unique_ptr<ContinuousContactManager> create(const std::string& name,
+                                                   const YAML::Node& config) const override final;
 };
 
 class BulletCastSimpleManagerFactory : public ContinuousContactManagerFactory
 {
 public:
-  ContinuousContactManager::UPtr create(const std::string& name, const YAML::Node& config) const override final;
+  std::unique_ptr<ContinuousContactManager> create(const std::string& name,
+                                                   const YAML::Node& config) const override final;
 };
 
 TESSERACT_PLUGIN_ANCHOR_DECL(BulletFactoriesAnchor)

tesseract_collision/bullet/src/bullet_factories.cpp

@@ -36,6 +36,9 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 #include <tesseract_collision/bullet/bullet_discrete_simple_manager.h>
 #include <tesseract_collision/bullet/tesseract_collision_configuration.h>
 
+#include <tesseract_collision/core/discrete_contact_manager.h>
+#include <tesseract_collision/core/continuous_contact_manager.h>
+
 namespace tesseract_collision::tesseract_collision_bullet
 {
 TesseractCollisionConfigurationInfo getConfigInfo(const YAML::Node& config)
@@ -59,26 +62,26 @@ TesseractCollisionConfigurationInfo getConfigInfo(const YAML::Node& config)
   return config_info;
 }
 
-DiscreteContactManager::UPtr BulletDiscreteBVHManagerFactory::create(const std::string& name,
-                                                                     const YAML::Node& config) const
+std::unique_ptr<tesseract_collision::DiscreteContactManager>
+BulletDiscreteBVHManagerFactory::create(const std::string& name, const YAML::Node& config) const
 {
   return std::make_unique<BulletDiscreteBVHManager>(name, getConfigInfo(config));
 }
 
-DiscreteContactManager::UPtr BulletDiscreteSimpleManagerFactory::create(const std::string& name,
-                                                                        const YAML::Node& config) const
+std::unique_ptr<DiscreteContactManager> BulletDiscreteSimpleManagerFactory::create(const std::string& name,
+                                                                                   const YAML::Node& config) const
 {
   return std::make_unique<BulletDiscreteSimpleManager>(name, getConfigInfo(config));
 }
 
-ContinuousContactManager::UPtr BulletCastBVHManagerFactory::create(const std::string& name,
-                                                                   const YAML::Node& config) const
+std::unique_ptr<ContinuousContactManager> BulletCastBVHManagerFactory::create(const std::string& name,
+                                                                              const YAML::Node& config) const
 {
   return std::make_unique<BulletCastBVHManager>(name, getConfigInfo(config));
 }
 
-ContinuousContactManager::UPtr BulletCastSimpleManagerFactory::create(const std::string& name,
-                                                                      const YAML::Node& config) const
+std::unique_ptr<ContinuousContactManager> BulletCastSimpleManagerFactory::create(const std::string& name,
+                                                                                 const YAML::Node& config) const
 {
   return std::make_unique<BulletCastSimpleManager>(name, getConfigInfo(config));
 }

tesseract_collision/bullet/src/bullet_utils.cpp

@@ -221,7 +221,7 @@ std::shared_ptr<btCollisionShape> createShapePrimitive(const tesseract_geometry:
   managed_shapes.resize(octree.getTreeDepth() + 1);
   switch (geom->getSubType())
   {
-    case tesseract_geometry::Octree::SubType::BOX:
+    case tesseract_geometry::OctreeSubType::BOX:
     {
       for (auto it = octree.begin(static_cast<unsigned char>(octree.getTreeDepth())), end = octree.end(); it != end;
            ++it)
@@ -257,7 +257,7 @@ std::shared_ptr<btCollisionShape> createShapePrimitive(const tesseract_geometry:
 
       return subshape;
     }
-    case tesseract_geometry::Octree::SubType::SPHERE_INSIDE:
+    case tesseract_geometry::OctreeSubType::SPHERE_INSIDE:
     {
       for (auto it = octree.begin(static_cast<unsigned char>(octree.getTreeDepth())), end = octree.end(); it != end;
            ++it)
@@ -292,7 +292,7 @@ std::shared_ptr<btCollisionShape> createShapePrimitive(const tesseract_geometry:
 
       return subshape;
     }
-    case tesseract_geometry::Octree::SubType::SPHERE_OUTSIDE:
+    case tesseract_geometry::OctreeSubType::SPHERE_OUTSIDE:
     {
       for (auto it = octree.begin(static_cast<unsigned char>(octree.getTreeDepth())), end = octree.end(); it != end;
            ++it)

tesseract_collision/core/include/tesseract_collision/core/contact_managers_plugin_factory.h

@@ -31,13 +31,11 @@ TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
 #include <string>
 #include <memory>
 #include <map>
-#include <yaml-cpp/yaml.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
-#include <tesseract_collision/core/discrete_contact_manager.h>
-#include <tesseract_collision/core/continuous_contact_manager.h>
+#include <tesseract_common/filesystem.h>
 #include <tesseract_common/plugin_loader.h>
-#include <tesseract_common/types.h>
+#include <tesseract_common/plugin_info.h>
 
 // clang-format off
 #define TESSERACT_ADD_DISCRETE_MANAGER_PLUGIN(DERIVED_CLASS, ALIAS)                                                    \
@@ -51,6 +49,8 @@ namespace tesseract_collision
 {
 /** @brief Forward declare Plugin Factory */
 class ContactManagersPluginFactory;
+class DiscreteContactManager;
+class ContinuousContactManager;
 
 /** @brief Define a discrete contact manager plugin which the factory can create an instance */
 class DiscreteContactManagerFactory
@@ -66,7 +66,7 @@ class DiscreteContactManagerFactory
    * @param name The name of the contact manager object
    * @return If failed to create, nullptr is returned.
    */
-  virtual DiscreteContactManager::UPtr create(const std::string& name, const YAML::Node& config) const = 0;
+  virtual std::unique_ptr<DiscreteContactManager> create(const std::string& name, const YAML::Node& config) const = 0;
 
 protected:
   static const std::string SECTION_NAME;
@@ -87,7 +87,8 @@ class ContinuousContactManagerFactory
    * @param name The name of the contact manager object
    * @return If failed to create, nullptr is returned.
    */
-  virtual ContinuousContactManager::UPtr create(const std::string& solver_name, const YAML::Node& config) const = 0;
+  virtual std::unique_ptr<ContinuousContactManager> create(const std::string& solver_name,
+                                                           const YAML::Node& config) const = 0;
 
 protected:
   static const std::string SECTION_NAME;
@@ -237,30 +238,30 @@ class ContactManagersPluginFactory
    * @details This looks for discrete contact manager plugin info. If not found nullptr is returned.
    * @param name The name
    */
-  DiscreteContactManager::UPtr createDiscreteContactManager(const std::string& name) const;
+  std::unique_ptr<DiscreteContactManager> createDiscreteContactManager(const std::string& name) const;
 
   /**
    * @brief Get discrete contact manager object given plugin info
    * @param name The name
    * @param plugin_info The plugin information to create kinematics object
    */
-  DiscreteContactManager::UPtr createDiscreteContactManager(const std::string& name,
-                                                            const tesseract_common::PluginInfo& plugin_info) const;
+  std::unique_ptr<DiscreteContactManager>
+  createDiscreteContactManager(const std::string& name, const tesseract_common::PluginInfo& plugin_info) const;
 
   /**
    * @brief Get continuous contact manager object given name
    * @details This looks for continuous contact manager plugin info. If not found nullptr is returned.
    * @param name The name
    */
-  ContinuousContactManager::UPtr createContinuousContactManager(const std::string& name) const;
+  std::unique_ptr<ContinuousContactManager> createContinuousContactManager(const std::string& name) const;
 
   /**
    * @brief Get continuous contact manager object given plugin info
    * @param name The name
    * @param plugin_info The plugin information to create kinematics object
    */
-  ContinuousContactManager::UPtr createContinuousContactManager(const std::string& name,
-                                                                const tesseract_common::PluginInfo& plugin_info) const;
+  std::unique_ptr<ContinuousContactManager>
+  createContinuousContactManager(const std::string& name, const tesseract_common::PluginInfo& plugin_info) const;
 
   /**
    * @brief Save the plugin information to a yaml config file

tesseract_collision/core/include/tesseract_collision/core/convex_decomposition.h

@@ -26,10 +26,9 @@
 #ifndef TESSERACT_COLLISION_CONVEX_DECOMPOSITION_H
 #define TESSERACT_COLLISION_CONVEX_DECOMPOSITION_H
 
-#include <vector>
 #include <memory>
-#include <tesseract_common/types.h>
-#include <tesseract_geometry/impl/convex_mesh.h>
+#include <tesseract_common/eigen_types.h>
+#include <tesseract_geometry/fwd.h>
 
 namespace tesseract_collision
 {
@@ -53,8 +52,8 @@ class ConvexDecomposition
    * index
    * @return
    */
-  virtual std::vector<tesseract_geometry::ConvexMesh::Ptr> compute(const tesseract_common::VectorVector3d& vertices,
-                                                                   const Eigen::VectorXi& faces) const = 0;
+  virtual std::vector<std::shared_ptr<tesseract_geometry::ConvexMesh>>
+  compute(const tesseract_common::VectorVector3d& vertices, const Eigen::VectorXi& faces) const = 0;
 };
 
 }  // namespace tesseract_collision

tesseract_collision/core/include/tesseract_collision/core/fwd.h

@@ -0,0 +1,62 @@
+/**
+ * @file types.h
+ * @brief Tesseracts Collision Forward Declarations
+ *
+ * @author Levi Armstrong
+ * @date February 17, 2024
+ * @version TODO
+ * @bug No known bugs
+ *
+ * @copyright Copyright (c) 2024, Levi Armstrong
+ *
+ * @par License
+ * Software License Agreement (Apache License)
+ * @par
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * @par
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef TESSERACT_COLLISION_CORE_TESSERACT_COLLISION_FWD_H
+#define TESSERACT_COLLISION_CORE_TESSERACT_COLLISION_FWD_H
+
+namespace tesseract_collision
+{
+// types.h
+enum class ContinuousCollisionType;
+enum class ContactTestType;
+struct ContactResult;
+class ContactResultMap;
+struct ContactRequest;
+struct ContactTestData;
+enum class CollisionEvaluatorType;
+enum class CollisionCheckProgramType;
+enum class ACMOverrideType;
+struct ContactManagerConfig;
+struct CollisionCheckConfig;
+struct ContactTrajectorySubstepResults;
+struct ContactTrajectoryStepResults;
+struct ContactTrajectoryResults;
+
+// contact_managers_plugin_factory.h
+class DiscreteContactManagerFactory;
+class ContinuousContactManagerFactory;
+class ContactManagersPluginFactory;
+
+// convex_decomposition.h
+class ConvexDecomposition;
+
+// discrete_contact_manager.h
+class DiscreteContactManager;
+
+// continuous_contact_manager.h
+class ContinuousContactManager;
+}  // namespace tesseract_collision
+
+#endif  // TESSERACT_COLLISION_CORE_TESSERACT_COLLISION_FWD_H

tesseract_collision/core/include/tesseract_collision/core/serialization.h

@@ -26,17 +26,7 @@
 #ifndef TESSERACT_COLLISION_SERIALIZATION_H
 #define TESSERACT_COLLISION_SERIALIZATION_H
 
-#include <tesseract_common/macros.h>
-TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/serialization/tracking.hpp>
-#include <boost/serialization/tracking_enum.hpp>
-TESSERACT_COMMON_IGNORE_WARNINGS_POP
-
-#include <tesseract_collision/core/types.h>
+#include <tesseract_collision/core/fwd.h>
 
 namespace boost::serialization
 {

tesseract_collision/core/include/tesseract_collision/core/types.h

@@ -36,20 +36,22 @@ TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
 #include <array>
 #include <unordered_map>
 #include <functional>
-#include <tesseract_geometry/geometry.h>
-#include <tesseract_common/types.h>
-#include <tesseract_common/collision_margin_data.h>
-#include <tesseract_common/allowed_collision_matrix.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
+#include <tesseract_common/fwd.h>
+#include <tesseract_common/eigen_types.h>
+#include <tesseract_common/collision_margin_data.h>
+#include <tesseract_geometry/fwd.h>
+
 namespace tesseract_collision
 {
-using CollisionShapesConst = std::vector<tesseract_geometry::Geometry::ConstPtr>;
-using CollisionShapeConstPtr = tesseract_geometry::Geometry::ConstPtr;
-using CollisionShapePtr = tesseract_geometry::Geometry::Ptr;
+using CollisionShapeConstPtr = std::shared_ptr<const tesseract_geometry::Geometry>;
+using CollisionShapePtr = std::shared_ptr<tesseract_geometry::Geometry>;
+using CollisionShapesConst = std::vector<CollisionShapeConstPtr>;
 using CollisionMarginData = tesseract_common::CollisionMarginData;
 using CollisionMarginOverrideType = tesseract_common::CollisionMarginOverrideType;
-using PairsCollisionMarginData = tesseract_common::PairsCollisionMarginData;
+using PairsCollisionMarginData =
+    std::unordered_map<std::pair<std::string, std::string>, double, tesseract_common::PairHash>;
 
 /**
  * @brief Should return true if contact allowed, otherwise false.

tesseract_collision/core/include/tesseract_collision/core/utils.h

@@ -28,8 +28,6 @@
 #include <tesseract_common/macros.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
 #include <tesseract_collision/core/types.h>
-#include <tesseract_collision/core/continuous_contact_manager.h>
-#include <tesseract_collision/core/discrete_contact_manager.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
 namespace tesseract_collision

tesseract_collision/core/src/contact_managers_plugin_factory.cpp

@@ -29,6 +29,8 @@ TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
 #include <boost/algorithm/string.hpp>
 TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
+#include <tesseract_collision/core/discrete_contact_manager.h>
+#include <tesseract_collision/core/continuous_contact_manager.h>
 #include <tesseract_common/plugin_loader.hpp>
 #include <tesseract_common/yaml_utils.h>
 #include <tesseract_collision/core/contact_managers_plugin_factory.h>
@@ -202,7 +204,8 @@ std::string ContactManagersPluginFactory::getDefaultContinuousContactManagerPlug
   return continuous_plugin_info_.default_plugin;
 }
 
-DiscreteContactManager::UPtr ContactManagersPluginFactory::createDiscreteContactManager(const std::string& name) const
+std::unique_ptr<DiscreteContactManager>
+ContactManagersPluginFactory::createDiscreteContactManager(const std::string& name) const
 {
   auto cm_it = discrete_plugin_info_.plugins.find(name);
   if (cm_it == discrete_plugin_info_.plugins.end())
@@ -216,7 +219,7 @@ DiscreteContactManager::UPtr ContactManagersPluginFactory::createDiscreteContact
   return createDiscreteContactManager(name, cm_it->second);
 }
 
-DiscreteContactManager::UPtr
+std::unique_ptr<DiscreteContactManager>
 ContactManagersPluginFactory::createDiscreteContactManager(const std::string& name,
                                                            const tesseract_common::PluginInfo& plugin_info) const
 {
@@ -244,7 +247,7 @@ ContactManagersPluginFactory::createDiscreteContactManager(const std::string& na
   // LCOV_EXCL_STOP
 }
 
-ContinuousContactManager::UPtr
+std::unique_ptr<ContinuousContactManager>
 ContactManagersPluginFactory::createContinuousContactManager(const std::string& name) const
 {
   auto cm_it = continuous_plugin_info_.plugins.find(name);
@@ -259,7 +262,7 @@ ContactManagersPluginFactory::createContinuousContactManager(const std::string&
   return createContinuousContactManager(name, cm_it->second);
 }
 
-ContinuousContactManager::UPtr
+std::unique_ptr<ContinuousContactManager>
 ContactManagersPluginFactory::createContinuousContactManager(const std::string& name,
                                                              const tesseract_common::PluginInfo& plugin_info) const
 {

tesseract_collision/core/src/continuous_contact_manager.cpp

@@ -24,7 +24,7 @@
  * limitations under the License.
  */
 
-#include <tesseract_collision/core/discrete_contact_manager.h>
+#include <tesseract_collision/core/continuous_contact_manager.h>
 #include <tesseract_collision/core/utils.h>
 
 namespace tesseract_collision