Skip to content

Commit e4f4044

Browse files
haroonqcopybara-github
authored andcommitted
Move material multipliers to calling function.
PiperOrigin-RevId: 890457829 Change-Id: Icb4151a792321aadd3958d479ef02f29ae4a2afc
1 parent e17e3bf commit e4f4044

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/experimental/filament/filament/drawable.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,12 @@ void Drawable::UpdateMaterial(const mjvGeom& geom, bool use_segid_color,
546546
}
547547
}
548548
}
549+
550+
// Apply material multipliers from the model.
551+
params.emissive *= object_mgr->GetEmissiveMultiplier();
552+
params.specular *= object_mgr->GetSpecularMultiplier();
553+
params.glossiness *= object_mgr->GetShininessMultiplier();
554+
549555
material_.UpdateParams(params);
550556
}
551557
} // namespace mujoco

src/experimental/filament/filament/material.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,13 @@ void Material::UpdateMaterialInstances() {
8888
params_.color);
8989
}
9090
if (material->hasParameter("EmissiveFactor")) {
91-
const float multiplier = object_mgr_->GetEmissiveMultiplier();
92-
instance->setParameter("EmissiveFactor", params_.emissive * multiplier);
91+
instance->setParameter("EmissiveFactor", params_.emissive);
9392
}
9493
if (material->hasParameter("SpecularFactor")) {
95-
const float multiplier = object_mgr_->GetSpecularMultiplier();
96-
instance->setParameter("SpecularFactor", params_.specular * multiplier);
94+
instance->setParameter("SpecularFactor", params_.specular);
9795
}
9896
if (material->hasParameter("GlossinessFactor")) {
99-
const float multiplier = object_mgr_->GetShininessMultiplier();
100-
instance->setParameter("GlossinessFactor", params_.glossiness * multiplier);
97+
instance->setParameter("GlossinessFactor", params_.glossiness);
10198
}
10299
if (material->hasParameter("MetallicFactor")) {
103100
instance->setParameter("MetallicFactor",

0 commit comments

Comments
 (0)