Skip to content

Commit

Permalink
Added renderOrder to convert functions
Browse files Browse the repository at this point in the history
Signed-off-by: ahcorde <[email protected]>
  • Loading branch information
ahcorde committed Dec 23, 2020
1 parent fc913c8 commit c1be8ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/Conversions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ msgs::Material ignition::gazebo::convert(const sdf::Material &_in)
msgs::Set(out.mutable_diffuse(), _in.Diffuse());
msgs::Set(out.mutable_specular(), _in.Specular());
msgs::Set(out.mutable_emissive(), _in.Emissive());
out.set_render_order(_in.RenderOrder());
out.set_lighting(_in.Lighting());

// todo(anyone) add double_sided field to msgs::Material
Expand Down Expand Up @@ -321,6 +322,7 @@ sdf::Material ignition::gazebo::convert(const msgs::Material &_in)
out.SetDiffuse(msgs::Convert(_in.diffuse()));
out.SetSpecular(msgs::Convert(_in.specular()));
out.SetEmissive(msgs::Convert(_in.emissive()));
out.SetRenderOrder(_in.render_order());
out.SetLighting(_in.lighting());

// todo(anyone) add double_sided field to msgs::Material
Expand Down
1 change: 1 addition & 0 deletions src/rendering/SceneManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
material->SetDiffuse(_material.Diffuse());
material->SetSpecular(_material.Specular());
material->SetEmissive(_material.Emissive());
material->SetRenderOrder(_material.RenderOrder());

// parse PBR params
const sdf::Pbr *pbr = _material.PbrMaterial();
Expand Down

0 comments on commit c1be8ed

Please sign in to comment.