chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MeshPtr type alias.

Browse Source 
PiperOrigin-RevId: 902502036
Change-Id: I5bd0c185f204518f0cd0d9189741c17c24b51eb6
This commit is contained in:
Haroon Qureshi
2026-04-20 02:01:02 -07:00
committed by Copybara-Service
parent a04c2b1b4a
commit bf9be2c312
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/experimental/filament/filament/builtins.cc
+12 -11
View File
@@ -65,7 +65,8 @@ class BuiltinBuilder : MeshData {
virtual ~BuiltinBuilder() = default;
template <typename T, typename... Args>
static MeshPtr Create(filament::Engine* engine, Args&&... args) {
static std::unique_ptr<Mesh> Create(filament::Engine* engine,
Args&&... args) {
auto builder = new T(std::forward<Args>(args)...);
MeshData* mesh_data = builder->PrepareMeshData();
mesh_data->release_callback = +[](void* user_data) {
@@ -621,43 +622,43 @@ class DomeBuilder : public BuiltinBuilder {
}
};
MeshPtr CreateLine(filament::Engine* engine) {
std::unique_ptr<Mesh> CreateLine(filament::Engine* engine) {
return BuiltinBuilder::Create<LineBuilder>(engine);
}
MeshPtr CreatePlane(filament::Engine* engine, int nquad) {
std::unique_ptr<Mesh> CreatePlane(filament::Engine* engine, int nquad) {
return BuiltinBuilder::Create<PlaneBuilder>(engine, nquad);
}
MeshPtr CreateTriangle(filament::Engine* engine) {
std::unique_ptr<Mesh> CreateTriangle(filament::Engine* engine) {
return BuiltinBuilder::Create<TriangleBuilder>(engine);
}
MeshPtr CreateBox(filament::Engine* engine, int nquad) {
std::unique_ptr<Mesh> CreateBox(filament::Engine* engine, int nquad) {
return BuiltinBuilder::Create<BoxBuilder>(engine, nquad);
}
MeshPtr CreateLineBox(filament::Engine* engine) {
std::unique_ptr<Mesh> CreateLineBox(filament::Engine* engine) {
return BuiltinBuilder::Create<LineBoxBuilder>(engine);
}
MeshPtr CreateSphere(filament::Engine* engine, int nstack, int nslice) {
std::unique_ptr<Mesh> CreateSphere(filament::Engine* engine, int nstack, int nslice) {
return BuiltinBuilder::Create<SphereBuilder>(engine, nstack, nslice);
}
MeshPtr CreateTube(filament::Engine* engine, int nstack, int nslice) {
std::unique_ptr<Mesh> CreateTube(filament::Engine* engine, int nstack, int nslice) {
return BuiltinBuilder::Create<TubeBuilder>(engine, nstack, nslice);
}
MeshPtr CreateDisk(filament::Engine* engine, int nslice) {
std::unique_ptr<Mesh> CreateDisk(filament::Engine* engine, int nslice) {
return BuiltinBuilder::Create<DiskBuilder>(engine, nslice);
}
MeshPtr CreateDome(filament::Engine* engine, int nstack, int nslice) {
std::unique_ptr<Mesh> CreateDome(filament::Engine* engine, int nstack, int nslice) {
return BuiltinBuilder::Create<DomeBuilder>(engine, nstack, nslice);
}
MeshPtr CreateCone(filament::Engine* engine, int nstack, int nslice) {
std::unique_ptr<Mesh> CreateCone(filament::Engine* engine, int nstack, int nslice) {
return BuiltinBuilder::Create<ConeBuilder>(engine, nstack, nslice);
}
src/experimental/filament/filament/builtins.h
+12 -10
View File
@@ -15,22 +15,24 @@
#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUILTINS_H_
#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_BUILTINS_H_
#include <memory>
#include <filament/Engine.h>
#include "experimental/filament/filament/mesh.h"
// Generates buffers for built-in shapes.
namespace mujoco {
MeshPtr CreateLine(filament::Engine* engine);
MeshPtr CreatePlane(filament::Engine* engine, int nquad);
MeshPtr CreateTriangle(filament::Engine* engine);
MeshPtr CreateBox(filament::Engine* engine, int nquad);
MeshPtr CreateLineBox(filament::Engine* engine);
MeshPtr CreateSphere(filament::Engine* engine, int nstack, int nslice);
MeshPtr CreateTube(filament::Engine* engine, int nstack, int nslice);
MeshPtr CreateDisk(filament::Engine* engine, int nslice);
MeshPtr CreateDome(filament::Engine* engine, int nstack, int nslice);
MeshPtr CreateCone(filament::Engine* engine, int nstack, int nslice);
std::unique_ptr<Mesh> CreateLine(filament::Engine* engine);
std::unique_ptr<Mesh> CreatePlane(filament::Engine* engine, int nquad);
std::unique_ptr<Mesh> CreateTriangle(filament::Engine* engine);
std::unique_ptr<Mesh> CreateBox(filament::Engine* engine, int nquad);
std::unique_ptr<Mesh> CreateLineBox(filament::Engine* engine);
std::unique_ptr<Mesh> CreateSphere(filament::Engine* engine, int nstack, int nslice);
std::unique_ptr<Mesh> CreateTube(filament::Engine* engine, int nstack, int nslice);
std::unique_ptr<Mesh> CreateDisk(filament::Engine* engine, int nslice);
std::unique_ptr<Mesh> CreateDome(filament::Engine* engine, int nstack, int nslice);
std::unique_ptr<Mesh> CreateCone(filament::Engine* engine, int nstack, int nslice);
} // namespace mujoco
src/experimental/filament/filament/imgui_bridge.h
+1 -1
View File
@@ -62,7 +62,7 @@ class ImguiBridge {
ObjectManager* object_mgr_ = nullptr;
SceneView* scene_view_ = nullptr;
std::vector<std::unique_ptr<Renderable>> renderables_;
std::vector<MeshPtr> meshes_;
std::vector<std::unique_ptr<Mesh>> meshes_;
std::unordered_map<uintptr_t, std::unique_ptr<Texture>> textures_;
};
src/experimental/filament/filament/mesh.h
-2
View File
@@ -185,8 +185,6 @@ class Mesh {
int num_attributes_ = 0;
};
using MeshPtr = std::unique_ptr<Mesh>;
} // namespace mujoco
#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MESH_H_