Rename buffer_util to mesh.

PiperOrigin-RevId: 895897940 Change-Id: Ic6d4315fd6429efda81d24168548271a1a1f03c5
2026-04-07 07:48:57 -07:00
parent a3c9115d1e
commit b61d304126
16 changed files with 19 additions and 20 deletions
@@ -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
@@ -27,7 +27,7 @@
 #include <math/vec2.h>
 #include <math/vec3.h>
 #include <math/vec4.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"
 #include "experimental/filament/filament/vertex_util.h"

 namespace mujoco {
@@ -16,7 +16,7 @@
 #define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUILTINS_H_

 #include <filament/Engine.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"

 // Generates buffers for built-in shapes.
 namespace mujoco {
@@ -32,10 +32,10 @@
 #include <utils/Entity.h>
 #include <mujoco/mjvisualize.h>
 #include <mujoco/mujoco.h>
-#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"
@@ -23,7 +23,7 @@
 #include <filament/IndexBuffer.h>
 #include <filament/VertexBuffer.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"

 namespace mujoco {

@@ -17,7 +17,7 @@

 #include <filament/Engine.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"

 namespace mujoco {

@@ -31,7 +31,7 @@
 #include <utils/EntityManager.h>
 #include <mujoco/mjrender.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"
 #include "experimental/filament/filament/texture.h"

 namespace mujoco {
@@ -29,7 +29,7 @@
 #include <filament/Texture.h>
 #include <filament/View.h>
 #include <mujoco/mjrender.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"
 #include "experimental/filament/filament/texture.h"

 namespace mujoco {
@@ -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 <cfloat>
 #include <cstddef>
@@ -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 <cstddef>
 #include <functional>
@@ -179,4 +179,4 @@ using MeshPtr = std::unique_ptr<Mesh>;

 }  // namespace mujoco

-#endif  // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUFFER_UTIL_H_
+#endif  // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MESH_H_
@@ -19,14 +19,13 @@
 #include <utility>
 #include <vector>

-#include <filament/Box.h>
 #include <filament/Engine.h>
 #include <filament/IndirectLight.h>
 #include <filament/Material.h>
 #include <filament/Skybox.h>
 #include <mujoco/mujoco.h>
-#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"

@@ -25,7 +25,7 @@
 #include <filament/Skybox.h>
 #include <math/vec3.h>
 #include <mujoco/mjmodel.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"
 #include "experimental/filament/filament/texture.h"

 namespace mujoco {
@@ -26,8 +26,8 @@
 #include <math/vec4.h>
 #include <mujoco/mjmodel.h>
 #include <mujoco/mujoco.h>
-#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 {
@@ -22,7 +22,7 @@
 #include <math/vec4.h>
 #include <mujoco/mjmodel.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"

 namespace mujoco {

@@ -22,7 +22,7 @@
 #include <filament/Scene.h>
 #include <utils/EntityManager.h>
 #include <mujoco/mujoco.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"

 namespace mujoco {

@@ -21,7 +21,7 @@
 #include <filament/Engine.h>
 #include <filament/Scene.h>
 #include <utils/Entity.h>
-#include "experimental/filament/filament/buffer_util.h"
+#include "experimental/filament/filament/mesh.h"

 namespace mujoco {