Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/perfanalytics/pose2sim
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidpagnon
davidpagnon committed Nov 20, 2024
2 parents 890ac14 + cdec5cc commit 116b8f0
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest, macos-13]
python-version: [3.9, "3.10", "3.11"]

steps:
Expand Down
36 changes: 36 additions & 0 deletions Pose2Sim/OpenSim_Setup/IK_Setup_Pose2Sim_LSTM.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,42 @@
<!--Weight given to a marker or coordinate for solving inverse kinematics problems.-->
<weight>25</weight>
</IKMarkerTask>
<IKMarkerTask name="RThumb">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
<weight>1</weight>
</IKMarkerTask>
<IKMarkerTask name="RIndex">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
<weight>1</weight>
</IKMarkerTask>
<IKMarkerTask name="RPinky">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
<weight>1</weight>
</IKMarkerTask>
<IKMarkerTask name="LThumb">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
<weight>1</weight>
</IKMarkerTask>
<IKMarkerTask name="LIndex">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
<weight>1</weight>
</IKMarkerTask>
<IKMarkerTask name="LPinky">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
<weight>1</weight>
</IKMarkerTask>
<IKCoordinateTask name="sh_tx_l">
<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
<apply>true</apply>
Expand Down
72 changes: 67 additions & 5 deletions Pose2Sim/OpenSim_Setup/Model_Pose2Sim_LSTM.osim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6229,7 +6229,7 @@
<!--Flag indicating whether or not the values of the coordinates should be limited to the range, above.-->
<clamped>true</clamped>
<!--Flag indicating whether or not the values of the coordinates should be constrained to the current (e.g. default) value, above.-->
<locked>true</locked>
<locked>false</locked>
<!--If specified, the coordinate can be prescribed by a function of time. It can be any OpenSim Function with valid second order derivatives.-->
<prescribed_function />
<!--Flag indicating whether or not the values of the coordinates should be prescribed according to the function above. It is ignored if the no prescribed function is specified.-->
Expand All @@ -6245,7 +6245,7 @@
<!--Flag indicating whether or not the values of the coordinates should be limited to the range, above.-->
<clamped>true</clamped>
<!--Flag indicating whether or not the values of the coordinates should be constrained to the current (e.g. default) value, above.-->
<locked>true</locked>
<locked>false</locked>
<!--If specified, the coordinate can be prescribed by a function of time. It can be any OpenSim Function with valid second order derivatives.-->
<prescribed_function />
<!--Flag indicating whether or not the values of the coordinates should be prescribed according to the function above. It is ignored if the no prescribed function is specified.-->
Expand Down Expand Up @@ -6735,7 +6735,7 @@
<!--Flag indicating whether or not the values of the coordinates should be limited to the range, above.-->
<clamped>true</clamped>
<!--Flag indicating whether or not the values of the coordinates should be constrained to the current (e.g. default) value, above.-->
<locked>true</locked>
<locked>false</locked>
<!--If specified, the coordinate can be prescribed by a function of time. It can be any OpenSim Function with valid second order derivatives.-->
<prescribed_function />
<!--Flag indicating whether or not the values of the coordinates should be prescribed according to the function above. It is ignored if the no prescribed function is specified.-->
Expand All @@ -6751,7 +6751,7 @@
<!--Flag indicating whether or not the values of the coordinates should be limited to the range, above.-->
<clamped>true</clamped>
<!--Flag indicating whether or not the values of the coordinates should be constrained to the current (e.g. default) value, above.-->
<locked>true</locked>
<locked>false</locked>
<!--If specified, the coordinate can be prescribed by a function of time. It can be any OpenSim Function with valid second order derivatives.-->
<prescribed_function />
<!--Flag indicating whether or not the values of the coordinates should be prescribed according to the function above. It is ignored if the no prescribed function is specified.-->
Expand Down Expand Up @@ -7477,7 +7477,69 @@
<location>-0.056276 -0.078490000000000004 -0.077259999999999995</location>
<!--Flag (true or false) specifying whether the marker is fixed in its parent frame during the marker placement step of scaling. If false, the marker is free to move within its parent Frame to match its experimental counterpart.-->
<fixed>false</fixed>
</Marker>
</Marker>
<Marker name="RThumb">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/hand_r</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.015900600000000001 -0.053530099999999997 0.045219599999999999</location>
</Marker>
<Marker name="RIndex">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/hand_r</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.0031182900000000001 -0.082610900000000001 0.0160293</location>
</Marker>
<Marker name="RPinky">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/hand_r</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.00311312 -0.073810299999999995 -0.0325446</location>
</Marker>
<Marker name="LThumb">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/hand_l</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.015900595366914239 -0.053530050744837965 -0.045219604622807212</location>
</Marker>
<Marker name="LIndex">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/hand_l</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.0031182929587494357 -0.082610892492083754 -0.016029259621825068</location>
</Marker>
<Marker name="LPinky">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/hand_l</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.0031131181410346542 -0.073810317144973658 0.032544599634169884</location>
<!--Flag (true or false) specifying whether the marker is fixed in its parent frame during the marker placement step of scaling. If false, the marker is free to move within its parent Frame to match its experimental counterpart.-->
<fixed>false</fixed>
</Marker>
<Marker name="Nose">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/head</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.107623784338859 0.54290490722614126 0.0001528854696219647</location>
<!--Flag (true or false) specifying whether the marker is fixed in its parent frame during the marker placement step of scaling. If false, the marker is free to move within its parent Frame to match its experimental counterpart.-->
<fixed>true</fixed>
</Marker>
<Marker name="REye">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/head</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.070157181776970542 0.55784285717609527 0.031106947145128013</location>
<!--Flag (true or false) specifying whether the marker is fixed in its parent frame during the marker placement step of scaling. If false, the marker is free to move within its parent Frame to match its experimental counterpart.-->
<fixed>true</fixed>
</Marker>
<Marker name="LEye">
<!--Path to a Component that satisfies the Socket 'parent_frame' of type PhysicalFrame (description: The frame to which this station is fixed.).-->
<socket_parent_frame>/bodyset/head</socket_parent_frame>
<!--The fixed location of the station expressed in its parent frame.-->
<location>0.070157200000000003 0.55784299999999998 -0.0311069</location>
<!--Flag (true or false) specifying whether the marker is fixed in its parent frame during the marker placement step of scaling. If false, the marker is free to move within its parent Frame to match its experimental counterpart.-->
<fixed>true</fixed>
</Marker>
</objects>
<groups />
</MarkerSet>
Expand Down

0 comments on commit 116b8f0

Please sign in to comment.