diff --git a/cmake/third_party_deps/dear_imgui.cmake b/cmake/third_party_deps/dear_imgui.cmake index c4e8bfcb..6eb32e50 100644 --- a/cmake/third_party_deps/dear_imgui.cmake +++ b/cmake/third_party_deps/dear_imgui.cmake @@ -13,7 +13,7 @@ # limitations under the License. set(MUJOCO_DEP_VERSION_dear_imgui - v1.92.4-docking + 3109131a882daec56a530aff540416983c240443 CACHE STRING "Tag/version of `dear_imgui` to be fetched." ) mark_as_advanced(MUJOCO_DEP_VERSION_dear_imgui) diff --git a/src/experimental/studio/README.md b/src/experimental/studio/README.md index 0c60d49a..5828876e 100644 --- a/src/experimental/studio/README.md +++ b/src/experimental/studio/README.md @@ -5,21 +5,6 @@ application. The UI has been reimplemented using [Dear ImGui](https://github.com and the default renderer has been switched to Filament. The application is still WIP, see the [Future Work](#future-work) section for details. -> [!CAUTION] -> Studio is a work in progress, the current state of platform support summarized -> in this table: -> -> | Renderer | Linux X11 | Linux Wayland | MacOS | Windows | -> | :------------- | :-------: | :-----------: | :---: | :-----: | -> | Filament | ✅ | ❌ | ❌ | ❌ | -> | Classic OpenGL | ✅ | ❌ | ❌ | ✅ | -> -> Note that Studio currently [compiles](../../../.github/workflows/build.yml) -> on all platforms but the crosses indicated crashes at runtime. We are actively -> working to support all the above platforms very soon, if you beat us too it -> contributions are very welcome! Note that your fixes may need to be applied in -> the upstream [Filament](https://github.com/google/filament) repository. - ## Usage Configure and build MuJoCo Studio by running this command from the top-level diff --git a/src/experimental/studio/build.sh b/src/experimental/studio/build.sh index 28e36894..63043c33 100755 --- a/src/experimental/studio/build.sh +++ b/src/experimental/studio/build.sh @@ -61,7 +61,7 @@ if [[ "$do_configure" == true ]]; then "-DCMAKE_BUILD_TYPE=${build_type}" "-DUSE_STATIC_LIBCXX=OFF" "-DBUILD_SHARED_LIB=OFF" - "-DMUJOCO_USE_FILAMENT=OFF" + "-DMUJOCO_USE_FILAMENT=ON" "-DMUJOCO_USE_FILAMENT_VULKAN=OFF" "-DMUJOCO_BUILD_EXAMPLES=OFF" "-DMUJOCO_BUILD_SIMULATE=OFF" @@ -69,6 +69,12 @@ if [[ "$do_configure" == true ]]; then "-DMUJOCO_TEST_PYTHON_UTIL=OFF" "-DMUJOCO_WITH_USD=OFF" "-DMUJOCO_BUILD_STUDIO=ON" + "-DFILAMENT_SKIP_SAMPLES=ON" + # Several dependencies generate deprecated warnings on MacOS. + "-DCMAKE_CXX_FLAGS=\"-Wno-error=deprecated-declarations\"" + # This flag defines _ITERATOR_DEBUG_LEVEL=0 which conflicts with debug + # builds. + "-DFILAMENT_SHORTEN_MSVC_COMPILATION=OFF" ) # Add user-defined CMAKE_ARGS at the end so they override other settings.