Skip to content

Commit 2646dda

Browse files
committed
feat(sed_sprint): update child class PersistentFrictionContact
1 parent 109fed4 commit 2646dda

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

applications/plugins/PersistentContact/PersistentFrictionContact.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,20 +135,21 @@ class PersistentFrictionContact : public FrictionContact<TCollisionModel1, TColl
135135

136136
void cleanup();
137137

138-
/// Set the generic description of a contact point
139-
void setDetectionOutputs(OutputVector* outputs);
140-
141-
void createResponse(core::objectmodel::BaseContext* group);
142-
143-
virtual void removeResponse();
144-
145138
void init();
146139

140+
147141
#ifdef DEBUG_INACTIVE_CONTACTS
148142
void draw(const core::visual::VisualParams* vparams);
149143
#endif
150144

151145
protected:
146+
147+
/// Set the generic description of a contact point
148+
void doSetDetectionOutputs(OutputVector* outputs);
149+
150+
void doCreateResponse(core::objectmodel::BaseContext* group);
151+
152+
virtual void doRemoveResponse();
152153

153154
std::pair<bool,bool> findMappingOrUseMapper();
154155

applications/plugins/PersistentContact/PersistentFrictionContact.inl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::resetConstrai
309309

310310

311311
template < class TCollisionModel1, class TCollisionModel2 >
312-
void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::setDetectionOutputs(OutputVector* o)
312+
void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::doSetDetectionOutputs(OutputVector* o)
313313
{
314314
DetectionOutputVector filteredOutputs;
315315

@@ -627,7 +627,7 @@ void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::activateConst
627627

628628

629629
template < class TCollisionModel1, class TCollisionModel2 >
630-
void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::createResponse(core::objectmodel::BaseContext* group)
630+
void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::doCreateResponse(core::objectmodel::BaseContext* group)
631631
{
632632
use_mapper_for_state1 = !findMappingOrUseMapper(mstate1, constraintModel1, map1);
633633
use_mapper_for_state2 = !findMappingOrUseMapper(mstate2, constraintModel2, map2);
@@ -712,7 +712,7 @@ void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::createRespons
712712

713713

714714
template < class TCollisionModel1, class TCollisionModel2 >
715-
void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::removeResponse()
715+
void PersistentFrictionContact<TCollisionModel1,TCollisionModel2>::doRemoveResponse()
716716
{
717717
if (this->m_constraint)
718718
{

0 commit comments

Comments
 (0)