Commit 386cbccc authored by Nghia Truong's avatar Nghia Truong
Browse files

REFAC: Forward declaration for PBDModel and remove it from dependency of several other headers

parent 6b8e9447
......@@ -20,6 +20,8 @@
=========================================================================*/
#include "imstkPbdEdgeEdgeCollisionConstraint.h"
#include "imstkPbdModel.h"
#include "g3log/g3log.hpp"
namespace imstk
......
......@@ -20,6 +20,8 @@
=========================================================================*/
#include "imstkPbdPointTriCollisionConstraint.h"
#include "imstkPbdModel.h"
#include "g3log/g3log.hpp"
namespace imstk
......
......@@ -21,6 +21,7 @@
#include "imstkPbdObject.h"
#include "imstkGeometryMap.h"
#include "imstkPbdModel.h"
#include <g3log/g3log.hpp>
......
......@@ -24,7 +24,7 @@
#include "imstkDynamicObject.h"
#include "imstkDynamicalModel.h"
#include "imstkPbdModel.h"
#include "imstkPbdState.h"
#include <stdarg.h>
......@@ -32,6 +32,7 @@ namespace imstk
{
class Geometry;
class GeometryMap;
class PbdModel;
///
/// \class PbdObject
......@@ -58,7 +59,7 @@ public:
///
/// \brief Destructor
///
virtual ~PbdObject() = default;
virtual ~PbdObject() override = default;
///
/// \brief Initialize the pbd scene object
......@@ -85,10 +86,9 @@ public:
///
void reset() override;
void setPbdModel(std::shared_ptr<PbdModel> model) { m_pbdModel = model; }
void setPbdModel(const std::shared_ptr<PbdModel>& model) { m_pbdModel = model; }
protected:
std::shared_ptr<PbdModel> m_pbdModel; ///> PBD mathematical model
};
} // imstk
......
......@@ -24,6 +24,7 @@
#include "imstkPbdRigidObject.h"
#include "imstkGeometry.h"
#include "imstkGeometryMap.h"
#include "imstkPbdModel.h"
#include <g3log/g3log.hpp>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment