Adding cone primitives.

Squashing commits to make requested target of main with backports to harmonic. Signed-off-by: Benjamin Perseghetti <[email protected]>
gazebosim · May 15, 2024 · 77dda3b · 77dda3b
1 parent 40c04ec
commit 77dda3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/core/include/gz/msgs/convert/GeometryType.hh b/core/include/gz/msgs/convert/GeometryType.hh
@@ -39,6 +39,10 @@ inline msgs::Geometry::Type ConvertGeometryType(const std::string &_str)
  {
  result = msgs::Geometry::CAPSULE;
  }
+ else if (_str == "cone")
+ {
+ result = msgs::Geometry::CONE;
+ }
  else if (_str == "cylinder")
  {
  result = msgs::Geometry::CYLINDER;
@@ -98,6 +102,11 @@ inline std::string ConvertGeometryType(const msgs::Geometry::Type _type)
  result = "capsule";
  break;
  }
+ case msgs::Geometry::CONE:
+ {
+ result = "cone";
+ break;
+ }
  case msgs::Geometry::CYLINDER:
  {
  result = "cylinder";

diff --git a/proto/gz/msgs/particle_emitter.proto b/proto/gz/msgs/particle_emitter.proto
@@ -55,6 +55,8 @@ message ParticleEmitter
  CYLINDER = 2;
  /// \brief Ellipsoid emitter.
  ELLIPSOID = 3;
+ /// \brief Cone emitter.
+ CONE = 4;
  }
  /// \brief The emitter type.
  EmitterType type = 4;