Skip to content

Commit 1fd7dfc

Browse files
bakpaulfredroy
authored andcommitted
Fix Distance grid and simplify fix for OBB
1 parent e7d04fb commit 1fd7dfc

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/response/contact/OBBContact.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ template class COLLISIONOBBCAPSULE_API response::contact::BarycentricPenalityCon
5858
template class COLLISIONOBBCAPSULE_API response::contact::BarycentricPenalityContact<collision::geometry::TriangleCollisionModel<sofa::defaulttype::Vec3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>>;
5959
template class COLLISIONOBBCAPSULE_API response::contact::BarycentricPenalityContact<collision::geometry::CylinderCollisionModel<sofa::defaulttype::Rigid3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>>;
6060

61-
template class COLLISIONOBBCAPSULE_API response::contact::BaseUnilateralContactResponse<OBBCollisionModel<sofa::defaulttype::Rigid3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>, sofa::component::constraint::lagrangian::model::UnilateralLagrangianContactParameters>;
62-
template class COLLISIONOBBCAPSULE_API response::contact::BaseUnilateralContactResponse<collision::geometry::SphereCollisionModel<sofa::defaulttype::Vec3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>, sofa::component::constraint::lagrangian::model::UnilateralLagrangianContactParameters>;
63-
template class COLLISIONOBBCAPSULE_API response::contact::BaseUnilateralContactResponse<collision::geometry::TriangleCollisionModel<sofa::defaulttype::Vec3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>, sofa::component::constraint::lagrangian::model::UnilateralLagrangianContactParameters>;
64-
template class COLLISIONOBBCAPSULE_API response::contact::BaseUnilateralContactResponse<RigidSphereModel, OBBCollisionModel<sofa::defaulttype::Rigid3Types>, sofa::component::constraint::lagrangian::model::UnilateralLagrangianContactParameters>;
65-
6661
template class COLLISIONOBBCAPSULE_API response::contact::FrictionContact<OBBCollisionModel<sofa::defaulttype::Rigid3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>>;
6762
template class COLLISIONOBBCAPSULE_API response::contact::FrictionContact<collision::geometry::SphereCollisionModel<sofa::defaulttype::Vec3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>>;
6863
template class COLLISIONOBBCAPSULE_API response::contact::FrictionContact<collision::geometry::TriangleCollisionModel<sofa::defaulttype::Vec3Types>, OBBCollisionModel<sofa::defaulttype::Rigid3Types>>;

applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/RegisterModelToCollisionFactory.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ using sofa::core::collision::Contact ;
3535

3636
#include <sofa/component/collision/response/contact/FrictionContact.inl>
3737
#include <sofa/component/collision/response/contact/BarycentricStickContact.inl>
38+
#include <sofa/component/collision/response/contact/BaseUnilateralContactResponse.inl>
3839

3940
#include "components/collision/DistanceGridCollisionModel.h"
4041
#include "components/collision/FFDDistanceGridDiscreteIntersection.h"

0 commit comments

Comments
 (0)