Skip to content
Permalink
Browse files

particles: combine two soft_start() overloads created by #769

  • Loading branch information
rdb committed Nov 11, 2019
1 parent d088263 commit d08219584d7e16e739a22703543a5f3c361906e7
Showing with 9 additions and 17 deletions.
  1. +8 −15 panda/src/particlesystem/particleSystem.I
  2. +1 −2 panda/src/particlesystem/particleSystem.h
@@ -48,25 +48,18 @@ clear_to_initial() {
}

/**
* Causes system to use birth rate set by set_birth_rate()
*/
INLINE void ParticleSystem::
soft_start(PN_stdfloat br) {
if (br > 0.0)
set_birth_rate(br);
_cur_birth_rate = _birth_rate;
_tics_since_birth = 0.0f;
}

/**
* Causes system to use birth rate set by set_birth_rate(), with the system's
* first birth being delayed by the value of first_birth_delay. Note that a
* negative delay is perfectly valid, causing the first birth to happen
* Causes system to use birth rate set by set_birth_rate().
* If first_birth_delay is specified, it specifies the number of seconds to wait
* in addition to the birth rate before the first particle is birthed. It is
* legal for this to be a negative value, which causes the first birth to happen
* sooner rather than later.
*/
INLINE void ParticleSystem::
soft_start(PN_stdfloat br, PN_stdfloat first_birth_delay) {
soft_start(br);
if (br > 0.0) {
set_birth_rate(br);
}
_cur_birth_rate = _birth_rate;
_tics_since_birth = -first_birth_delay;
}

@@ -96,8 +96,7 @@ class EXPCL_PANDA_PARTICLESYSTEM ParticleSystem : public Physical {
INLINE void induce_labor();
INLINE void clear_to_initial();
INLINE void soft_stop(PN_stdfloat br = 0.0);
INLINE void soft_start(PN_stdfloat br = 0.0);
INLINE void soft_start(PN_stdfloat br, PN_stdfloat first_birth_delay);
INLINE void soft_start(PN_stdfloat br = 0.0, PN_stdfloat first_birth_delay = 0.0);
void update(PN_stdfloat dt);

virtual void output(std::ostream &out) const;

0 comments on commit d082195

Please sign in to comment.
You can’t perform that action at this time.