diff options
Diffstat (limited to 'src/JSystem/JParticle/JPAParticle.cpp')
| -rw-r--r-- | src/JSystem/JParticle/JPAParticle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/src/JSystem/JParticle/JPAParticle.cpp index 195295ad..f6aa642c 100644 --- a/src/JSystem/JParticle/JPAParticle.cpp +++ b/src/JSystem/JParticle/JPAParticle.cpp @@ -155,8 +155,8 @@ void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent) f32 base_speed = csp->getBaseVel() * (csp->getBaseVelRndm() * emtr->get_r_zp() + 1.0f); EGG::Vector3f base_vel(emtr->get_r_zp(), emtr->get_r_zp(), emtr->get_r_zp()); base_vel.setLength(base_speed); - mVelType1 = csp->getVelInhRate() * parent->mVelType1 + base_vel; - mVelType0 = csp->getVelInhRate() * parent->mVelType2; + mVelType1 = parent->mVelType1 * csp->getVelInhRate() + base_vel; + mVelType0 = parent->mVelType2 * csp->getVelInhRate(); mMoment = parent->mMoment; if (csp->isFieldAffected()) { |