From 6da210c794d49c102a159c034456301cb27b5e55 Mon Sep 17 00:00:00 2001 From: Haroon Qureshi Date: Wed, 1 Apr 2026 05:13:19 -0700 Subject: [PATCH] Rename texture_util to texture. PiperOrigin-RevId: 892868713 Change-Id: I113132dc9e4535e94d48c4e71520acb159e2e216 --- src/experimental/filament/CMakeLists.txt | 4 ++-- src/experimental/filament/filament/drawable.cc | 2 +- src/experimental/filament/filament/drawable.h | 2 +- src/experimental/filament/filament/filament_context.cc | 2 +- src/experimental/filament/filament/gui_view.cc | 2 +- src/experimental/filament/filament/gui_view.h | 2 +- src/experimental/filament/filament/material.cc | 2 +- src/experimental/filament/filament/material.h | 2 +- src/experimental/filament/filament/model_objects.cc | 2 +- src/experimental/filament/filament/model_objects.h | 2 +- src/experimental/filament/filament/model_util.cc | 1 - src/experimental/filament/filament/object_manager.cc | 2 +- src/experimental/filament/filament/object_manager.h | 2 +- src/experimental/filament/filament/render_target_util.cc | 2 +- src/experimental/filament/filament/render_target_util.h | 2 +- src/experimental/filament/filament/scene_view.cc | 2 +- .../filament/filament/{texture_util.cc => texture.cc} | 2 +- .../filament/filament/{texture_util.h => texture.h} | 6 +++--- 18 files changed, 20 insertions(+), 21 deletions(-) rename src/experimental/filament/filament/{texture_util.cc => texture.cc} (99%) rename src/experimental/filament/filament/{texture_util.h => texture.h} (95%) diff --git a/src/experimental/filament/CMakeLists.txt b/src/experimental/filament/CMakeLists.txt index 2a0c5c8f..457a5db9 100644 --- a/src/experimental/filament/CMakeLists.txt +++ b/src/experimental/filament/CMakeLists.txt @@ -59,8 +59,8 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} filament/renderables.h filament/scene_view.cc filament/scene_view.h - filament/texture_util.cc - filament/texture_util.h + filament/texture.cc + filament/texture.h filament/vertex_util.cc filament/vertex_util.h ) diff --git a/src/experimental/filament/filament/drawable.cc b/src/experimental/filament/filament/drawable.cc index 55250600..f32afe1a 100644 --- a/src/experimental/filament/filament/drawable.cc +++ b/src/experimental/filament/filament/drawable.cc @@ -37,7 +37,7 @@ #include "experimental/filament/filament/math_util.h" #include "experimental/filament/filament/model_objects.h" #include "experimental/filament/filament/object_manager.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/drawable.h b/src/experimental/filament/filament/drawable.h index 06796aed..2f2dc81e 100644 --- a/src/experimental/filament/filament/drawable.h +++ b/src/experimental/filament/filament/drawable.h @@ -26,7 +26,7 @@ #include "experimental/filament/filament/model_objects.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/renderables.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/filament_context.cc b/src/experimental/filament/filament/filament_context.cc index 973425d1..cbd06da2 100644 --- a/src/experimental/filament/filament/filament_context.cc +++ b/src/experimental/filament/filament/filament_context.cc @@ -45,7 +45,7 @@ #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/render_target_util.h" #include "experimental/filament/filament/scene_view.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" #include "experimental/filament/render_context_filament.h" namespace mujoco { diff --git a/src/experimental/filament/filament/gui_view.cc b/src/experimental/filament/filament/gui_view.cc index 70b21cf1..1876936e 100644 --- a/src/experimental/filament/filament/gui_view.cc +++ b/src/experimental/filament/filament/gui_view.cc @@ -32,7 +32,7 @@ #include #include #include "experimental/filament/filament/buffer_util.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" #include "experimental/filament/filament/vertex_util.h" namespace mujoco { diff --git a/src/experimental/filament/filament/gui_view.h b/src/experimental/filament/filament/gui_view.h index b18ccb79..2b189324 100644 --- a/src/experimental/filament/filament/gui_view.h +++ b/src/experimental/filament/filament/gui_view.h @@ -30,7 +30,7 @@ #include #include #include "experimental/filament/filament/buffer_util.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/material.cc b/src/experimental/filament/filament/material.cc index e04e3f81..aaf9c6ba 100644 --- a/src/experimental/filament/filament/material.cc +++ b/src/experimental/filament/filament/material.cc @@ -21,7 +21,7 @@ #include #include #include "experimental/filament/filament/object_manager.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/material.h b/src/experimental/filament/filament/material.h index 849cb89e..b717b9c4 100644 --- a/src/experimental/filament/filament/material.h +++ b/src/experimental/filament/filament/material.h @@ -21,7 +21,7 @@ #include #include #include "experimental/filament/filament/object_manager.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/model_objects.cc b/src/experimental/filament/filament/model_objects.cc index b65bb1be..3df4f2e2 100644 --- a/src/experimental/filament/filament/model_objects.cc +++ b/src/experimental/filament/filament/model_objects.cc @@ -27,7 +27,7 @@ #include "experimental/filament/filament/buffer_util.h" #include "experimental/filament/filament/builtins.h" #include "experimental/filament/filament/model_util.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/model_objects.h b/src/experimental/filament/filament/model_objects.h index 94fc2987..7007e81a 100644 --- a/src/experimental/filament/filament/model_objects.h +++ b/src/experimental/filament/filament/model_objects.h @@ -26,7 +26,7 @@ #include #include #include "experimental/filament/filament/buffer_util.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/model_util.cc b/src/experimental/filament/filament/model_util.cc index 62e72d73..2bd581dd 100644 --- a/src/experimental/filament/filament/model_util.cc +++ b/src/experimental/filament/filament/model_util.cc @@ -32,7 +32,6 @@ #include #include "experimental/filament/filament/buffer_util.h" #include "experimental/filament/filament/math_util.h" -#include "experimental/filament/filament/texture_util.h" #include "experimental/filament/filament/vertex_util.h" namespace mujoco { diff --git a/src/experimental/filament/filament/object_manager.cc b/src/experimental/filament/filament/object_manager.cc index 01895161..80679284 100644 --- a/src/experimental/filament/filament/object_manager.cc +++ b/src/experimental/filament/filament/object_manager.cc @@ -28,7 +28,7 @@ #include #include #include -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" #include "user/user_resource.h" namespace mujoco { diff --git a/src/experimental/filament/filament/object_manager.h b/src/experimental/filament/filament/object_manager.h index 64d9eadf..52320347 100644 --- a/src/experimental/filament/filament/object_manager.h +++ b/src/experimental/filament/filament/object_manager.h @@ -23,7 +23,7 @@ #include #include #include -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/render_target_util.cc b/src/experimental/filament/filament/render_target_util.cc index ef221e4e..2e4ce391 100644 --- a/src/experimental/filament/filament/render_target_util.cc +++ b/src/experimental/filament/filament/render_target_util.cc @@ -19,7 +19,7 @@ #include #include #include -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/render_target_util.h b/src/experimental/filament/filament/render_target_util.h index d2d581a9..ce6b96dc 100644 --- a/src/experimental/filament/filament/render_target_util.h +++ b/src/experimental/filament/filament/render_target_util.h @@ -19,7 +19,7 @@ #include #include -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/scene_view.cc b/src/experimental/filament/filament/scene_view.cc index 9b64243e..7009dd17 100644 --- a/src/experimental/filament/filament/scene_view.cc +++ b/src/experimental/filament/filament/scene_view.cc @@ -50,7 +50,7 @@ #include "experimental/filament/filament/model_util.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/render_target_util.h" -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/texture_util.cc b/src/experimental/filament/filament/texture.cc similarity index 99% rename from src/experimental/filament/filament/texture_util.cc rename to src/experimental/filament/filament/texture.cc index b711d248..1ce62774 100644 --- a/src/experimental/filament/filament/texture_util.cc +++ b/src/experimental/filament/filament/texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/texture_util.h" +#include "experimental/filament/filament/texture.h" #include #include diff --git a/src/experimental/filament/filament/texture_util.h b/src/experimental/filament/filament/texture.h similarity index 95% rename from src/experimental/filament/filament/texture_util.h rename to src/experimental/filament/filament/texture.h index bba7b16e..44b0ea31 100644 --- a/src/experimental/filament/filament/texture_util.h +++ b/src/experimental/filament/filament/texture.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_TEXTURE_UTIL_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_TEXTURE_UTIL_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_TEXTURE_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_TEXTURE_H_ #include @@ -142,4 +142,4 @@ class Texture { }; } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_TEXTURE_UTIL_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_TEXTURE_H_