Move ModelObjects and LightManager to filament/support.

PiperOrigin-RevId: 931136854
Change-Id: I3ce3b7265c5d3c9a49fa84be46e87a76c6e2c8b5

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

src/experimental/filament/compat/scene_bridge.cc

@@ -25,13 +25,13 @@
 #include <math/vec3.h>
 #include <math/vec4.h>
 #include <mujoco/mujoco.h>
-#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 {
 

src/experimental/filament/compat/scene_bridge.h

@@ -24,11 +24,11 @@
 #include <math/vec3.h>
 #include <mujoco/mjvisualize.h>
 #include <mujoco/mujoco.h>
-#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 {
 

src/experimental/filament/compat/scene_geom_util.cc

@@ -21,10 +21,10 @@
 
 #include <mujoco/mjvisualize.h>
 #include <mujoco/mujoco.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"
 
 namespace mujoco {
 

src/experimental/filament/compat/scene_geom_util.h

@@ -17,10 +17,10 @@
 
 #include <mujoco/mjvisualize.h>
 #include <mujoco/mujoco.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/mjrfilament.h"
+#include "render/filament/support/model_objects.h"
 
 namespace mujoco {
 

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}

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 <memory>
 #include <string>
@@ -23,10 +23,10 @@
 #include <math/vec3.h>
 #include <math/vec4.h>
 #include <mujoco/mujoco.h>
-#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 {
 

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_
+#ifndef MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_LIGHT_MANAGER_H_
-#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_LIGHT_MANAGER_H_
+#define MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_LIGHT_MANAGER_H_
 
 #include <vector>
 
-#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_

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 <algorithm>
 #include <cfloat>

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_
+#ifndef MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_MODEL_OBJECTS_H_
-#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_
+#define MUJOCO_SRC_RENDER_FILAMENT_SUPPORT_MODEL_OBJECTS_H_
 
 #include <unordered_map>
 
@@ -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_