Skip to content

Commit 49ab5c6

Browse files
authored
Handle sdf::Geometry::EMPTY in conversions (gazebosim#2430)
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
1 parent 1b577f1 commit 49ab5c6

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/Conversions.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ msgs::Geometry gz::sim::convert(const sdf::Geometry &_in)
259259
}
260260
}
261261
}
262+
else if (_in.Type() == sdf::GeometryType::EMPTY)
263+
{
264+
out.set_type(msgs::Geometry::EMPTY);
265+
}
262266
else
263267
{
264268
gzerr << "Geometry type [" << static_cast<int>(_in.Type())

src/Conversions_TEST.cc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,3 +1206,13 @@ TEST(Conversions, MsgsPluginToSdf)
12061206
EXPECT_EQ(innerXml, sdfPlugins[1].Contents()[0]->ToString(""));
12071207
EXPECT_EQ(innerXml2, sdfPlugins[1].Contents()[1]->ToString(""));
12081208
}
1209+
1210+
/////////////////////////////////////////////////
1211+
TEST(Conversions, GeometryEmpty)
1212+
{
1213+
sdf::Geometry geometry;
1214+
geometry.SetType(sdf::GeometryType::EMPTY);
1215+
1216+
auto geometryMsg = convert<msgs::Geometry>(geometry);
1217+
EXPECT_EQ(msgs::Geometry::EMPTY, geometryMsg.type());
1218+
}

0 commit comments

Comments
 (0)