From daf97e7ef42e32b901014d8b2cb1287982402115 Mon Sep 17 00:00:00 2001 From: Benjamin Perseghetti Date: Mon, 3 Jun 2024 13:54:42 -0400 Subject: [PATCH] Revert Particle emitter for cone. Signed-off-by: Benjamin Perseghetti --- include/gz/rendering/ParticleEmitter.hh | 5 +---- ogre2/src/Ogre2ParticleEmitter.cc | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/gz/rendering/ParticleEmitter.hh b/include/gz/rendering/ParticleEmitter.hh index cd7e78ee7..34e68dcf6 100644 --- a/include/gz/rendering/ParticleEmitter.hh +++ b/include/gz/rendering/ParticleEmitter.hh @@ -47,11 +47,8 @@ namespace gz /// \brief Ellipsoid emitter. EM_ELLIPSOID = 3, - /// \brief Cone emitter. - EM_CONE = 4, - /// \brief Total number of emitters (keep always at the end). - EM_NUM_EMITTERS = 5, + EM_NUM_EMITTERS = 4, }; /// \class ParticleEmitter ParticleEmitter.hh diff --git a/ogre2/src/Ogre2ParticleEmitter.cc b/ogre2/src/Ogre2ParticleEmitter.cc index a8a10b95f..1a0fc7b2f 100644 --- a/ogre2/src/Ogre2ParticleEmitter.cc +++ b/ogre2/src/Ogre2ParticleEmitter.cc @@ -75,7 +75,6 @@ static const std::array { "Point", "Box", - "Cone", "Cylinder", "Ellipsoid", }; @@ -155,7 +154,6 @@ void Ogre2ParticleEmitter::SetEmitterSize(const gz::math::Vector3d &_size) break; } case EmitterType::EM_BOX: - case EmitterType::EM_CONE: case EmitterType::EM_CYLINDER: case EmitterType::EM_ELLIPSOID: {