From 6c819ebfd8139b6106e38e2eccb4df0bba231b4b Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 23 Dec 2020 16:34:28 +0100 Subject: [PATCH 1/3] Added renderOrder to convert functions Signed-off-by: ahcorde --- src/Conversions.cc | 2 ++ src/rendering/SceneManager.cc | 1 + 2 files changed, 3 insertions(+) diff --git a/src/Conversions.cc b/src/Conversions.cc index 702658db3d..ef1093cf71 100644 --- a/src/Conversions.cc +++ b/src/Conversions.cc @@ -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 @@ -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 diff --git a/src/rendering/SceneManager.cc b/src/rendering/SceneManager.cc index 54fb330aa9..15f3153f2d 100644 --- a/src/rendering/SceneManager.cc +++ b/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(); From 1471be95a1202f37871a98387b4954bc1197f8cb Mon Sep 17 00:00:00 2001 From: ahcorde Date: Tue, 5 Jan 2021 13:41:38 +0100 Subject: [PATCH 2/3] Added renderOrder to conversion_TEST Signed-off-by: ahcorde --- src/Conversions_TEST.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc index 7f0c8a5618..1c44a3733e 100644 --- a/src/Conversions_TEST.cc +++ b/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, pbrMsg.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); From 999ecdfb6cc1e789548255957a32b56c27f009ef Mon Sep 17 00:00:00 2001 From: ahcorde Date: Mon, 25 Jan 2021 18:04:42 +0100 Subject: [PATCH 3/3] fixed conversion tests Signed-off-by: ahcorde --- src/Conversions_TEST.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc index 1c44a3733e..6539d5fc73 100644 --- a/src/Conversions_TEST.cc +++ b/src/Conversions_TEST.cc @@ -238,7 +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, pbrMsg.render_order()); + 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