Merge pull request #1703 from EulalieCoevoet/addTemplateToMMMapper

[SofaGeneralAnimationLoop] MechanicalMatrixMapper: adds template
sofa-framework · Jan 12, 2021 · 113cfc6 · 113cfc6
2 parents d40992c + 22b0212
commit 113cfc6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp b/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp
@@ -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)
 
         ;
@@ -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
diff --git a/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h b/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h
@@ -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