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

Move material multipliers to calling function.

Browse Source 
PiperOrigin-RevId: 890457829
Change-Id: Icb4151a792321aadd3958d479ef02f29ae4a2afc
This commit is contained in:
Haroon Qureshi
2026-03-27 08:06:16 -07:00
committed by Copybara-Service
parent e17e3bfd82
commit e4f4044659
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/experimental/filament/filament/drawable.cc
+6
View File
@@ -546,6 +546,12 @@ void Drawable::UpdateMaterial(const mjvGeom& geom, bool use_segid_color,
} }
} }
} }
// Apply material multipliers from the model.
params.emissive *= object_mgr->GetEmissiveMultiplier();
params.specular *= object_mgr->GetSpecularMultiplier();
params.glossiness *= object_mgr->GetShininessMultiplier();
material_.UpdateParams(params); material_.UpdateParams(params);
} }
} // namespace mujoco } // namespace mujoco
src/experimental/filament/filament/material.cc
+3 -6
View File
@@ -88,16 +88,13 @@ void Material::UpdateMaterialInstances() {
params_.color); params_.color);
} }
if (material->hasParameter("EmissiveFactor")) { if (material->hasParameter("EmissiveFactor")) {
const float multiplier = object_mgr_->GetEmissiveMultiplier(); instance->setParameter("EmissiveFactor", params_.emissive);
instance->setParameter("EmissiveFactor", params_.emissive * multiplier);
} }
if (material->hasParameter("SpecularFactor")) { if (material->hasParameter("SpecularFactor")) {
const float multiplier = object_mgr_->GetSpecularMultiplier(); instance->setParameter("SpecularFactor", params_.specular);
instance->setParameter("SpecularFactor", params_.specular * multiplier);
} }
if (material->hasParameter("GlossinessFactor")) { if (material->hasParameter("GlossinessFactor")) {
const float multiplier = object_mgr_->GetShininessMultiplier(); instance->setParameter("GlossinessFactor", params_.glossiness);
instance->setParameter("GlossinessFactor", params_.glossiness * multiplier);
} }
if (material->hasParameter("MetallicFactor")) { if (material->hasParameter("MetallicFactor")) {
instance->setParameter("MetallicFactor", instance->setParameter("MetallicFactor",