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

Rename types to conform to mjr naming conventions.

Browse Source 
PiperOrigin-RevId: 904440645
Change-Id: I0b9a0c6bd61170ace1a3ea7fb54fb70b615c346b
This commit is contained in:
Haroon Qureshi
2026-04-23 07:14:13 -07:00
committed by Copybara-Service
parent c1c7643fad
commit 4345a2a09f
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/experimental/filament/filament/imgui_bridge.cc
+4 -4
View File
@@ -276,11 +276,11 @@ void ImguiBridge::Update() {
void ImguiBridge::PrepareRenderables(int count) {
while (renderables_.size() < count) {
RenderableParams config;
DefaultRenderableParams(&config);
config.shading_model = ShadingModel::Ux;
mjrRenderableParams params;
mjr_defaultRenderableParams(&params);
params.shading_model = mjSHADING_MODEL_UX;
auto& r = renderables_.emplace_back(
std::make_unique<Renderable>(object_mgr_, config));
std::make_unique<Renderable>(object_mgr_, params));
r->SetCastShadows(false);
r->SetReceiveShadows(false);
r->SetBlendOrder(static_cast<std::uint16_t>(renderables_.size()));
src/experimental/filament/filament/renderable.cc
+8 -8
View File
@@ -36,11 +36,11 @@ namespace mujoco {
using filament::math::mat4f;
void DefaultRenderableParams(RenderableParams* params) {
params->shading_model = ShadingModel::SceneObject;
void mjr_defaultRenderableParams(mjrRenderableParams* params) {
params->shading_model = mjSHADING_MODEL_SCENE_OBJECT;
}
Renderable::Renderable(ObjectManager* object_mgr, const RenderableParams& params)
Renderable::Renderable(ObjectManager* object_mgr, const mjrRenderableParams& params)
: object_mgr_(object_mgr), params_(params) {}
Renderable::~Renderable() noexcept {
@@ -204,7 +204,7 @@ void Renderable::UpdateMaterial(const MaterialParams& params,
material_textures_ = textures;
AssignMaterial(DrawMode::Color, GetColorMaterialType());
if (params_.shading_model == ShadingModel::SceneObject) {
if (params_.shading_model == mjSHADING_MODEL_SCENE_OBJECT) {
AssignMaterial(DrawMode::Depth, ObjectManager::kUnlitDepth);
AssignMaterial(DrawMode::Segmentation, ObjectManager::kUnlitSegmentation);
}
@@ -247,7 +247,7 @@ const MaterialTextures& Renderable::GetMaterialTextures() const {
void Renderable::SetDrawMode(DrawMode mode) {
// Only SceneObjects support non-color draw modes.
if (params_.shading_model != ShadingModel::SceneObject) {
if (params_.shading_model != mjSHADING_MODEL_SCENE_OBJECT) {
mode = DrawMode::Color;
}
@@ -343,11 +343,11 @@ void Renderable::SetWireframe(bool wireframe) {
}
ObjectManager::MaterialType Renderable::GetColorMaterialType() const {
if (params_.shading_model == ShadingModel::DecorLines) {
if (params_.shading_model == mjSHADING_MODEL_DECOR_LINES) {
return ObjectManager::kUnlitLine;
} else if (params_.shading_model == ShadingModel::Decor) {
} else if (params_.shading_model == mjSHADING_MODEL_DECOR) {
return ObjectManager::kUnlitDecor;
} else if (params_.shading_model == ShadingModel::Ux) {
} else if (params_.shading_model == mjSHADING_MODEL_UX) {
return ObjectManager::kUnlitUi;
} else if (material_textures_.orm) {
return ObjectManager::kPbrPacked;
src/experimental/filament/filament/renderable.h
+11 -11
View File
@@ -33,19 +33,19 @@
namespace mujoco {
// The shading model (material) for a Renderable.
enum class ShadingModel {
SceneObject,
Decor,
DecorLines,
Ux,
};
typedef enum mjrShadingModel_ {
mjSHADING_MODEL_SCENE_OBJECT,
mjSHADING_MODEL_DECOR,
mjSHADING_MODEL_DECOR_LINES,
mjSHADING_MODEL_UX,
} mjrShadingModel;
// Configuration parameters for a Renderable.
struct RenderableParams {
ShadingModel shading_model;
struct mjrRenderableParams {
mjrShadingModel shading_model;
};
void DefaultRenderableParams(RenderableParams* params);
void mjr_defaultRenderableParams(mjrRenderableParams* params);
// A Renderable is effectively two things: a mesh and a material.
//
@@ -67,7 +67,7 @@ class Renderable {
static constexpr std::uint8_t kDefaultPriority = 4;
static constexpr std::uint8_t kDefaultLayerMask = 0x01;
Renderable(ObjectManager* object_mgr, const RenderableParams& params);
Renderable(ObjectManager* object_mgr, const mjrRenderableParams& params);
~Renderable() noexcept;
Renderable(const Renderable&) = delete;
@@ -154,7 +154,7 @@ class Renderable {
ObjectManager::MaterialType GetColorMaterialType() const;
ObjectManager* object_mgr_;
RenderableParams params_;
mjrRenderableParams params_;
filament::MaterialInstance* instances_[kNumDrawModes] = {nullptr};
MaterialParams material_params_;
MaterialTextures material_textures_;
src/experimental/filament/filament/scene_geom_util.cc
+7 -7
View File
@@ -490,17 +490,17 @@ static void UpdateGeomMaterial(Renderable& renderable, const mjvGeom& geom,
std::unique_ptr<Renderable> CreateGeomRenderable(
const mjvGeom& geom, const mjvScene* scene, ObjectManager* object_mgr,
ModelObjects* model_objs, const float headpos[3]) {
ShadingModel shading_model = ShadingModel::SceneObject;
mjrShadingModel shading_model = mjSHADING_MODEL_SCENE_OBJECT;
if (geom.type == mjGEOM_LINE || geom.type == mjGEOM_LINEBOX) {
shading_model = ShadingModel::DecorLines;
shading_model = mjSHADING_MODEL_DECOR_LINES;
} else if (geom.category == mjCAT_DECOR) {
shading_model = ShadingModel::Decor;
shading_model = mjSHADING_MODEL_DECOR;
}
RenderableParams config;
DefaultRenderableParams(&config);
config.shading_model = shading_model;
auto renderable = std::make_unique<Renderable>(object_mgr, config);
mjrRenderableParams params;
mjr_defaultRenderableParams(&params);
params.shading_model = shading_model;
auto renderable = std::make_unique<Renderable>(object_mgr, params);
PrepareGeomMeshes(*renderable, geom, scene, model_objs);
UpdateGeomMaterial(*renderable, geom, scene, model_objs, object_mgr, headpos);