Added renderOrder to convert functions (#514)

* Added renderOrder to convert functions

Signed-off-by: ahcorde <[email protected]>

* Added renderOrder to conversion_TEST

Signed-off-by: ahcorde <[email protected]>

* fixed conversion tests

Signed-off-by: ahcorde <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>

Author: ahcorde

src/Conversions.cc

@@ -270,6 +270,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
@@ -330,6 +331,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

src/Conversions_TEST.cc

@@ -205,6 +205,7 @@ TEST(Conversions, Material)
   material.SetAmbient(ignition::math::Color(0.9f, 1.0f, 1.1f, 1.2f));
   material.SetEmissive(ignition::math::Color(1.3f, 1.4f, 1.5f, 1.6f));
   material.SetLighting(true);
+  material.SetRenderOrder(2.5);
 
   // todo(anyone) add double_sided field to msgs::Material
   material.SetDoubleSided(true);
@@ -237,6 +238,7 @@ TEST(Conversions, Material)
   EXPECT_EQ(math::Color(1.3f, 1.4f, 1.5f, 1.6f),
       msgs::Convert(materialMsg.emissive()));
   EXPECT_TRUE(materialMsg.lighting());
+  EXPECT_DOUBLE_EQ(2.5, materialMsg.render_order());
 
   // todo(anyone) double_sided is temporarily stored in header
   // Need to add double_sided field to msgs::Material
@@ -266,6 +268,7 @@ TEST(Conversions, Material)
   EXPECT_EQ(math::Color(1.3f, 1.4f, 1.5f, 1.6f), newMaterial.Emissive());
   EXPECT_TRUE(newMaterial.Lighting());
   EXPECT_TRUE(newMaterial.DoubleSided());
+  EXPECT_DOUBLE_EQ(2.5, newMaterial.RenderOrder());
 
   sdf::Pbr *newPbrMaterial = newMaterial.PbrMaterial();
   ASSERT_NE(nullptr, newPbrMaterial);

src/rendering/SceneManager.cc

@@ -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();