Skip to content

Commit

Permalink
Merge branch 'main' into moco_prescribed_controllers
Browse files Browse the repository at this point in the history
  • Loading branch information
nickbianco committed Dec 20, 2023
2 parents 7a22f03 + 88da27e commit f8b0bcd
Show file tree
Hide file tree
Showing 81 changed files with 15,094 additions and 5,415 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ delete_this_to_stop_optimization*.txt
.idea/dictionaries
.idea/vcs.xml
.idea/opensim-core.iml
.idea/OpenSim.iml
.idea/misc.xml
.idea/editor.xml
.idea/codeStyles/codeStyleConfig.xml
.idea/codeStyles/Project.xml
.idea/editor.xml
Expand Down
2 changes: 0 additions & 2 deletions .idea/OpenSim.iml

This file was deleted.

17 changes: 16 additions & 1 deletion Bindings/Java/Matlab/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,25 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_PYTHONEXDIR}/Moco/exampleSquatToStand/Geometry/")

# Copy Geometry folder for Moco 2D walking examples
# Copy Geometry folder for Moco examples
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_MATLABEXDIR}/Moco/example2DWalking/Geometry/")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_MATLABEXDIR}/Moco/example3DWalking/Geometry/")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_MATLABEXDIR}/Moco/exampleEMGTracking/Geometry/")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_MATLABEXDIR}/Moco/exampleMarkerTracking10DOF/Geometry/")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_MATLABEXDIR}/Moco/exampleSquatToStand/Geometry/")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/OpenSenseExample/Geometry/"
DESTINATION
"${OPENSIM_INSTALL_MATLABEXDIR}/Moco/exampleSquatToStand/exampleIMUTracking/Geometry/")

# The configureOpenSim.m script contains paths into the OpenSim installation
# that may be different on different platforms, so we configure it with CMake
Expand Down
Loading

0 comments on commit f8b0bcd

Please sign in to comment.