Remove separate targets for classic and filament renderer.
The platform::Renderer now supports both implementations at runtime. PiperOrigin-RevId: 878427862 Change-Id: I2997c197c6eddbe177c77b435cc5848fd80f1839
This commit is contained in:
committed by
Copybara-Service
parent
84682a46b0
commit
13d164063c
@@ -50,6 +50,7 @@ include(third_party_deps/font_awesome)
|
||||
target_link_libraries(${MUJOCO_STUDIO_TARGET_NAME}
|
||||
PRIVATE
|
||||
absl::flags
|
||||
absl::flags_parse
|
||||
dear_imgui
|
||||
implot
|
||||
mujoco::mujoco
|
||||
|
||||
@@ -32,18 +32,6 @@ If you intend to develop the application you may prefer to work from an IDE:
|
||||
* [Visual Studio](https://visualstudio.microsoft.com/). Follow these
|
||||
[instructions](https://learn.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-170).
|
||||
|
||||
## Filament Rendering
|
||||
|
||||
Studio uses legacy OpenGL rendering by default but there is an option to use
|
||||
Physically Based Rendering via [Filament](https://google.github.io/filament/Filament.md.html).
|
||||
To enable Filament you need to `-DMUJOCO_USE_FILAMENT=ON` during the cmake
|
||||
configuration step. The Filament renderer has multiple rendering backends,
|
||||
on Linux OpenGL is the default but Vulkan can be used by also providing
|
||||
the `-DMUJOCO_USE_FILAMENT_VULKAN=ON` option.
|
||||
|
||||
Also note that you will need to run the application from the folder containing
|
||||
the executable so that the expected materials/assets can be found.
|
||||
|
||||
## Known Bugs
|
||||
|
||||
* MuJoCo Studio does not yet work using Wayland on Linux, use X11 instead.
|
||||
|
||||
@@ -62,7 +62,6 @@ if [[ "$do_configure" == true ]]; then
|
||||
"-DUSE_STATIC_LIBCXX=OFF"
|
||||
"-DBUILD_SHARED_LIB=OFF"
|
||||
"-DMUJOCO_USE_FILAMENT=ON"
|
||||
"-DMUJOCO_USE_FILAMENT_VULKAN=OFF"
|
||||
"-DMUJOCO_BUILD_EXAMPLES=OFF"
|
||||
"-DMUJOCO_BUILD_SIMULATE=OFF"
|
||||
"-DMUJOCO_BUILD_TESTS=OFF"
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <absl/flags/flag.h>
|
||||
#include <absl/flags/parse.h>
|
||||
#include <mujoco/mujoco.h>
|
||||
#include "experimental/platform/graphics_mode.h"
|
||||
#include "experimental/studio/app.h"
|
||||
@@ -73,6 +74,7 @@ class FileResource {
|
||||
};
|
||||
|
||||
int main(int argc, char** argv, char** envp) {
|
||||
absl::ParseCommandLine(argc, argv);
|
||||
|
||||
const char* home = getenv("HOME");
|
||||
const std::string ini_path = std::string(home ? home : ".") + "/.mujoco.ini";
|
||||
|
||||
Reference in New Issue
Block a user