fix: Renamed code macros and templates for spline muscles (#22)

* Renamed code macros and templates for spline muscles * Fixed more missing renames * tmp * Refactored code to use builtin helper functions
AnyBody · Sep 25, 2024 · e9d315b · e9d315b
1 parent 511a6a3
commit e9d315b
Show file tree

Hide file tree

Showing 4 changed files with 230 additions and 232 deletions.
diff --git a/Body/AAUHuman/BodyModels/GenericBodyModel/Spline.ClassTemplate.any b/Body/AAUHuman/BodyModels/GenericBodyModel/Spline.ClassTemplate.any
@@ -21,8 +21,8 @@
  AnyFloat Data=POINTS';
 
  AnyInt Data_Size = SizesOf(Data')[0];
- AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(UPPER(Data_Size-1)));
- AnyFloat Data_L = LENGTH(Data');
+ AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(TRI(Data_Size-1)'));
+ AnyFloat Data_L = TOTAL_POLYLINE_LENGTH(Data');
  AnyFloat Data_REL_L = Data_Accum_L/Data_L;
 
 
@@ -110,8 +110,8 @@ AnyFloat L=.Data_L ; //max(.S);
  AnyFloat Data=POINTS';
 
  AnyInt Data_Size = SizesOf(Data')[0];
- AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(UPPER(Data_Size-1)));
- AnyFloat Data_L = LENGTH(Data');
+ AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(TRI(Data_Size-1)'));
+ AnyFloat Data_L = TOTAL_POLYLINE_LENGTH(Data');
  AnyFloat Data_REL_L = Data_Accum_L/Data_L;
 
 
@@ -179,7 +179,7 @@ AnyFunInterpol Fun_Resample = {
  T = linspace(0.0,1.0,100);
  AnyFloat Temp = linspace(START+0.0,END+0.0,100);
  Data = .Fun_Resample_Ext(Temp)';
- AnyFloat L=LENGTH(Data');
+ AnyFloat L=TOTAL_POLYLINE_LENGTH(Data');
 }; 
 
 
@@ -188,7 +188,7 @@ AnyFunInterpol Fun_Resample_ABS = {
  AnyFloat test = .Fun_Resample.T*.Fun_Resample.L;
  T= .Fun_Resample.T*.Fun_Resample.L;
  Data = .Fun_Resample.Data;
- AnyFloat L=LENGTH(Data');
+ AnyFloat L=TOTAL_POLYLINE_LENGTH(Data');
 }; 
 
  AnyVector a = linspace(0,1,NUM_ELEM);
@@ -235,8 +235,8 @@ AnyFunInterpol Fun_Resample_ABS = {
  AnyFloat Data=POINTS';
 
  AnyInt Data_Size = SizesOf(Data')[0];
- AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(UPPER(Data_Size-1)));
- AnyFloat Data_L = LENGTH(Data');
+ AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(TRI(Data_Size-1)'));
+ AnyFloat Data_L = TOTAL_POLYLINE_LENGTH(Data');
  AnyFloat Data_REL_L = Data_Accum_L/Data_L;
 
 
@@ -323,8 +323,8 @@ AnyFloat Points = Fun_Resample(a);
  AnyFloat Data=POINTS';
 
  AnyInt Data_Size = SizesOf(Data')[0];
- AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(UPPER(Data_Size-1)));
- AnyFloat Data_L = LENGTH(Data');
+ AnyFloat Data_Accum_L = arrcat(0.0,vnorm((DIFFMAT(Data_Size))*Data')*(TRI(Data_Size-1)'));
+ AnyFloat Data_L = TOTAL_POLYLINE_LENGTH(Data');
  AnyFloat Data_REL_L = Data_Accum_L/Data_L;