Skip to content
Snippets Groups Projects
Commit 144ac924 authored by Ye Han's avatar Ye Han :panda_face: Committed by Andrew Wilson
Browse files

ENH: Register cutting pair, fix redundant cast and comment

parent 335023b2
No related branches found
No related tags found
No related merge requests found
......@@ -26,6 +26,7 @@ limitations under the License.
#include "imstkFeDeformableObject.h"
#include "imstkPbdObject.h"
#include "imstkPbdObjectCollisionPair.h"
#include "imstkPbdObjectCuttingPair.h"
#include "imstkPbdObjectPickingPair.h"
#include "imstkPBDPickingCH.h"
#include "imstkPenaltyCH.h"
......@@ -53,9 +54,13 @@ makeObjectInteractionPair(std::shared_ptr<CollidingObject> obj1, std::shared_ptr
{
results = std::make_shared<PbdObjectCollisionPair>(std::dynamic_pointer_cast<PbdObject>(obj1), std::dynamic_pointer_cast<PbdObject>(obj2), cdType);
}
else if (intType == InteractionType::PbdObjToCollidingObjCutting && isType<PbdObject>(obj1))
{
results = std::make_shared<PbdObjectCuttingPair>(std::dynamic_pointer_cast<PbdObject>(obj1), obj2);
}
else if (intType == InteractionType::PbdObjToCollidingObjPicking && isType<PbdObject>(obj1))
{
results = std::make_shared<PbdObjectPickingPair>(std::dynamic_pointer_cast<PbdObject>(obj1), std::dynamic_pointer_cast<CollidingObject>(obj2), cdType);
results = std::make_shared<PbdObjectPickingPair>(std::dynamic_pointer_cast<PbdObject>(obj1), obj2, cdType);
}
//else if (intType == InteractionType::PbdObjToCollidingObjCollision && isType<PbdObject>(obj1))
//{
......
......@@ -33,6 +33,7 @@ enum class InteractionType
{
PbdObjToPbdObjCollision,
PbdObjToCollidingObjPicking,
PbdObjToCollidingObjCutting,
PbdObjToCollidingObjCollision,
SphObjToCollidingObjCollision,
......
......@@ -32,7 +32,7 @@ class PbdSolver;
///
/// \class PbdObjectCollisionPair
///
/// \brief This class defines a collision interaction between two PbdObjects
/// \brief This class defines a picking interaction between a PbdObject and a CollidingObject with AnalyticalGeometry
///
class PbdObjectPickingPair : public CollisionPair
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment