From b61d3041260559a86407bdbdba937629b8b6ce0b Mon Sep 17 00:00:00 2001 From: Haroon Qureshi Date: Tue, 7 Apr 2026 07:48:57 -0700 Subject: [PATCH] Rename buffer_util to mesh. PiperOrigin-RevId: 895897940 Change-Id: Ic6d4315fd6429efda81d24168548271a1a1f03c5 --- src/experimental/filament/CMakeLists.txt | 4 ++-- src/experimental/filament/filament/builtins.cc | 2 +- src/experimental/filament/filament/builtins.h | 2 +- src/experimental/filament/filament/drawable.cc | 2 +- src/experimental/filament/filament/geom_util.cc | 2 +- src/experimental/filament/filament/geom_util.h | 2 +- src/experimental/filament/filament/gui_view.cc | 2 +- src/experimental/filament/filament/gui_view.h | 2 +- .../filament/filament/{buffer_util.cc => mesh.cc} | 2 +- .../filament/filament/{buffer_util.h => mesh.h} | 6 +++--- src/experimental/filament/filament/model_objects.cc | 3 +-- src/experimental/filament/filament/model_objects.h | 2 +- src/experimental/filament/filament/model_util.cc | 2 +- src/experimental/filament/filament/model_util.h | 2 +- src/experimental/filament/filament/renderables.cc | 2 +- src/experimental/filament/filament/renderables.h | 2 +- 16 files changed, 19 insertions(+), 20 deletions(-) rename src/experimental/filament/filament/{buffer_util.cc => mesh.cc} (99%) rename src/experimental/filament/filament/{buffer_util.h => mesh.h} (96%) diff --git a/src/experimental/filament/CMakeLists.txt b/src/experimental/filament/CMakeLists.txt index 457a5db9..139daf8d 100644 --- a/src/experimental/filament/CMakeLists.txt +++ b/src/experimental/filament/CMakeLists.txt @@ -23,8 +23,6 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} PUBLIC render_context_filament.h render_context_filament.cc - filament/buffer_util.cc - filament/buffer_util.h filament/builtins.cc filament/builtins.h filament/color_grading_options.cc @@ -47,6 +45,8 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} filament/material.h filament/math_util.cc filament/math_util.h + filament/mesh.cc + filament/mesh.h filament/model_objects.cc filament/model_objects.h filament/model_util.cc diff --git a/src/experimental/filament/filament/builtins.cc b/src/experimental/filament/filament/builtins.cc index 21f6c7cc..40b727af 100644 --- a/src/experimental/filament/filament/builtins.cc +++ b/src/experimental/filament/filament/builtins.cc @@ -27,7 +27,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" #include "experimental/filament/filament/vertex_util.h" namespace mujoco { diff --git a/src/experimental/filament/filament/builtins.h b/src/experimental/filament/filament/builtins.h index b79083a3..c698bca8 100644 --- a/src/experimental/filament/filament/builtins.h +++ b/src/experimental/filament/filament/builtins.h @@ -16,7 +16,7 @@ #define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUILTINS_H_ #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" // Generates buffers for built-in shapes. namespace mujoco { diff --git a/src/experimental/filament/filament/drawable.cc b/src/experimental/filament/filament/drawable.cc index a377d1f6..b3649350 100644 --- a/src/experimental/filament/filament/drawable.cc +++ b/src/experimental/filament/filament/drawable.cc @@ -32,10 +32,10 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" #include "experimental/filament/filament/geom_util.h" #include "experimental/filament/filament/material.h" #include "experimental/filament/filament/math_util.h" +#include "experimental/filament/filament/mesh.h" #include "experimental/filament/filament/model_objects.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/texture.h" diff --git a/src/experimental/filament/filament/geom_util.cc b/src/experimental/filament/filament/geom_util.cc index fb64e8d0..7b02a02a 100644 --- a/src/experimental/filament/filament/geom_util.cc +++ b/src/experimental/filament/filament/geom_util.cc @@ -23,7 +23,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" namespace mujoco { diff --git a/src/experimental/filament/filament/geom_util.h b/src/experimental/filament/filament/geom_util.h index 55c14db0..939c8d91 100644 --- a/src/experimental/filament/filament/geom_util.h +++ b/src/experimental/filament/filament/geom_util.h @@ -17,7 +17,7 @@ #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" namespace mujoco { diff --git a/src/experimental/filament/filament/gui_view.cc b/src/experimental/filament/filament/gui_view.cc index 6a3bc82d..9c522325 100644 --- a/src/experimental/filament/filament/gui_view.cc +++ b/src/experimental/filament/filament/gui_view.cc @@ -31,7 +31,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" #include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/gui_view.h b/src/experimental/filament/filament/gui_view.h index d1f80cd8..5ba9fdd9 100644 --- a/src/experimental/filament/filament/gui_view.h +++ b/src/experimental/filament/filament/gui_view.h @@ -29,7 +29,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" #include "experimental/filament/filament/texture.h" namespace mujoco { diff --git a/src/experimental/filament/filament/buffer_util.cc b/src/experimental/filament/filament/mesh.cc similarity index 99% rename from src/experimental/filament/filament/buffer_util.cc rename to src/experimental/filament/filament/mesh.cc index a1ac791a..bfdad8be 100644 --- a/src/experimental/filament/filament/buffer_util.cc +++ b/src/experimental/filament/filament/mesh.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" #include #include diff --git a/src/experimental/filament/filament/buffer_util.h b/src/experimental/filament/filament/mesh.h similarity index 96% rename from src/experimental/filament/filament/buffer_util.h rename to src/experimental/filament/filament/mesh.h index 4bc6dd70..5953d0da 100644 --- a/src/experimental/filament/filament/buffer_util.h +++ b/src/experimental/filament/filament/mesh.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_BUFFER_UTIL_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUFFER_UTIL_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MESH_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MESH_H_ #include #include @@ -179,4 +179,4 @@ using MeshPtr = std::unique_ptr; } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUFFER_UTIL_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MESH_H_ diff --git a/src/experimental/filament/filament/model_objects.cc b/src/experimental/filament/filament/model_objects.cc index 3f638695..474b982d 100644 --- a/src/experimental/filament/filament/model_objects.cc +++ b/src/experimental/filament/filament/model_objects.cc @@ -19,14 +19,13 @@ #include #include -#include #include #include #include #include #include -#include "experimental/filament/filament/buffer_util.h" #include "experimental/filament/filament/builtins.h" +#include "experimental/filament/filament/mesh.h" #include "experimental/filament/filament/model_util.h" #include "experimental/filament/filament/texture.h" diff --git a/src/experimental/filament/filament/model_objects.h b/src/experimental/filament/filament/model_objects.h index f694b4de..0921169c 100644 --- a/src/experimental/filament/filament/model_objects.h +++ b/src/experimental/filament/filament/model_objects.h @@ -25,7 +25,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.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 26ecfaac..e1309bc1 100644 --- a/src/experimental/filament/filament/model_util.cc +++ b/src/experimental/filament/filament/model_util.cc @@ -26,8 +26,8 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" #include "experimental/filament/filament/math_util.h" +#include "experimental/filament/filament/mesh.h" #include "experimental/filament/filament/vertex_util.h" namespace mujoco { diff --git a/src/experimental/filament/filament/model_util.h b/src/experimental/filament/filament/model_util.h index 4ca36c86..6a23ee8f 100644 --- a/src/experimental/filament/filament/model_util.h +++ b/src/experimental/filament/filament/model_util.h @@ -22,7 +22,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" namespace mujoco { diff --git a/src/experimental/filament/filament/renderables.cc b/src/experimental/filament/filament/renderables.cc index f8cbab1c..19f530de 100644 --- a/src/experimental/filament/filament/renderables.cc +++ b/src/experimental/filament/filament/renderables.cc @@ -22,7 +22,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" namespace mujoco { diff --git a/src/experimental/filament/filament/renderables.h b/src/experimental/filament/filament/renderables.h index 2108442a..28bca459 100644 --- a/src/experimental/filament/filament/renderables.h +++ b/src/experimental/filament/filament/renderables.h @@ -21,7 +21,7 @@ #include #include #include -#include "experimental/filament/filament/buffer_util.h" +#include "experimental/filament/filament/mesh.h" namespace mujoco {