mujoco: 3.3.4 -> 3.3.5

Diff: https://github.com/google-deepmind/mujoco/compare/3.3.4...3.3.5

Changelog: https://mujoco.readthedocs.io/en/3.3.5/changelog.html

+29 -307
+16 -55
pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch
··· 1 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index a4794196..66525432 100644 2 + index 1780f874..3ac02be6 100644 3 3 --- a/CMakeLists.txt 4 4 +++ b/CMakeLists.txt 5 5 @@ -140,7 +140,7 @@ target_link_libraries( ··· 12 12 13 13 set_target_properties( 14 14 diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake 15 - index cb17621a..e1bd0e9d 100644 15 + index 5cdc33cb..a4c9f61f 100644 16 16 --- a/cmake/MujocoDependencies.cmake 17 17 +++ b/cmake/MujocoDependencies.cmake 18 18 @@ -93,8 +93,6 @@ set(BUILD_SHARED_LIBS ··· 62 62 EXCLUDE_FROM_ALL 63 63 ) 64 64 target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) 65 - @@ -175,35 +163,32 @@ findorfetch( 65 + @@ -175,10 +163,6 @@ findorfetch( 66 66 tinyobjloader 67 67 LIBRARY_NAME 68 68 tinyobjloader ··· 73 73 TARGETS 74 74 tinyobjloader 75 75 EXCLUDE_FROM_ALL 76 - ) 76 + @@ -187,8 +171,6 @@ findorfetch( 77 + if(NOT TARGET trianglemeshdistance) 78 + FetchContent_Declare( 79 + trianglemeshdistance 80 + - GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/TriangleMeshDistance.git 81 + - GIT_TAG ${MUJOCO_DEP_VERSION_TriangleMeshDistance} 82 + ) 77 83 78 - +option(MUJOCO_USE_SYSTEM_sdflib "Use installed sdflib version." OFF) 79 - +mark_as_advanced(MUJOCO_USE_SYSTEM_sdflib) 80 - + 81 - option(SDFLIB_USE_ASSIMP OFF) 82 - option(SDFLIB_USE_OPENMP OFF) 83 - option(SDFLIB_USE_ENOKI OFF) 84 - findorfetch( 85 - USE_SYSTEM_PACKAGE 86 - - OFF 87 - + ${MUJOCO_USE_SYSTEM_sdflib} 88 - PACKAGE_NAME 89 - - sdflib 90 - + SdfLib 91 - LIBRARY_NAME 92 - sdflib 93 - - GIT_REPO 94 - - https://github.com/UPC-ViRVIG/SdfLib.git 95 - - GIT_TAG 96 - - ${MUJOCO_DEP_VERSION_sdflib} 97 - TARGETS 98 - - SdfLib 99 - + SdfLib::SdfLib 100 - EXCLUDE_FROM_ALL 101 - ) 102 - -target_compile_options(SdfLib PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) 103 - -target_link_options(SdfLib PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) 104 - +if(NOT MUJOCO_USE_SYSTEM_sdflib) 105 - + target_compile_options(SdfLib PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) 106 - + target_link_options(SdfLib PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) 107 - +endif() 108 - 109 - set(ENABLE_DOUBLE_PRECISION ON) 110 - set(CCD_HIDE_ALL_SYMBOLS ON) 111 - @@ -214,10 +199,6 @@ findorfetch( 84 + FetchContent_GetProperties(trianglemeshdistance) 85 + @@ -207,10 +189,6 @@ findorfetch( 112 86 ccd 113 87 LIBRARY_NAME 114 88 ccd ··· 119 93 TARGETS 120 94 ccd 121 95 EXCLUDE_FROM_ALL 122 - @@ -254,10 +235,6 @@ if(MUJOCO_BUILD_TESTS) 96 + @@ -247,10 +225,6 @@ if(MUJOCO_BUILD_TESTS) 123 97 absl 124 98 LIBRARY_NAME 125 99 abseil-cpp ··· 130 104 TARGETS 131 105 absl::core_headers 132 106 EXCLUDE_FROM_ALL 133 - @@ -281,14 +258,9 @@ if(MUJOCO_BUILD_TESTS) 107 + @@ -274,14 +248,9 @@ if(MUJOCO_BUILD_TESTS) 134 108 GTest 135 109 LIBRARY_NAME 136 110 googletest ··· 147 121 EXCLUDE_FROM_ALL 148 122 ) 149 123 150 - @@ -315,10 +287,6 @@ if(MUJOCO_BUILD_TESTS) 124 + @@ -308,10 +277,6 @@ if(MUJOCO_BUILD_TESTS) 151 125 benchmark 152 126 LIBRARY_NAME 153 127 benchmark ··· 158 132 TARGETS 159 133 benchmark::benchmark 160 134 benchmark::benchmark_main 161 - @@ -329,14 +297,12 @@ endif() 135 + @@ -322,14 +287,12 @@ endif() 162 136 163 137 if(MUJOCO_TEST_PYTHON_UTIL) 164 138 add_compile_definitions(EIGEN_MPL2_ONLY) ··· 174 148 ) 175 149 176 150 FetchContent_GetProperties(Eigen3) 177 - diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt 178 - index 8b834971..25021fa1 100644 179 - --- a/plugin/sdf/CMakeLists.txt 180 - +++ b/plugin/sdf/CMakeLists.txt 181 - @@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS 182 - add_library(sdf_plugin SHARED) 183 - target_sources(sdf_plugin PRIVATE ${MUJOCO_SDF_SRCS}) 184 - target_include_directories(sdf_plugin PRIVATE ${MUJOCO_SDF_INCLUDE}) 185 - -target_link_libraries(sdf_plugin PRIVATE mujoco SdfLib) 186 - +target_link_libraries(sdf_plugin PRIVATE mujoco SdfLib::SdfLib) 187 - target_compile_options( 188 - sdf_plugin 189 - PRIVATE ${AVX_COMPILE_OPTIONS} 190 151 diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt 191 152 index 666a3725..d89bb499 100644 192 153 --- a/python/mujoco/util/CMakeLists.txt
+12 -59
pkgs/by-name/mu/mujoco/package.nix
··· 36 36 eigen3 = fetchFromGitLab { 37 37 owner = "libeigen"; 38 38 repo = "eigen"; 39 - rev = "81044ec13df7608d0d9d86aff2ef9805fc69bed1"; 40 - hash = "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="; 39 + rev = "4be7e6b4e0a82853e853c0c7c4ef72f395e1f497"; 40 + hash = "sha256-SOTQ9j8YCsEuxNULsulQ0bmtxOZJKF7zc4GZOQlrmdo="; 41 41 }; 42 42 googletest = fetchFromGitHub { 43 43 owner = "google"; ··· 54 54 qhull = fetchFromGitHub { 55 55 owner = "qhull"; 56 56 repo = "qhull"; 57 - rev = "c7bee59d068a69f427b1273e71cdc5bc455a5bdd"; 58 - hash = "sha256-RnuaRrWMQ1rFfb/nxE0ukIoBf2AMG5pRyFmKmvsJ/U8="; 57 + rev = "62ccc56af071eaa478bef6ed41fd7a55d3bb2d80"; 58 + hash = "sha256-kIxHtE0L/axV9WKnQzyFN0mxoIFAI33Z+MP0P/MtQPw="; 59 59 }; 60 60 tinyobjloader = fetchFromGitHub { 61 61 owner = "tinyobjloader"; ··· 75 75 rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d"; 76 76 hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw="; 77 77 }; 78 - 79 - tmd = stdenv.mkDerivation { 80 - name = "TriangleMeshDistance"; 81 - 82 - src = fetchFromGitHub { 83 - owner = "InteractiveComputerGraphics"; 84 - repo = "TriangleMeshDistance"; 85 - rev = "e55a15c20551f36242fd6368df099a99de71d43a"; 86 - hash = "sha256-vj6TMMT8mp7ciLa5nzVAhMWPcAHXq+ZwHlWsRA3uCmg="; 87 - }; 88 - 89 - installPhase = '' 90 - mkdir -p $out/include/tmd 91 - cp TriangleMeshDistance/include/tmd/TriangleMeshDistance.h $out/include/tmd/ 92 - ''; 78 + trianglemeshdistance = fetchFromGitHub { 79 + owner = "InteractiveComputerGraphics"; 80 + repo = "TriangleMeshDistance"; 81 + rev = "2cb643de1436e1ba8e2be49b07ec5491ac604457"; 82 + hash = "sha256-qG/8QKpOnUpUQJ1nLj+DFoLnUr+9oYkJPqUhwEQD2pc="; 93 83 }; 94 - 95 - sdflib = stdenv.mkDerivation { 96 - name = "SdfLib"; 97 - 98 - src = fetchFromGitHub { 99 - owner = "UPC-ViRVIG"; 100 - repo = "SdfLib"; 101 - rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae"; 102 - hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE="; 103 - }; 104 - 105 - patches = [ ./sdflib-system-deps.patch ]; 106 - 107 - cmakeFlags = [ 108 - (lib.cmakeBool "SDFLIB_USE_ASSIMP" false) 109 - (lib.cmakeBool "SDFLIB_USE_OPENMP" false) 110 - (lib.cmakeBool "SDFLIB_USE_ENOKI" false) 111 - (lib.cmakeBool "SDFLIB_USE_SYSTEM_GLM" true) 112 - (lib.cmakeBool "SDFLIB_USE_SYSTEM_SPDLOG" true) 113 - (lib.cmakeBool "SDFLIB_USE_SYSTEM_CEREAL" true) 114 - (lib.cmakeBool "SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE" true) 115 - ]; 116 - 117 - nativeBuildInputs = [ cmake ]; 118 - buildInputs = [ 119 - pin.tmd 120 - 121 - # Mainline. The otherwise pinned glm release from 2018 does 122 - # not build due to test failures and missing files. 123 - glm 124 - 125 - spdlog 126 - cereal_1_3_2 127 - ]; 128 - }; 129 - 130 84 }; 131 85 132 86 in 133 87 stdenv.mkDerivation (finalAttrs: { 134 88 pname = "mujoco"; 135 - version = "3.3.4"; 89 + version = "3.3.5"; 136 90 137 91 # Bumping version? Make sure to look though the MuJoCo's commit 138 92 # history for bumped dependency pins! ··· 140 94 owner = "google-deepmind"; 141 95 repo = "mujoco"; 142 96 tag = finalAttrs.version; 143 - hash = "sha256-nssmGJRrk1BECmeU4OEs/jLK3MdA6ytIJ9Yqaiuf0Aw="; 97 + hash = "sha256-HykExdosK5XpAOQeic/jsc6yYxjdoiaP8rRkA/yAfuU="; 144 98 }; 145 99 146 100 patches = [ ./mujoco-system-deps-dont-fetch.patch ]; ··· 148 102 nativeBuildInputs = [ cmake ]; 149 103 150 104 buildInputs = [ 151 - pin.sdflib 152 105 glm 153 106 154 107 # non-numerical ··· 158 111 ]; 159 112 160 113 cmakeFlags = [ 161 - (lib.cmakeBool "MUJOCO_USE_SYSTEM_sdflib" true) 162 114 (lib.cmakeBool "MUJOCO_SIMULATE_USE_SYSTEM_GLFW" true) 163 115 (lib.cmakeBool "MUJOCO_SAMPLES_USE_SYSTEM_GLFW" true) 164 116 ]; ··· 175 127 ln -s ${pin.qhull} build/_deps/qhull-src 176 128 ln -s ${pin.tinyobjloader} build/_deps/tinyobjloader-src 177 129 ln -s ${pin.tinyxml2} build/_deps/tinyxml2-src 130 + ln -s ${pin.trianglemeshdistance} build/_deps/trianglemeshdistance-src 178 131 ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src 179 132 ''; 180 133
-192
pkgs/by-name/mu/mujoco/sdflib-system-deps.patch
··· 1 - diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index 251c456..3d30231 100644 3 - --- a/CMakeLists.txt 4 - +++ b/CMakeLists.txt 5 - @@ -27,7 +27,7 @@ option(SDFLIB_USE_SYSTEM_GLM "Use glm library via find_package instead of downlo 6 - option(SDFLIB_USE_SYSTEM_SPDLOG "Use spdlog library via find_package instead of downloading it" OFF) 7 - option(SDFLIB_USE_SYSTEM_CEREAL "Use cereal library via find_package instead of downloading it" OFF) 8 - option(SDFLIB_USE_SYSTEM_ASSIMP "Use assimp library via find_package instead of downloading it" OFF) 9 - - 10 - +option(SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE "Use TriangleMeshDistance library via system includes instead of downloading it" OFF) 11 - 12 - if(SDFLIB_DEBUG_INFO) 13 - add_compile_definitions(SDFLIB_PRINT_STATISTICS) 14 - @@ -55,13 +55,52 @@ file(GLOB UTILS_SOURCE_FILES src/utils/*.cpp) 15 - file(GLOB UTILS_HEADER_FILES src/utils/*.h) 16 - 17 - # Add libraries 18 - -add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES} ${PUBLIC_HEADER_FILES} 19 - - ${SDF_SOURCE_FILES} ${SDF_HEADER_FILES} 20 - - ${UTILS_SOURCE_FILES} ${UTILS_HEADER_FILES}) 21 - - 22 - -target_include_directories(${PROJECT_NAME} PUBLIC include/) 23 - +add_library(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES} ${PUBLIC_HEADER_FILES} 24 - + ${SDF_SOURCE_FILES} ${SDF_HEADER_FILES} 25 - + ${UTILS_SOURCE_FILES} ${UTILS_HEADER_FILES}) 26 - +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) 27 - +if(BUILD_SHARED_LIBS AND WIN32) 28 - + set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) 29 - +endif() 30 - +include(GNUInstallDirs) 31 - +target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> 32 - + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 33 - target_include_directories(${PROJECT_NAME} PRIVATE src/) 34 - 35 - +# Install library and CMake config files 36 - +install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}) 37 - +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/SdfLib 38 - + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 39 - + 40 - +install(EXPORT ${PROJECT_NAME} 41 - + FILE ${PROJECT_NAME}Targets.cmake 42 - + DESTINATION lib/cmake/${PROJECT_NAME} 43 - + NAMESPACE ${PROJECT_NAME}:: 44 - +) 45 - + 46 - +include(CMakePackageConfigHelpers) 47 - +set(PACKAGE_DEPENDENCIES "") 48 - +if(SDFLIB_USE_SYSTEM_GLM) 49 - + string(APPEND PACKAGE_DEPENDENCIES "find_dependency(glm)\n") 50 - +endif() 51 - +if(SDFLIB_USE_SYSTEM_SPDLOG) 52 - + string(APPEND PACKAGE_DEPENDENCIES "find_dependency(spdlog)\n") 53 - +endif() 54 - +if(SDFLIB_USE_SYSTEM_CEREAL) 55 - + string(APPEND PACKAGE_DEPENDENCIES "find_dependency(cereal)\n") 56 - +endif() 57 - +if(SDFLIB_USE_ASSIMP AND SDFLIB_USE_SYSTEM_ASSIMP) 58 - + string(APPEND PACKAGE_DEPENDENCIES "find_dependency(assimp)\n") 59 - +endif() 60 - + 61 - +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in 62 - + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" 63 - + INSTALL_DESTINATION "lib/cmake/${PROJECT_NAME}" 64 - + NO_SET_AND_CHECK_MACRO 65 - + NO_CHECK_REQUIRED_COMPONENTS_MACRO) 66 - +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake 67 - + DESTINATION lib/cmake/${PROJECT_NAME}) 68 - + 69 - # Add shaders 70 - file(GLOB SHADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src/render_engine/shaders 71 - src/render_engine/shaders/*.frag 72 - @@ -69,7 +108,7 @@ file(GLOB SHADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src/render_engine/sh 73 - src/render_engine/shaders/*.comp) 74 - 75 - foreach(SHADER IN LISTS SHADER_FILES) 76 - - add_custom_command(OUTPUT ${SHADER} 77 - +add_custom_command(OUTPUT ${SHADER} 78 - COMMAND cmake -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/src/render_engine/shaders/${SHADER} $<TARGET_FILE_DIR:${PROJECT_NAME}>/shaders/${SHADER} 79 - DEPENDS src/render_engine/shaders/${SHADER} 80 - ) 81 - @@ -112,7 +151,10 @@ endif() 82 - target_link_libraries(${PROJECT_NAME} PUBLIC ${SDFLIB_GLM_TARGET}) 83 - target_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog) 84 - target_link_libraries(${PROJECT_NAME} PUBLIC cereal::cereal) 85 - -target_link_libraries(${PROJECT_NAME} PUBLIC icg) 86 - + 87 - +if(NOT SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE) 88 - + target_link_libraries(${PROJECT_NAME} PUBLIC TriangleMeshDistance) 89 - +endif() 90 - 91 - if(CMAKE_CXX_COMPILER_ID MATCHES GNU) 92 - target_link_libraries(${PROJECT_NAME} PUBLIC -lstdc++fs) 93 - diff --git a/SdfLibConfig.cmake.in b/SdfLibConfig.cmake.in 94 - new file mode 100644 95 - index 0000000..9b8265c 96 - --- /dev/null 97 - +++ b/SdfLibConfig.cmake.in 98 - @@ -0,0 +1,7 @@ 99 - +@PACKAGE_INIT@ 100 - + 101 - +include(CMakeFindDependencyMacro) 102 - + 103 - +@PACKAGE_DEPENDENCIES@ 104 - + 105 - +include("${CMAKE_CURRENT_LIST_DIR}/SdfLibTargets.cmake") 106 - diff --git a/include/SdfLib/TrianglesInfluence.h b/include/SdfLib/TrianglesInfluence.h 107 - index fc2ca52..b276f23 100644 108 - --- a/include/SdfLib/TrianglesInfluence.h 109 - +++ b/include/SdfLib/TrianglesInfluence.h 110 - @@ -11,7 +11,7 @@ 111 - #include "InterpolationMethods.h" 112 - #include "utils/Timer.h" 113 - #include "utils/GJK.h" 114 - -#include <InteractiveComputerGraphics/TriangleMeshDistance.h> 115 - +#include <tmd/TriangleMeshDistance.h> 116 - 117 - #include <vector> 118 - #include <array> 119 - diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt 120 - index 79f70c1..e2a4f10 100644 121 - --- a/libs/CMakeLists.txt 122 - +++ b/libs/CMakeLists.txt 123 - @@ -137,9 +137,10 @@ if(SDFLIB_BUILD_APPS OR SDFLIB_BUILD_DEBUG_APPS) 124 - target_include_directories(stb_image INTERFACE stb) 125 - endif() 126 - 127 - -# icg 128 - -add_library(icg INTERFACE) 129 - -target_include_directories(icg INTERFACE InteractiveComputerGraphics) 130 - +if (NOT SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE) 131 - + add_library(TriangleMeshDistance INTERFACE) 132 - + target_include_directories(TriangleMeshDistance INTERFACE InteractiveComputerGraphics) 133 - +endif() 134 - 135 - if(SDFLIB_BUILD_APPS OR SDFLIB_BUILD_DEBUG_APPS) 136 - # glfw 137 - diff --git a/libs/InteractiveComputerGraphics/InteractiveComputerGraphics/TriangleMeshDistance.h b/libs/InteractiveComputerGraphics/tmd/TriangleMeshDistance.h 138 - similarity index 100% 139 - rename from libs/InteractiveComputerGraphics/InteractiveComputerGraphics/TriangleMeshDistance.h 140 - rename to libs/InteractiveComputerGraphics/tmd/TriangleMeshDistance.h 141 - diff --git a/src/tools/ImageQueryTime/main.cpp b/src/tools/ImageQueryTime/main.cpp 142 - index 357a78b..f4fd9e7 100644 143 - --- a/src/tools/ImageQueryTime/main.cpp 144 - +++ b/src/tools/ImageQueryTime/main.cpp 145 - @@ -17,7 +17,7 @@ 146 - 147 - #define TEST_METHODS 148 - #ifdef TEST_METHODS 149 - -#include <InteractiveComputerGraphics/TriangleMeshDistance.h> 150 - +#include <tmd/TriangleMeshDistance.h> 151 - // #include <CGAL/Simple_cartesian.h> 152 - // #include <CGAL/AABB_tree.h> 153 - // #include <CGAL/AABB_traits.h> 154 - diff --git a/src/tools/SdfErrorCompare/main.cpp b/src/tools/SdfErrorCompare/main.cpp 155 - index deef25f..9e402c4 100644 156 - --- a/src/tools/SdfErrorCompare/main.cpp 157 - +++ b/src/tools/SdfErrorCompare/main.cpp 158 - @@ -23,7 +23,7 @@ using namespace sdflib; 159 - // #define TEST_OPENVDB 160 - 161 - #ifdef TEST_ICG 162 - -#include <InteractiveComputerGraphics/TriangleMeshDistance.h> 163 - +#include <tmd/TriangleMeshDistance.h> 164 - #endif 165 - #ifdef TEST_CGAL 166 - #include <CGAL/Simple_cartesian.h> 167 - diff --git a/src/tools/SdfLibUnity/SdfExportFunc.cpp b/src/tools/SdfLibUnity/SdfExportFunc.cpp 168 - index ff4e017..7e06ada 100644 169 - --- a/src/tools/SdfLibUnity/SdfExportFunc.cpp 170 - +++ b/src/tools/SdfLibUnity/SdfExportFunc.cpp 171 - @@ -1,7 +1,7 @@ 172 - #include "SdfExportFunc.h" 173 - #include "spdlog/sinks/rotating_file_sink.h" 174 - 175 - -#include <InteractiveComputerGraphics/TriangleMeshDistance.h> 176 - +#include <tmd/TriangleMeshDistance.h> 177 - 178 - using namespace sdflib; 179 - 180 - diff --git a/src/tools/SdfOffsets/main.cpp b/src/tools/SdfOffsets/main.cpp 181 - index b6769d7..07f137b 100644 182 - --- a/src/tools/SdfOffsets/main.cpp 183 - +++ b/src/tools/SdfOffsets/main.cpp 184 - @@ -9,7 +9,7 @@ 185 - #include <glm/gtc/type_ptr.hpp> 186 - #include <glm/gtc/matrix_transform.hpp> 187 - 188 - -#include <InteractiveComputerGraphics/TriangleMeshDistance.h> 189 - +#include <tmd/TriangleMeshDistance.h> 190 - #include <CGAL/Surface_mesh_default_triangulation_3.h> 191 - #include <CGAL/Complex_2_in_triangulation_3.h> 192 - #include <CGAL/make_surface_mesh.h>
+1 -1
pkgs/development/python-modules/mujoco/default.nix
··· 38 38 # in the project's CI. 39 39 src = fetchPypi { 40 40 inherit pname version; 41 - hash = "sha256-c9dk/pji3tnSx15k71axDUTHiDOVFmAwmVpKw++5o20="; 41 + hash = "sha256-+fxlUPye2XaCI9stezzDK1oC656IcoK0DkUcJmrxakY="; 42 42 }; 43 43 44 44 nativeBuildInputs = [ cmake ];