mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-01 03:20:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

JPA minor work

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-07-15 18:01:19 -07:00
parent 49d7b9e4b1
commit 4375c45cf0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JParticle/JPAEmitter.cpp
+1 -1
View File
@@ -344,7 +344,7 @@ void JPABaseEmitter::calcChild() {
JPABaseParticle * ptcl = (JPABaseParticle *) link->getObjectPtr();
ptcl->incFrame();
if (!ptcl->checkStatus(0x80)) {
if ((s32)ptcl->mCurFrame != 0)
if (ptcl->getAge() != 0)
ptcl->calcVelocity();
ptcl->calcCB(this);
if (!ptcl->checkStatus(0x02)) {
src/JSystem/JParticle/JPAParticle.cpp
+3 -3
View File
@@ -38,7 +38,7 @@ void JPABaseParticle::initParticle() {
else
velAxis.zero();
if (emtr->mInitialVelDir != 0.0f) {
if (emtr->mInitialVelDir) {
Mtx mtx;
JPAGetYZRotateMtx(emtr->mSpread * emtr->getRandomRF() * 32768.0f, emtr->getRandomSS(), mtx);
MTXConcat(emtrInfo.mEmitterDirMtx, mtx, mtx);
@@ -48,7 +48,7 @@ void JPABaseParticle::initParticle() {
velDir.zero();
}
if (emtr->mInitialVelRndm != 0.0f) {
if (emtr->mInitialVelRndm) {
velRndm.set(
emtr->mInitialVelRndm * emtr->getRandomSF(),
emtr->mInitialVelRndm * emtr->getRandomSF(),
@@ -165,7 +165,7 @@ void JPABaseParticle::incFrame() {
if (mCurFrame >= mLifeTime) {
mCurNormTime = 1.0f;
setStatus(0x02); // setDeleteParticleFlag
setStatus(0x02); // setDeleteParticleFlag?
} else {
mCurNormTime = mCurFrame / mLifeTime;
}