From 5eda0bb73aad0d1ec3fd1dd62abf43c95b819019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20BL?= Date: Tue, 13 May 2025 11:34:22 +0200 Subject: [PATCH] feat(sed_sprint): update RegistrationContact for new Contact class with template method --- src/Registration/RegistrationContact.h | 15 ++++++++++----- src/Registration/RegistrationContact.inl | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Registration/RegistrationContact.h b/src/Registration/RegistrationContact.h index 74b843d..9df2c21 100644 --- a/src/Registration/RegistrationContact.h +++ b/src/Registration/RegistrationContact.h @@ -80,15 +80,20 @@ namespace sofa void cleanup() override; - std::pair getCollisionModels() override { return std::make_pair(model1,model2); } + void draw(const core::visual::VisualParams* vparams) override; + + protected: + std::pair doGetCollisionModels() override + { + return std::make_pair(model1,model2); + } - void setDetectionOutputs(OutputVector* outputs) override; + void doSetDetectionOutputs(OutputVector* outputs) override; - void createResponse(core::objectmodel::BaseContext* group) override; + void doCreateResponse(core::objectmodel::BaseContext* group) override; - void removeResponse() override; + void doRemoveResponse() override; - void draw(const core::visual::VisualParams* vparams) override; }; } // namespace collision diff --git a/src/Registration/RegistrationContact.inl b/src/Registration/RegistrationContact.inl index 7f2782e..9da2698 100644 --- a/src/Registration/RegistrationContact.inl +++ b/src/Registration/RegistrationContact.inl @@ -67,7 +67,7 @@ void RegistrationContact::c } template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes > -void RegistrationContact::setDetectionOutputs(OutputVector* o) +void RegistrationContact::doSetDetectionOutputs(OutputVector* o) { TOutputVector& outputs = *static_cast(o); if (ff==NULL) @@ -191,7 +191,7 @@ void RegistrationContact::s } template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes > -void RegistrationContact::createResponse(core::objectmodel::BaseContext* group) +void RegistrationContact::doCreateResponse(core::objectmodel::BaseContext* group) { if (ff!=NULL) { @@ -210,7 +210,7 @@ void RegistrationContact::c } template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes > -void RegistrationContact::removeResponse() +void RegistrationContact::doRemoveResponse() { if (ff!=NULL) {