From 01d5be61e3343081e8e757296dbecf23ca57768b Mon Sep 17 00:00:00 2001 From: Haroon Qureshi Date: Fri, 12 Jun 2026 07:17:21 -0700 Subject: [PATCH] Move ModelObjects and LightManager to filament/support. PiperOrigin-RevId: 931136854 Change-Id: I3ce3b7265c5d3c9a49fa84be46e87a76c6e2c8b5 --- src/experimental/filament/CMakeLists.txt | 4 ---- src/experimental/filament/compat/scene_bridge.cc | 4 ++-- src/experimental/filament/compat/scene_bridge.h | 4 ++-- src/experimental/filament/compat/scene_geom_util.cc | 2 +- src/experimental/filament/compat/scene_geom_util.h | 4 ++-- src/render/filament/CMakeLists.txt | 4 ++++ .../filament/support}/light_manager.cc | 4 ++-- .../compat => render/filament/support}/light_manager.h | 10 +++++----- .../filament/support}/model_objects.cc | 2 +- .../compat => render/filament/support}/model_objects.h | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) rename src/{experimental/filament/compat => render/filament/support}/light_manager.cc (98%) rename src/{experimental/filament/compat => render/filament/support}/light_manager.h (83%) rename src/{experimental/filament/compat => render/filament/support}/model_objects.cc (99%) rename src/{experimental/filament/compat => render/filament/support}/model_objects.h (93%) diff --git a/src/experimental/filament/CMakeLists.txt b/src/experimental/filament/CMakeLists.txt index 6f0b8ebf..321170da 100644 --- a/src/experimental/filament/CMakeLists.txt +++ b/src/experimental/filament/CMakeLists.txt @@ -21,10 +21,6 @@ target_compile_definitions(${MUJOCO_FILAMENT_EXPERIMENTAL_TARGET_NAME} PRIVATE M target_sources(${MUJOCO_FILAMENT_EXPERIMENTAL_TARGET_NAME} PUBLIC - compat/light_manager.cc - compat/light_manager.h - compat/model_objects.cc - compat/model_objects.h compat/scene_bridge.cc compat/scene_bridge.h compat/scene_geom_util.cc diff --git a/src/experimental/filament/compat/scene_bridge.cc b/src/experimental/filament/compat/scene_bridge.cc index b4fcee85..c9d2250f 100644 --- a/src/experimental/filament/compat/scene_bridge.cc +++ b/src/experimental/filament/compat/scene_bridge.cc @@ -25,13 +25,13 @@ #include #include #include -#include "experimental/filament/compat/light_manager.h" -#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/compat/scene_geom_util.h" #include "experimental/filament/compat/scene_objects.h" #include "render/filament/mjrfilament.h" #include "render/filament/mjrfilament_cpp.h" #include "render/filament/support/filament_util.h" +#include "render/filament/support/light_manager.h" +#include "render/filament/support/model_objects.h" namespace mujoco { diff --git a/src/experimental/filament/compat/scene_bridge.h b/src/experimental/filament/compat/scene_bridge.h index 961d5776..f1c8c08f 100644 --- a/src/experimental/filament/compat/scene_bridge.h +++ b/src/experimental/filament/compat/scene_bridge.h @@ -24,11 +24,11 @@ #include #include #include -#include "experimental/filament/compat/light_manager.h" -#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/compat/scene_objects.h" #include "render/filament/mjrfilament.h" #include "render/filament/mjrfilament_cpp.h" +#include "render/filament/support/model_objects.h" +#include "render/filament/support/light_manager.h" namespace mujoco { diff --git a/src/experimental/filament/compat/scene_geom_util.cc b/src/experimental/filament/compat/scene_geom_util.cc index 5b0b1b96..48ed3fe2 100644 --- a/src/experimental/filament/compat/scene_geom_util.cc +++ b/src/experimental/filament/compat/scene_geom_util.cc @@ -21,10 +21,10 @@ #include #include -#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/compat/scene_objects.h" #include "render/filament/mjrfilament.h" #include "render/filament/mjrfilament_cpp.h" +#include "render/filament/support/model_objects.h" namespace mujoco { diff --git a/src/experimental/filament/compat/scene_geom_util.h b/src/experimental/filament/compat/scene_geom_util.h index 3ec3ff32..57954315 100644 --- a/src/experimental/filament/compat/scene_geom_util.h +++ b/src/experimental/filament/compat/scene_geom_util.h @@ -17,10 +17,10 @@ #include #include -#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/compat/scene_objects.h" -#include "render/filament/mjrfilament.h" #include "render/filament/mjrfilament_cpp.h" +#include "render/filament/mjrfilament.h" +#include "render/filament/support/model_objects.h" namespace mujoco { diff --git a/src/render/filament/CMakeLists.txt b/src/render/filament/CMakeLists.txt index dff9cf18..07b17e59 100644 --- a/src/render/filament/CMakeLists.txt +++ b/src/render/filament/CMakeLists.txt @@ -55,6 +55,10 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} core/texture.h support/filament_util.h support/filament_util.cc + support/light_manager.h + support/light_manager.cc + support/model_objects.h + support/model_objects.cc ) target_include_directories(${MUJOCO_FILAMENT_TARGET_NAME} diff --git a/src/experimental/filament/compat/light_manager.cc b/src/render/filament/support/light_manager.cc similarity index 98% rename from src/experimental/filament/compat/light_manager.cc rename to src/render/filament/support/light_manager.cc index 6ed58539..b1c1f259 100644 --- a/src/experimental/filament/compat/light_manager.cc +++ b/src/render/filament/support/light_manager.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/compat/light_manager.h" +#include "render/filament/support/light_manager.h" #include #include @@ -23,10 +23,10 @@ #include #include #include -#include "experimental/filament/compat/model_objects.h" #include "render/filament/mjrfilament_cpp.h" #include "render/filament/mjrfilament.h" #include "render/filament/support/filament_util.h" +#include "render/filament/support/model_objects.h" namespace mujoco { diff --git a/src/experimental/filament/compat/light_manager.h b/src/render/filament/support/light_manager.h similarity index 83% rename from src/experimental/filament/compat/light_manager.h rename to src/render/filament/support/light_manager.h index 37e830fa..17970ea0 100644 --- a/src/experimental/filament/compat/light_manager.h +++ b/src/render/filament/support/light_manager.h @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_LIGHT_MANAGER_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_LIGHT_MANAGER_H_ +#ifndef MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_LIGHT_MANAGER_H_ +#define MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_LIGHT_MANAGER_H_ #include -#include "experimental/filament/compat/model_objects.h" #include "render/filament/mjrfilament.h" #include "render/filament/mjrfilament_cpp.h" +#include "render/filament/support/model_objects.h" namespace mujoco { -// Manages Light entities for an mjrfScene using data from an mjvScene. +// Manages Light entities for an mjrfScene. class LightManager { public: LightManager(mjrfContext* ctx, mjrfScene* scene, ModelObjects* model_objects); @@ -53,4 +53,4 @@ class LightManager { } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_LIGHT_MANAGER_H_ +#endif // MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_LIGHT_MANAGER_H_ diff --git a/src/experimental/filament/compat/model_objects.cc b/src/render/filament/support/model_objects.cc similarity index 99% rename from src/experimental/filament/compat/model_objects.cc rename to src/render/filament/support/model_objects.cc index a4711674..abc408f4 100644 --- a/src/experimental/filament/compat/model_objects.cc +++ b/src/render/filament/support/model_objects.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/compat/model_objects.h" +#include "render/filament/support/model_objects.h" #include #include diff --git a/src/experimental/filament/compat/model_objects.h b/src/render/filament/support/model_objects.h similarity index 93% rename from src/experimental/filament/compat/model_objects.h rename to src/render/filament/support/model_objects.h index c1de7a3d..22e11037 100644 --- a/src/experimental/filament/compat/model_objects.h +++ b/src/render/filament/support/model_objects.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_ +#ifndef MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_MODEL_OBJECTS_H_ +#define MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_MODEL_OBJECTS_H_ #include @@ -81,4 +81,4 @@ class ModelObjects { } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_ +#endif // MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_MODEL_OBJECTS_H_