From e17e3bfd827875fa78cde09e476efdb2ec810ec0 Mon Sep 17 00:00:00 2001
From: Haroon Qureshi <haroonq@google.com>
Date: Fri, 27 Mar 2026 07:57:12 -0700
Subject: [PATCH] Remove ObjectManager dependency from Light.

PiperOrigin-RevId: 890454094
Change-Id: Idb609ad6d8ed7df714cad7b0aca997fee73ab96d
---
 src/experimental/filament/filament/light.cc      | 5 ++---
 src/experimental/filament/filament/light.h       | 3 +--
 src/experimental/filament/filament/scene_view.cc | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/experimental/filament/filament/light.cc b/src/experimental/filament/filament/light.cc
index e0c090f7..cbc68092 100644
--- a/src/experimental/filament/filament/light.cc
+++ b/src/experimental/filament/filament/light.cc
@@ -23,12 +23,11 @@
 #include <utils/Entity.h>
 #include <utils/EntityManager.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/object_manager.h"
 
 namespace mujoco {
 
-Light::Light(ObjectManager* object_mgr, const Params& params)
-    : engine_(object_mgr->GetEngine()), params_(params) {
+Light::Light(filament::Engine* engine, const Params& params)
+    : engine_(engine), params_(params) {
   filament::LightManager::Type type;
   switch (params.type) {
     case mjLIGHT_SPOT:
diff --git a/src/experimental/filament/filament/light.h b/src/experimental/filament/filament/light.h
index d32237eb..858b0ef8 100644
--- a/src/experimental/filament/filament/light.h
+++ b/src/experimental/filament/filament/light.h
@@ -20,7 +20,6 @@
 #include <math/vec3.h>
 #include <utils/Entity.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/object_manager.h"
 
 namespace mujoco {
 
@@ -51,7 +50,7 @@ class Light {
     bool headlight = false;
   };
 
-  Light(ObjectManager* object_mgr, const Params& params);
+  Light(filament::Engine* engine, const Params& params);
   ~Light() noexcept;
 
   Light(const Light&) = delete;
diff --git a/src/experimental/filament/filament/scene_view.cc b/src/experimental/filament/filament/scene_view.cc
index 68246dfd..cba55395 100644
--- a/src/experimental/filament/filament/scene_view.cc
+++ b/src/experimental/filament/filament/scene_view.cc
@@ -390,7 +390,7 @@ void SceneView::PrepareLights() {
         params.spot_cone_angle = model->light_cutoff[i];
       }
 
-      auto light_obj = std::make_unique<Light>(object_mgr_, params);
+      auto light_obj = std::make_unique<Light>(engine_, params);
 #ifndef __EMSCRIPTEN__
       // TODO(b/458045799): Re-enable when lights work on glinux and chromebook.
       light_obj->AddToScene(scene_);
@@ -408,7 +408,7 @@ void SceneView::PrepareLights() {
     params.type = mjLIGHT_DIRECTIONAL;
     params.castshadow = 0;
     params.intensity = 0;
-    auto light_obj = std::make_unique<Light>(object_mgr_, params);
+    auto light_obj = std::make_unique<Light>(engine_, params);
 #ifndef __EMSCRIPTEN__
     // TODO(b/458045799): Re-enable when lights work on glinux and chromebook.
     light_obj->AddToScene(scene_);