Skip to content

Commit 74d27d3

Browse files
committed
Adding cone primitives.
Squashing commits to make requested target of main with backports to harmonic. Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
1 parent b4a0f36 commit 74d27d3

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/plugins/marker_manager/MarkerManager.cc

+2
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,8 @@ gz::rendering::MarkerType MarkerManagerPrivate::MsgToType(
610610
return gz::rendering::MarkerType::MT_BOX;
611611
case gz::msgs::Marker::CAPSULE:
612612
return gz::rendering::MarkerType::MT_CAPSULE;
613+
case gz::msgs::Marker::CONE:
614+
return gz::rendering::MarkerType::MT_CONE;
613615
case gz::msgs::Marker::CYLINDER:
614616
return gz::rendering::MarkerType::MT_CYLINDER;
615617
case gz::msgs::Marker::LINE_STRIP:

src/plugins/transport_scene_manager/TransportSceneManager.cc

+7
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,13 @@ rendering::GeometryPtr TransportSceneManagerPrivate::LoadGeometry(
687687
if (_msg.box().has_size())
688688
scale = msgs::Convert(_msg.box().size());
689689
}
690+
else if (_msg.has_cone())
691+
{
692+
geom = this->scene->CreateCone();
693+
scale.X() = _msg.cone().radius() * 2;
694+
scale.Y() = scale.X();
695+
scale.Z() = _msg.cone().length();
696+
}
690697
else if (_msg.has_cylinder())
691698
{
692699
geom = this->scene->CreateCylinder();

0 commit comments

Comments
 (0)