Skip to content
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

Jump to bottom

[SofaGeneralAnimationLoop] MechanicalMatrixMapper: adds template #1703

Merged
merged 2 commits into from
Jan 12, 2021
Merged

[SofaGeneralAnimationLoop] MechanicalMatrixMapper: adds template #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d05d15e
[SofaGeneralAnimationLoop] MechanicalMatrixMapper: adds template
Jan 11, 2021
22b0212
[SofaGeneralAnimationLoop] forgotten extern template in MechanicalMat…
Jan 12, 2021
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
14 changes: 8 additions & 6 deletions modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ using namespace sofa::defaulttype;
//////////////////////////////////////////// FACTORY //////////////////////////////////////////////
int MechanicalMatrixMapperClass = core::RegisterObject("This component allows to map the stiffness (and mass) matrix through a mapping.")

.add< MechanicalMatrixMapper<Rigid3Types, Rigid3Types> >(true)
.add< MechanicalMatrixMapper<Vec3Types, Rigid3Types> >(true)
.add< MechanicalMatrixMapper<Vec3Types, Vec3Types> >(true)
.add< MechanicalMatrixMapper<Vec1Types, Rigid3Types> >(true)
.add< MechanicalMatrixMapper<Vec1Types, Vec1Types> >(true)
.add< MechanicalMatrixMapper<Rigid3Types, Rigid3Types> >()
.add< MechanicalMatrixMapper<Vec3Types, Rigid3Types> >()
.add< MechanicalMatrixMapper<Vec3Types, Vec3Types> >()
.add< MechanicalMatrixMapper<Vec1Types, Rigid3Types> >()
.add< MechanicalMatrixMapper<Vec1Types, Vec3Types> >()
.add< MechanicalMatrixMapper<Vec1Types, Vec1Types> >()
.add< MechanicalMatrixMapper<Rigid3Types, Vec1Types> >(true)

;
Expand All @@ -47,9 +48,10 @@ template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Rigid3Ty
template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Vec3Types, Rigid3Types>;
template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Vec3Types, Vec3Types>;
template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Vec1Types, Rigid3Types>;
template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Vec1Types, Vec3Types>;
template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Vec1Types, Vec1Types>;
template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<Rigid3Types, Vec1Types> ;



} // namespace sofa::component::interactionforcefield
} // namespace sofa::component::interactionforcefield
3 changes: 3 additions & 0 deletions modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,13 @@ class MechanicalMatrixMapper : public MixedInteractionForceField<TDataTypes1, TD
};

#if !defined(SOFA_COMPONENT_ANIMATIONLOOP_MECHANICALMATRIXMAPPER_CPP)
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Rigid3Types, defaulttype::Rigid3Types>;
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Vec3Types, defaulttype::Rigid3Types>;
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Vec3Types, defaulttype::Vec3Types>;
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Vec1Types, defaulttype::Rigid3Types>;
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Vec1Types, defaulttype::Vec3Types>;
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Vec1Types, defaulttype::Vec1Types>;
extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper<defaulttype::Rigid3Types, defaulttype::Vec1Types>;
#endif

} // namespace sofa::component::interactionforcefield