Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding cone primitives. #1003

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Adding cone primitives. #1003

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8deb122
Adding cone primitives.
bperseghetti May 12, 2024
3c96795
Revert Particle emitter for cone.
bperseghetti Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert Particle emitter for cone. 
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
  • Loading branch information
@bperseghetti
bperseghetti committed Jun 12, 2024
commit 3c96795abfa1ce788aa9f1a17174b1497d068168
7 changes: 1 addition & 6 deletions include/gz/rendering/ParticleEmitter.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -89,8 +86,6 @@ namespace gz
/// the emmiter type:
/// - EM_POINT: The area is ignored.
/// - EM_BOX: The area is interpreted as width X height X depth.
/// - EM_CONE: The area is interpreted as the bounding box of the
/// cone. The cone is oriented along the Z-axis.
/// - EM_CYLINDER: The area is interpreted as the bounding box of the
/// cylinder. The cylinder is oriented along the Z-axis.
/// - EM_ELLIPSOID: The area is interpreted as the bounding box of an
Expand Down
2 changes: 0 additions & 2 deletions ogre2/src/Ogre2ParticleEmitter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ static const std::array<std::string, EmitterType::EM_NUM_EMITTERS>
{
"Point",
"Box",
"Cone",
"Cylinder",
"Ellipsoid",
};
Expand Down Expand Up @@ -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:
{
Expand Down