mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-09 10:52:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

JPA work

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-10-29 18:54:28 -07:00
parent 5bbc0633f0
commit 855643ae72
9 changed files with 359 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JParticle/JPAEmitter.cpp
+206 -27
View File
@@ -4,11 +4,27 @@
//
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/types.h"
#include "JSystem/JParticle/JPAExtraShape.h"
#include "JSystem/JParticle/JPASweepShape.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/mtx/mtxvec.h"
JPAEmitterInfo JPABaseEmitter::emtrInfo;
/* 8025C128-8025C254 .text calcVolumePoint__14JPABaseEmitterFv */
void JPABaseEmitter::calcVolumePoint() {
/* Nonmatching */
emtrInfo.mVolumePos.z = 0.0f;
emtrInfo.mVolumePos.y = 0.0f;
emtrInfo.mVolumePos.x = 0.0f;
emtrInfo.mVelOmni.z = mRandomSeed.get_ufloat_1() - 0.5f;
emtrInfo.mVelOmni.y = mRandomSeed.get_ufloat_1() - 0.5f;
emtrInfo.mVelOmni.x = mRandomSeed.get_ufloat_1() - 0.5f;
emtrInfo.mVelAxis.x = mRandomSeed.get_ufloat_1() - 0.5f;
emtrInfo.mVelAxis.y = 0.0f;
emtrInfo.mVelAxis.z = mRandomSeed.get_ufloat_1() - 0.5f;
}
/* 8025C254-8025C394 .text calcVolumeLine__14JPABaseEmitterFv */
@@ -49,11 +65,64 @@ void JPABaseEmitter::create(JPADataBlockLinkInfo*) {
/* 8025D0B0-8025D294 .text calcEmitterInfo__14JPABaseEmitterFv */
void JPABaseEmitter::calcEmitterInfo() {
/* Nonmatching */
emtrInfo.mpCurEmitter = this;
emtrInfo.mVolumeEmitXCount = 0;
emtrInfo.mVolumeEmitAngleCount = 0;
emtrInfo.mVolumeEmitAngleMax = 1;
emtrInfo.mDivNumber = mDivNumber * 2 + 1;
emtrInfo.mVolumeSize = mVolumeSize;
Mtx mtxScale, mtxRot, mtx;
MTXScale(mtxScale, mEmitterScale.x, mEmitterScale.y, mEmitterScale.z);
JPAGetXYZRotateMtx((mEmitterRot.x << 14) / 0x5a, (mEmitterRot.y << 14) / 0x5a, (mEmitterRot.z << 14) / 0x5a, mtxRot);
MTXScale(mtx, mGlobalDynamicsScale.x, mGlobalDynamicsScale.y, mGlobalDynamicsScale.z);
MTXConcat(mGlobalRotation, mtx, mtx);
mtx[0][3] = mGlobalTranslation.x;
mtx[1][3] = mGlobalTranslation.y;
mtx[2][3] = mGlobalTranslation.z;
MTXCopy(mGlobalRotation, emtrInfo.mGlobalRot);
MTXConcat(mGlobalRotation, mtxRot, emtrInfo.mEmitterGlobalRot);
MTXConcat(emtrInfo.mEmitterGlobalRot, mtxScale, emtrInfo.mEmitterGlobalSR);
JPAGetDirMtx(mEmitterDir, emtrInfo.mEmitterDirMtx);
emtrInfo.mEmitterGlobalScale.x = mEmitterScale.x * mGlobalDynamicsScale.x;
emtrInfo.mEmitterGlobalScale.y = mEmitterScale.y * mGlobalDynamicsScale.y;
emtrInfo.mEmitterGlobalScale.z = mEmitterScale.z * mGlobalDynamicsScale.z;
emtrInfo.mEmitterTranslation.x = mEmitterTranslation.x;
emtrInfo.mEmitterTranslation.y = mEmitterTranslation.y;
emtrInfo.mEmitterTranslation.z = mEmitterTranslation.z;
emtrInfo.mPublicScale.x = mGlobalDynamicsScale.x * 1.0f;
emtrInfo.mPublicScale.y = mGlobalDynamicsScale.y * 1.0f;
emtrInfo.mPublicScale.z = mGlobalDynamicsScale.z * 1.0f;
MTXMultVec(mtx, &mEmitterTranslation, emtrInfo.mEmitterGlobalCenter);
}
/* 8025D294-8025D3C0 .text calc__14JPABaseEmitterFv */
void JPABaseEmitter::calc() {
/* Nonmatching */
emtrInfo.mVolumeEmitCount = 0;
if (!checkStatus(JPAEmtrStts_StopCalc)) {
calcKey();
if (mpEmitterCallBack != NULL)
mpEmitterCallBack->execute(this);
calcEmitterInfo();
mDraw.calc();
mFieldManager.preCalc();
if (!checkStatus(JPAEmtrStts_EnableDeleteEmitter))
calcCreatePtcls();
if (mpEmitterCallBack != NULL)
mpEmitterCallBack->executeAfter(this);
calcParticle();
calcChild();
mTick += 1.0f;
if (mTick < 0.0f)
mTick = 0.0f;
} else {
if (mpEmitterCallBack != NULL)
mpEmitterCallBack->execute(this);
if (mpEmitterCallBack != NULL)
mpEmitterCallBack->executeAfter(this);
}
}
/* 8025D3C0-8025D5D4 .text calcCreatePtcls__14JPABaseEmitterFv */
@@ -62,23 +131,81 @@ void JPABaseEmitter::calcCreatePtcls() {
}
/* 8025D5D4-8025D670 .text createChildren__14JPABaseEmitterFP15JPABaseParticle */
void JPABaseEmitter::createChildren(JPABaseParticle*) {
/* Nonmatching */
void JPABaseEmitter::createChildren(JPABaseParticle* ptcl) {
s32 num = getEmitterDataBlockInfoPtr()->getSweepShape()->getRate();
for (s32 i = 0; i < num; i++) {
JPABaseParticle * chld = getPtclFromVacList();
if (chld == NULL)
break;
mChildParticles.prepend(&chld->mLink);
chld->initChild(ptcl);
mDraw.initChild(ptcl, chld);
}
}
/* 8025D670-8025D6E0 .text createParticle__14JPABaseEmitterFv */
void JPABaseEmitter::createParticle() {
/* Nonmatching */
JPABaseParticle * JPABaseEmitter::createParticle() {
/* Nonmatching - PTMF */
JPABaseParticle * ptcl = getPtclFromVacList();
if (ptcl != NULL) {
mActiveParticles.prepend(&ptcl->mLink);
ptcl->initParticle();
mDraw.initParticle(ptcl);
}
return ptcl;
}
/* 8025D6E0-8025D7E0 .text calcParticle__14JPABaseEmitterFv */
void JPABaseEmitter::calcParticle() {
/* Nonmatching */
for (JSULink<JPABaseParticle> * link = mActiveParticles.getFirst(); link != NULL;) {
JSULink<JPABaseParticle> * next = link->getNext();
JPABaseParticle * ptcl = (JPABaseParticle *) link->getObjectPtr();
ptcl->incFrame();
if (!(ptcl->mStatus & 0x80)) {
ptcl->calcVelocity();
if (ptcl->mpCallBack2 != NULL)
ptcl->mpCallBack2->execute(this, ptcl);
if (!(ptcl->mStatus & 0x02)) {
mDraw.calcParticle(ptcl);
if (getEmitterDataBlockInfoPtr()->getSweepShape() != NULL && ptcl->checkCreateChild())
createChildren(ptcl);
ptcl->calcPosition();
}
} else {
ptcl->mStatus |= 0x02;
}
if (ptcl->mStatus & 0x02)
deleteParticle(ptcl, &mActiveParticles);
link = next;
}
}
/* 8025D7E0-8025D8CC .text calcChild__14JPABaseEmitterFv */
void JPABaseEmitter::calcChild() {
/* Nonmatching */
for (JSULink<JPABaseParticle> * link = mChildParticles.getFirst(); link != NULL;) {
JSULink<JPABaseParticle> * next = link->getNext();
JPABaseParticle * ptcl = (JPABaseParticle *) link->getObjectPtr();
ptcl->incFrame();
if (!(ptcl->mStatus & 0x80)) {
if ((s32)ptcl->mCurFrame != 0)
ptcl->calcVelocity();
if (ptcl->mpCallBack2 != NULL)
ptcl->mpCallBack2->execute(this, ptcl);
if (!(ptcl->mStatus & 0x02)) {
mDraw.calcChild(ptcl);
ptcl->calcPosition();
}
} else {
ptcl->mStatus |= 0x02;
}
if (ptcl->mStatus & 0x02)
deleteParticle(ptcl, &mChildParticles);
link = next;
}
}
/* 8025D8CC-8025DA90 .text calcKey__14JPABaseEmitterFv */
@@ -87,51 +214,103 @@ void JPABaseEmitter::calcKey() {
}
/* 8025DA90-8025DAD8 .text deleteParticle__14JPABaseEmitterFP15JPABaseParticleP26JSUList<15JPABaseParticle> */
void JPABaseEmitter::deleteParticle(JPABaseParticle*, JSUList<JPABaseParticle>*) {
/* Nonmatching */
void JPABaseEmitter::deleteParticle(JPABaseParticle* ptcl, JSUList<JPABaseParticle>* list) {
JSUPtrList * ptrlist = list;
ptrlist->remove(&ptcl->mLink);
mpPtclVacList->prepend(&ptcl->mLink);
}
/* 8025DAD8-8025DB68 .text deleteAllParticle__14JPABaseEmitterFv */
void JPABaseEmitter::deleteAllParticle() {
/* Nonmatching */
for (JSULink<JPABaseParticle>* link = mActiveParticles.getFirst(); link != NULL;) {
JSULink<JPABaseParticle>* next = link->getNext();
mActiveParticles.remove(link);
mpPtclVacList->prepend(link);
link = next;
}
for (JSULink<JPABaseParticle>* link = mChildParticles.getFirst(); link != NULL;) {
JSULink<JPABaseParticle>* next = link->getNext();
mChildParticles.remove(link);
mpPtclVacList->prepend(link);
link = next;
}
}
/* 8025DB68-8025DBB4 .text getPtclFromVacList__14JPABaseEmitterFv */
void JPABaseEmitter::getPtclFromVacList() {
/* Nonmatching */
JPABaseParticle * JPABaseEmitter::getPtclFromVacList() {
JPABaseParticle * ptcl = NULL;
if (mpPtclVacList->getNumLinks() != 0) {
ptcl = (JPABaseParticle*)mpPtclVacList->getFirstLink()->getObjectPtr();
mpPtclVacList->remove(&ptcl->mLink);
}
return ptcl;
}
/* 8025DBB4-8025DC2C .text doStartFrameProcess__14JPABaseEmitterFv */
void JPABaseEmitter::doStartFrameProcess() {
bool JPABaseEmitter::doStartFrameProcess() {
/* Nonmatching */
if (mTime >= mStartFrame)
return true;
if (!checkStatus(JPAEmtrStts_StopCalc)) {
mTime++;
if (mTime < 0.0f)
mTime = 0.0f;
}
return false;
}
/* 8025DC2C-8025DCDC .text doTerminationProcess__14JPABaseEmitterFv */
void JPABaseEmitter::doTerminationProcess() {
/* Nonmatching */
bool JPABaseEmitter::doTerminationProcess() {
if (mMaxFrame == 0) {
return false;
} else if (mMaxFrame < 0) {
mFlags |= JPAEmtrStts_EnableDeleteEmitter;
return getParticleNumber() == 0;
} else if (mTick >= mMaxFrame) {
mFlags |= JPAEmtrStts_EnableDeleteEmitter;
if (mFlags & JPAEmtrStts_Immortal)
return false;
return getParticleNumber() == 0;
} else {
return false;
}
}
/* 8025DCDC-8025DD5C .text calcEmitterGlobalPosition__14JPABaseEmitterFRQ29JGeometry8TVec3<f> */
void JPABaseEmitter::calcEmitterGlobalPosition(JGeometry::TVec3<float>&) {
/* Nonmatching */
void JPABaseEmitter::calcEmitterGlobalPosition(JGeometry::TVec3<float>& dst) {
Mtx mtx;
MTXScale(mtx, mGlobalDynamicsScale.x, mGlobalDynamicsScale.y, mGlobalDynamicsScale.z);
MTXConcat(mGlobalRotation, mtx, mtx);
mtx[0][3] = mGlobalTranslation.x;
mtx[1][3] = mGlobalTranslation.y;
mtx[2][3] = mGlobalTranslation.z;
MTXMultVec(mtx, &mEmitterTranslation, dst);
}
/* 8025DD5C-8025DDE8 .text calcgReRDirection__14JPABaseEmitterFv */
void JPABaseEmitter::calcgReRDirection() {
/* Nonmatching */
// gReR = globalRotation emitterRotation
Mtx mtx;
JPAGetXYZRotateMtx((mEmitterRot.x << 14) / 0x5a, (mEmitterRot.y << 14) / 0x5a, (mEmitterRot.z << 14) / 0x5a, mtx);
MTXConcat(mGlobalRotation, mtx, mtx);
MTXMultVec(mtx, mEmitterDir, emtrInfo.mgReRDir);
}
/* 8025DDE8-8025DE2C .text getPivotX__14JPABaseEmitterFv */
void JPABaseEmitter::getPivotX() {
/* Nonmatching */
u32 JPABaseEmitter::getPivotX() {
if (getEmitterDataBlockInfoPtr()->getExtraShape() != NULL)
return getEmitterDataBlockInfoPtr()->getExtraShape()->getPivotX();
else
return 1;
}
/* 8025DE2C-8025DE70 .text getPivotY__14JPABaseEmitterFv */
void JPABaseEmitter::getPivotY() {
/* Nonmatching */
}
/* 8025DEB8-8025DEF4 .text __dt__14JPAEmitterInfoFv */
JPAEmitterInfo::~JPAEmitterInfo() {
/* Nonmatching */
u32 JPABaseEmitter::getPivotY() {
if (getEmitterDataBlockInfoPtr()->getExtraShape() != NULL)
return getEmitterDataBlockInfoPtr()->getExtraShape()->getPivotY();
else
return 1;
}
src/JSystem/JParticle/JPAField.cpp
-1
View File
@@ -4,7 +4,6 @@
//
#include "JSystem/JParticle/JPAField.h"
#include "dolphin/types.h"
/* 80259EE8-8025A0D8 .text loadFieldData__12JPABaseFieldFP12JPAFieldDataP13JPAFieldBlock */
void JPABaseField::loadFieldData(JPAFieldData*, JPAFieldBlock*) {
src/JSystem/JParticle/JPAParticle.cpp
+1 -1
View File
@@ -78,6 +78,6 @@ void JPABaseParticle::calcPosition() {
}
/* 8025ED6C-8025EE44 .text checkCreateChild__15JPABaseParticleFv */
void JPABaseParticle::checkCreateChild() {
bool JPABaseParticle::checkCreateChild() {
/* Nonmatching */
}