Skip to content

[Framework] Apply template method design pattern to Contact #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NiziL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Framework] Apply template method design pattern to Contact #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/Registration/RegistrationContact.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,20 @@ namespace sofa

void cleanup() override;

std::pair<core::CollisionModel*,core::CollisionModel*> getCollisionModels() override { return std::make_pair(model1,model2); }
void draw(const core::visual::VisualParams* vparams) override;

protected:
std::pair<core::CollisionModel*,core::CollisionModel*> 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
Expand Down
6 changes: 3 additions & 3 deletions src/Registration/RegistrationContact.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::c
}

template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes >
void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::setDetectionOutputs(OutputVector* o)
void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::doSetDetectionOutputs(OutputVector* o)
{
TOutputVector& outputs = *static_cast<TOutputVector*>(o);
if (ff==NULL)
Expand Down Expand Up @@ -191,7 +191,7 @@ void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::s
}

template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes >
void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::createResponse(core::objectmodel::BaseContext* group)
void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::doCreateResponse(core::objectmodel::BaseContext* group)
{
if (ff!=NULL)
{
Expand All @@ -210,7 +210,7 @@ void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::c
}

template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes >
void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::removeResponse()
void RegistrationContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::doRemoveResponse()
{
if (ff!=NULL)
{
Expand Down
Loading