fix: Refactor ammr 3.0 muscle compatibility structure for leg muscles. (

#40) Refactor ammr 3.0 muscle compatibility structure for leg muscles. They were only working for default foot model.
AnyBody · Jan 6, 2025 · 8b77537 · 8b77537
1 parent 453c93b
commit 8b77537
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 35 deletions.
diff --git a/Body/AAUHuman/LegTLEM/Mus.any b/Body/AAUHuman/LegTLEM/Mus.any
@@ -16,11 +16,11 @@
 // levels.
 // -------------------------------------------------------
 
-#if BM_FOOT_MODEL == _FOOT_MODEL_DEFAULT_
+#if BM_COMPATIBILITY_MUSCLE_STRUCTURE == ON
+  #include "ammr_3.0_compatibility_structure.any"
+#endif
 
-  #if BM_COMPATIBILITY_MUSCLE_STRUCTURE == ON
-    #include "ammr_3.0_compatibility_structure.any"
-  #endif
+#if BM_FOOT_MODEL == _FOOT_MODEL_DEFAULT_
 
   MuscleGroup SoleusMedialis() = {
     AnyMuscleShortestPath SoleusMedialis1 = {
@@ -1880,7 +1880,7 @@ MuscleGroup Pectineus = {
 };
 
 
-#if BM_FOOT_MODEL == _FOOT_MODEL_DEFAULT_
+#if BM_FOOT_MODEL == _FOOT_MODEL_DEFAULT_  
   MuscleGroup Plantaris = {
     AnyMuscleShortestPath Plantaris1 = {
       AnyMuscleModel &MusMdl = ...MuscleModels.Plantaris1Par;

diff --git a/Body/AAUHuman/LegTLEM/ammr_3.0_compatibility_structure.any b/Body/AAUHuman/LegTLEM/ammr_3.0_compatibility_structure.any
@@ -1,3 +1,4 @@
+#if BM_FOOT_MODEL == _FOOT_MODEL_DEFAULT_
 AnyFolder &SoleusMedialis1 = SoleusMedialis.SoleusMedialis1;
 AnyFolder &SoleusMedialis2 = SoleusMedialis.SoleusMedialis2;
 AnyFolder &SoleusMedialis3 = SoleusMedialis.SoleusMedialis3;
@@ -6,6 +7,38 @@ AnyFolder &SoleusLateralis2 = SoleusLateralis.SoleusLateralis2;
 AnyFolder &SoleusLateralis3 = SoleusLateralis.SoleusLateralis3;
 AnyFolder &GastrocnemiusLateralis1 = GastrocnemiusLateralis.GastrocnemiusLateralis1;
 AnyFolder &GastrocnemiusMedialis1 = GastrocnemiusMedialis.GastrocnemiusMedialis1;
+AnyFolder &FlexorDigitorumLongus1 = FlexorDigitorumLongus.FlexorDigitorumLongus1;
+AnyFolder &FlexorDigitorumLongus2 = FlexorDigitorumLongus.FlexorDigitorumLongus2;
+AnyFolder &FlexorDigitorumLongus3 = FlexorDigitorumLongus.FlexorDigitorumLongus3;
+AnyFolder &FlexorDigitorumLongus4 = FlexorDigitorumLongus.FlexorDigitorumLongus4;
+AnyFolder &FlexorHallucisLongus1 = FlexorHallucisLongus.FlexorHallucisLongus1;
+AnyFolder &FlexorHallucisLongus2 = FlexorHallucisLongus.FlexorHallucisLongus2;
+AnyFolder &FlexorHallucisLongus3 = FlexorHallucisLongus.FlexorHallucisLongus3;
+AnyFolder &TibialisPosteriorLateralis1 = TibialisPosteriorLateralis.TibialisPosteriorLateralis1;
+AnyFolder &TibialisPosteriorLateralis2 = TibialisPosteriorLateralis.TibialisPosteriorLateralis2;
+AnyFolder &TibialisPosteriorLateralis3 = TibialisPosteriorLateralis.TibialisPosteriorLateralis3;
+AnyFolder &TibialisPosteriorMedialis1 = TibialisPosteriorMedialis.TibialisPosteriorMedialis1;
+AnyFolder &TibialisPosteriorMedialis2 = TibialisPosteriorMedialis.TibialisPosteriorMedialis2;
+AnyFolder &TibialisPosteriorMedialis3 = TibialisPosteriorMedialis.TibialisPosteriorMedialis3;
+AnyFolder &TibialisAnterior1 = TibialisAnterior.TibialisAnterior1;
+AnyFolder &TibialisAnterior2 = TibialisAnterior.TibialisAnterior2;
+AnyFolder &TibialisAnterior3 = TibialisAnterior.TibialisAnterior3;
+AnyFolder &PeroneusBrevis1 = PeroneusBrevis.PeroneusBrevis1;
+AnyFolder &PeroneusBrevis2 = PeroneusBrevis.PeroneusBrevis2;
+AnyFolder &PeroneusBrevis3 = PeroneusBrevis.PeroneusBrevis3;
+AnyFolder &PeroneusLongus1 = PeroneusLongus.PeroneusLongus1;
+AnyFolder &PeroneusLongus2 = PeroneusLongus.PeroneusLongus2;
+AnyFolder &PeroneusLongus3 = PeroneusLongus.PeroneusLongus3;
+AnyFolder &ExtensorDigitorumLongus1 = ExtensorDigitorumLongus.ExtensorDigitorumLongus1;
+AnyFolder &ExtensorDigitorumLongus2 = ExtensorDigitorumLongus.ExtensorDigitorumLongus2;
+AnyFolder &ExtensorDigitorumLongus3 = ExtensorDigitorumLongus.ExtensorDigitorumLongus3;
+AnyFolder &ExtensorDigitorumLongus4 = ExtensorDigitorumLongus.ExtensorDigitorumLongus4;
+AnyFolder &ExtensorHallucisLongus1 = ExtensorHallucisLongus.ExtensorHallucisLongus1;
+AnyFolder &ExtensorHallucisLongus2 = ExtensorHallucisLongus.ExtensorHallucisLongus2;
+AnyFolder &ExtensorHallucisLongus3 = ExtensorHallucisLongus.ExtensorHallucisLongus3;
+AnyFolder &Plantaris1 = Plantaris.Plantaris1;
+#endif
+
 AnyFolder &VastusLateralisInferior1 = VastusLateralisInferior.VastusLateralisInferior1;
 AnyFolder &VastusLateralisInferior2 = VastusLateralisInferior.VastusLateralisInferior2;
 AnyFolder &VastusLateralisInferior3 = VastusLateralisInferior.VastusLateralisInferior3;
@@ -56,36 +89,6 @@ AnyFolder &GluteusMaximusInferior3 = GluteusMaximusInferior.GluteusMaximusInferi
 AnyFolder &GluteusMaximusInferior4 = GluteusMaximusInferior.GluteusMaximusInferior4;
 AnyFolder &GluteusMaximusInferior5 = GluteusMaximusInferior.GluteusMaximusInferior5;
 AnyFolder &GluteusMaximusInferior6 = GluteusMaximusInferior.GluteusMaximusInferior6;
-AnyFolder &Plantaris1 = Plantaris.Plantaris1;
-AnyFolder &FlexorDigitorumLongus1 = FlexorDigitorumLongus.FlexorDigitorumLongus1;
-AnyFolder &FlexorDigitorumLongus2 = FlexorDigitorumLongus.FlexorDigitorumLongus2;
-AnyFolder &FlexorDigitorumLongus3 = FlexorDigitorumLongus.FlexorDigitorumLongus3;
-AnyFolder &FlexorDigitorumLongus4 = FlexorDigitorumLongus.FlexorDigitorumLongus4;
-AnyFolder &FlexorHallucisLongus1 = FlexorHallucisLongus.FlexorHallucisLongus1;
-AnyFolder &FlexorHallucisLongus2 = FlexorHallucisLongus.FlexorHallucisLongus2;
-AnyFolder &FlexorHallucisLongus3 = FlexorHallucisLongus.FlexorHallucisLongus3;
-AnyFolder &TibialisPosteriorLateralis1 = TibialisPosteriorLateralis.TibialisPosteriorLateralis1;
-AnyFolder &TibialisPosteriorLateralis2 = TibialisPosteriorLateralis.TibialisPosteriorLateralis2;
-AnyFolder &TibialisPosteriorLateralis3 = TibialisPosteriorLateralis.TibialisPosteriorLateralis3;
-AnyFolder &TibialisPosteriorMedialis1 = TibialisPosteriorMedialis.TibialisPosteriorMedialis1;
-AnyFolder &TibialisPosteriorMedialis2 = TibialisPosteriorMedialis.TibialisPosteriorMedialis2;
-AnyFolder &TibialisPosteriorMedialis3 = TibialisPosteriorMedialis.TibialisPosteriorMedialis3;
-AnyFolder &TibialisAnterior1 = TibialisAnterior.TibialisAnterior1;
-AnyFolder &TibialisAnterior2 = TibialisAnterior.TibialisAnterior2;
-AnyFolder &TibialisAnterior3 = TibialisAnterior.TibialisAnterior3;
-AnyFolder &PeroneusBrevis1 = PeroneusBrevis.PeroneusBrevis1;
-AnyFolder &PeroneusBrevis2 = PeroneusBrevis.PeroneusBrevis2;
-AnyFolder &PeroneusBrevis3 = PeroneusBrevis.PeroneusBrevis3;
-AnyFolder &PeroneusLongus1 = PeroneusLongus.PeroneusLongus1;
-AnyFolder &PeroneusLongus2 = PeroneusLongus.PeroneusLongus2;
-AnyFolder &PeroneusLongus3 = PeroneusLongus.PeroneusLongus3;
-AnyFolder &ExtensorDigitorumLongus1 = ExtensorDigitorumLongus.ExtensorDigitorumLongus1;
-AnyFolder &ExtensorDigitorumLongus2 = ExtensorDigitorumLongus.ExtensorDigitorumLongus2;
-AnyFolder &ExtensorDigitorumLongus3 = ExtensorDigitorumLongus.ExtensorDigitorumLongus3;
-AnyFolder &ExtensorDigitorumLongus4 = ExtensorDigitorumLongus.ExtensorDigitorumLongus4;
-AnyFolder &ExtensorHallucisLongus1 = ExtensorHallucisLongus.ExtensorHallucisLongus1;
-AnyFolder &ExtensorHallucisLongus2 = ExtensorHallucisLongus.ExtensorHallucisLongus2;
-AnyFolder &ExtensorHallucisLongus3 = ExtensorHallucisLongus.ExtensorHallucisLongus3;
 AnyFolder &Sartorius1 = Sartorius.Sartorius1;
 AnyFolder &GluteusMinimusAnterior1 = GluteusMinimus.GluteusMinimusAnterior1;
 AnyFolder &GluteusMinimusMid1 = GluteusMinimus.GluteusMinimusMid1;