Update studio build script and instructions.
Mujoco studio now works on Windows and MacOS. PiperOrigin-RevId: 840235447 Change-Id: I66d3430d5d994de2eb13ee08ad3051c6c7187e12
This commit is contained in:
committed by
Copybara-Service
parent
c5cd276e1f
commit
680e9a6b79
@@ -13,7 +13,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
set(MUJOCO_DEP_VERSION_dear_imgui
|
set(MUJOCO_DEP_VERSION_dear_imgui
|
||||||
v1.92.4-docking
|
3109131a882daec56a530aff540416983c240443
|
||||||
CACHE STRING "Tag/version of `dear_imgui` to be fetched."
|
CACHE STRING "Tag/version of `dear_imgui` to be fetched."
|
||||||
)
|
)
|
||||||
mark_as_advanced(MUJOCO_DEP_VERSION_dear_imgui)
|
mark_as_advanced(MUJOCO_DEP_VERSION_dear_imgui)
|
||||||
|
|||||||
@@ -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
|
and the default renderer has been switched to Filament. The application is
|
||||||
still WIP, see the [Future Work](#future-work) section for details.
|
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
|
## Usage
|
||||||
|
|
||||||
Configure and build MuJoCo Studio by running this command from the top-level
|
Configure and build MuJoCo Studio by running this command from the top-level
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ if [[ "$do_configure" == true ]]; then
|
|||||||
"-DCMAKE_BUILD_TYPE=${build_type}"
|
"-DCMAKE_BUILD_TYPE=${build_type}"
|
||||||
"-DUSE_STATIC_LIBCXX=OFF"
|
"-DUSE_STATIC_LIBCXX=OFF"
|
||||||
"-DBUILD_SHARED_LIB=OFF"
|
"-DBUILD_SHARED_LIB=OFF"
|
||||||
"-DMUJOCO_USE_FILAMENT=OFF"
|
"-DMUJOCO_USE_FILAMENT=ON"
|
||||||
"-DMUJOCO_USE_FILAMENT_VULKAN=OFF"
|
"-DMUJOCO_USE_FILAMENT_VULKAN=OFF"
|
||||||
"-DMUJOCO_BUILD_EXAMPLES=OFF"
|
"-DMUJOCO_BUILD_EXAMPLES=OFF"
|
||||||
"-DMUJOCO_BUILD_SIMULATE=OFF"
|
"-DMUJOCO_BUILD_SIMULATE=OFF"
|
||||||
@@ -69,6 +69,12 @@ if [[ "$do_configure" == true ]]; then
|
|||||||
"-DMUJOCO_TEST_PYTHON_UTIL=OFF"
|
"-DMUJOCO_TEST_PYTHON_UTIL=OFF"
|
||||||
"-DMUJOCO_WITH_USD=OFF"
|
"-DMUJOCO_WITH_USD=OFF"
|
||||||
"-DMUJOCO_BUILD_STUDIO=ON"
|
"-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.
|
# Add user-defined CMAKE_ARGS at the end so they override other settings.
|
||||||
|
|||||||
Reference in New Issue
Block a user