mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-29 18:52:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some particle work and cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-07-05 01:33:40 -04:00
parent 2618f81811
commit e773fe5ca6
11 changed files with 295 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DModelData.h
+8 -4
View File
@@ -82,8 +82,14 @@ public:
s32 entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { return mMaterialTable.entryTexMtxAnimator(anm); }
s32 entryTevRegAnimator(J3DAnmTevRegKey* anm) { return mMaterialTable.entryTevRegAnimator(anm); }
s32 entryMatColorAnimator(J3DAnmColor* anm) { return mMaterialTable.entryMatColorAnimator(anm); }
void setTexMtxAnimator(J3DAnmTextureSRTKey* pAnm, J3DTexMtxAnm* pTexAnm, J3DTexMtxAnm* pDualAnmR) {
mMaterialTable.setTexMtxAnimator(pAnm, pTexAnm, pDualAnmR);
int setTexMtxAnimator(J3DAnmTextureSRTKey* pAnm, J3DTexMtxAnm* pTexAnm, J3DTexMtxAnm* pDualAnmR) {
return mMaterialTable.setTexMtxAnimator(pAnm, pTexAnm, pDualAnmR);
}
int setTexNoAnimator(J3DAnmTexPattern* anm, J3DTexNoAnm* anmR) {
return mMaterialTable.setTexNoAnimator(anm, anmR);
}
int setMatColorAnimator(J3DAnmColor* anm, J3DMatColorAnm* anmR) {
return mMaterialTable.setMatColorAnimator(anm, anmR);
}
int removeTexNoAnimator(J3DAnmTexPattern* anm) {
return mMaterialTable.removeTexNoAnimator(anm);
@@ -106,8 +112,6 @@ public:
// TODO
void getBasicMtxCalc() {}
void getRootNode() {}
void setMatColorAnimator(J3DAnmColor*, J3DMatColorAnm*) {}
void setTexNoAnimator(J3DAnmTexPattern*, J3DTexNoAnm*) {}
private:
friend class J3DModelLoader;
include/JSystem/JParticle/JPAEmitter.h
+3 -1
View File
@@ -228,6 +228,9 @@ public:
mGlobalDynamicsScale.set(scale);
mGlobalParticleScale.set(scale);
}
void getGlobalParticleScale(JGeometry::TVec3<f32>& out) const {
out.set(mGlobalParticleScale);
}
void setGlobalParticleScale(const JGeometry::TVec3<f32>& scale) {
mGlobalParticleScale.set(scale);
}
@@ -315,7 +318,6 @@ public:
void getBasePrmColor(GXColor&) {}
void getCurrentCreateNumber() const {}
void getFrame() {}
void getGlobalParticleScale(JGeometry::TVec3<f32>&) const {}
void getgReRDirection(JGeometry::TVec3<f32>&) {}
void isContinuousParticle() {}
void loadTexture(u8, GXTexMapID) {}
include/JSystem/JParticle/JPAParticle.h
+23 -17
View File
@@ -27,6 +27,24 @@ enum JPAParticleStatus {
JPAPtclStts_Invisible = 0x08,
};
// fake name
struct JPADrawParams {
/* 0x00 */ JGeometry::TVec3<f32> mAxis;
/* 0x0C */ f32 mScaleOut;
/* 0x10 */ f32 mScaleX;
/* 0x14 */ f32 mScaleY;
/* 0x18 */ u8 field_0x18[0x20 - 0x18];
/* 0x20 */ f32 mAlphaOut;
/* 0x24 */ f32 mAlphaWaveRandom;
/* 0x28 */ int mLoopOffset;
/* 0x2C */ GXColor mPrmColor;
/* 0x30 */ GXColor mEnvColor;
/* 0x34 */ u16 mRotateAngle;
/* 0x36 */ s16 mRotateSpeed;
/* 0x38 */ u8 field_0x38[0x3A - 0x38];
/* 0x3A */ u16 mTexIdx;
}; // Size: 0x3C
class JPABaseParticle {
public:
void initParticle();
@@ -44,6 +62,7 @@ public:
void getOffsetPosition(JGeometry::TVec3<f32>& out) const { out.set(mOffsetPosition); }
void getLocalPosition(JGeometry::TVec3<f32>& out) const { out.set(mLocalPosition); }
void getGlobalPosition(JGeometry::TVec3<f32>& out) const { out.set(mGlobalPosition); }
void getVelVec(JGeometry::TVec3<f32>& out) const { out.set(mVelocity); }
s32 getAge() const { return mCurFrame; } // TODO: Not sure about this one, especially the cast to s32; this could also be mCurNormTime?
void calcCB(JPABaseEmitter* emtr) { if (mpCallBack2 != NULL) mpCallBack2->execute(emtr, this); }
void drawCB(JPABaseEmitter* emtr) { if (mpCallBack2 != NULL) mpCallBack2->draw(emtr, this); }
@@ -56,12 +75,12 @@ public:
bool isInvisibleParticle() { return checkStatus(JPAPtclStts_Invisible); }
void setInvisibleParticleFlag() { setStatus(JPAPtclStts_Invisible); }
JPADrawParams* getDrawParamPPtr() { return &mDrawParams; }
void getDrawParamCPtr() {}
void getDrawParamPPtr() {}
void getWidth() {}
void getHeight() {}
void getLifeTime() const {}
void getVelVec(JGeometry::TVec3<f32>&) const {}
void getWidth() {}
void setDeleteParticleFlag() {}
public:
@@ -81,20 +100,7 @@ public:
/* 0x80 */ f32 mCurNormTime;
/* 0x84 */ f32 mFieldDrag;
/* 0x88 */ f32 mDrag;
/* 0x8C */ JGeometry::TVec3<f32> mAxis;
/* 0x98 */ f32 mScaleOut;
/* 0x9C */ f32 mScaleX;
/* 0xA0 */ f32 mScaleY;
/* 0xA4 */ u8 field_0xA4[0xAC - 0xA4];
/* 0xAC */ f32 mAlphaOut;
/* 0xB0 */ f32 mAlphaWaveRandom;
/* 0xB4 */ int mLoopOffset;
/* 0xB8 */ GXColor mPrmColor;
/* 0xBC */ GXColor mEnvColor;
/* 0xC0 */ u16 mRotateAngle;
/* 0xC2 */ s16 mRotateSpeed;
/* 0xC4 */ u16 field_0xC4;
/* 0xC6 */ u16 mTexIdx;
/* 0x8C */ JPADrawParams mDrawParams;
/* 0xC8 */ JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>* mpCallBack2;
/* 0xCC */ u32 mStatus;
/* 0xD0 */ u32 field_0xd0;
src/JSystem/J3DGraphAnimator/J3DModel.cpp
+1 -1
View File
@@ -253,7 +253,7 @@ s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 flag) {
J3DShapePacket* shapePacket = getShapePacket(pModelData->getMaterialNodePointer(i)->getShape()->getIndex());
mpMatPacket[i].setInitShapePacket(shapePacket);
mpMatPacket[i].addShapePacket(shapePacket);
mpMatPacket[i].setTexture(pModelData->getMaterialTable().getTexture());
mpMatPacket[i].setTexture(pModelData->getTexture());
mpMatPacket[i].mDiffFlag = pModelData->getMaterialNodePointer(i)->mDiffFlag;
if (pModelData->getModelDataType() == 1)
src/JSystem/JParticle/JPADraw.cpp
+48 -43
View File
@@ -146,101 +146,106 @@ void JPADraw::calc() {
/* 80268940-802689C4 .text calcParticle__7JPADrawFP15JPABaseParticle */
void JPADraw::calcParticle(JPABaseParticle* ptcl) {
ptcl->mRotateAngle += ptcl->mRotateSpeed;
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mRotateAngle += params->mRotateSpeed;
for (s32 i = 0; i < calcPtclVisNum; i++)
mpCalcPtclVis[i]->calc(&dc, ptcl);
}
/* 802689C4-80268A48 .text calcChild__7JPADrawFP15JPABaseParticle */
void JPADraw::calcChild(JPABaseParticle* ptcl) {
ptcl->mRotateAngle += ptcl->mRotateSpeed;
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mRotateAngle += params->mRotateSpeed;
for (s32 i = 0; i < calcChldVisNum; i++)
mpCalcChldVis[i]->calc(&dc, ptcl);
}
/* 80268A48-80268F28 .text initParticle__7JPADrawFP15JPABaseParticle */
void JPADraw::initParticle(JPABaseParticle* ptcl) {
ptcl->mAxis.set(JPABaseEmitter::emtrInfo.mEmitterGlobalRot[0][1], JPABaseEmitter::emtrInfo.mEmitterGlobalRot[1][1], JPABaseEmitter::emtrInfo.mEmitterGlobalRot[2][1]);
ptcl->mPrmColor = mPrmColor;
ptcl->mEnvColor = mEnvColor;
ptcl->mAlphaOut = 1.0f;
ptcl->mLoopOffset = dc.pbe->getRandomF() * dc.pbsp->getLoopOffset();
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mAxis.set(JPABaseEmitter::emtrInfo.mEmitterGlobalRot[0][1], JPABaseEmitter::emtrInfo.mEmitterGlobalRot[1][1], JPABaseEmitter::emtrInfo.mEmitterGlobalRot[2][1]);
params->mPrmColor = mPrmColor;
params->mEnvColor = mEnvColor;
params->mAlphaOut = 1.0f;
params->mLoopOffset = dc.pbe->getRandomF() * dc.pbsp->getLoopOffset();
if (dc.pesp != NULL) {
if (dc.pesp->isEnableRotate()) {
ptcl->mRotateAngle = (dc.pesp->getRotateAngle() * 32768.0f) + (dc.pbe->getRandomSF() * dc.pesp->getRotateRandomAngle() * 65536.0f);
params->mRotateAngle = (dc.pesp->getRotateAngle() * 32768.0f) + (dc.pbe->getRandomSF() * dc.pesp->getRotateRandomAngle() * 65536.0f);
s16 rotateSpeed;
if (dc.pbe->getRandomRF() < dc.pesp->getRotateDirection()) {
rotateSpeed = dc.pesp->getRotateSpeed() * (dc.pesp->getRotateRandomSpeed() * dc.pbe->getRandomRF() + 1.0f) * 32768.0f;
} else {
rotateSpeed = -dc.pesp->getRotateSpeed() * (dc.pesp->getRotateRandomSpeed() * dc.pbe->getRandomRF() + 1.0f) * 32768.0f;
}
ptcl->mRotateSpeed = rotateSpeed;
params->mRotateSpeed = rotateSpeed;
} else {
ptcl->mRotateAngle = 0;
ptcl->mRotateSpeed = 0;
params->mRotateAngle = 0;
params->mRotateSpeed = 0;
}
if (dc.pesp->isEnableScale()) {
ptcl->mScaleX = ptcl->mScaleY = ptcl->mScaleOut = (dc.pbe->getRandomRF() * dc.pesp->getRandomScale() + 1.0f) * mScaleOut;
params->mScaleX = params->mScaleY = params->mScaleOut = (dc.pbe->getRandomRF() * dc.pesp->getRandomScale() + 1.0f) * mScaleOut;
} else {
ptcl->mScaleX = ptcl->mScaleY = ptcl->mScaleOut = mScaleOut;
params->mScaleX = params->mScaleY = params->mScaleOut = mScaleOut;
}
if (dc.pesp->isEnableAlpha()) {
ptcl->mAlphaWaveRandom = (dc.pbe->getRandomRF() * dc.pesp->getAlphaWaveRandom() + 1.0f);
params->mAlphaWaveRandom = (dc.pbe->getRandomRF() * dc.pesp->getAlphaWaveRandom() + 1.0f);
} else {
ptcl->mAlphaWaveRandom = 1.0f;
params->mAlphaWaveRandom = 1.0f;
}
} else {
ptcl->mRotateAngle = 0;
ptcl->mRotateSpeed = 0;
ptcl->mScaleOut = ptcl->mScaleX = ptcl->mScaleY = mScaleOut;
ptcl->mAlphaWaveRandom = 1.0f;
params->mRotateAngle = 0;
params->mRotateSpeed = 0;
params->mScaleOut = params->mScaleX = params->mScaleY = mScaleOut;
params->mAlphaWaveRandom = 1.0f;
}
}
/* 80268F28-802692A4 .text initChild__7JPADrawFP15JPABaseParticleP15JPABaseParticle */
void JPADraw::initChild(JPABaseParticle* ptcl, JPABaseParticle* chld) {
chld->mAxis.set(ptcl->mAxis);
chld->mAlphaOut = 1.0f;
JPADrawParams* params = ptcl->getDrawParamPPtr();
JPADrawParams* chld_params = chld->getDrawParamPPtr();
chld_params->mAxis.set(params->mAxis);
chld_params->mAlphaOut = 1.0f;
if (dc.pssp->isInheritedRGB()) {
f32 ratio = dc.pssp->getInheritRGB();
chld->mPrmColor.r = ptcl->mPrmColor.r * ratio;
chld->mPrmColor.g = ptcl->mPrmColor.g * ratio;
chld->mPrmColor.b = ptcl->mPrmColor.b * ratio;
chld->mEnvColor.r = ptcl->mEnvColor.r * ratio;
chld->mEnvColor.g = ptcl->mEnvColor.g * ratio;
chld->mEnvColor.b = ptcl->mEnvColor.b * ratio;
chld_params->mPrmColor.r = params->mPrmColor.r * ratio;
chld_params->mPrmColor.g = params->mPrmColor.g * ratio;
chld_params->mPrmColor.b = params->mPrmColor.b * ratio;
chld_params->mEnvColor.r = params->mEnvColor.r * ratio;
chld_params->mEnvColor.g = params->mEnvColor.g * ratio;
chld_params->mEnvColor.b = params->mEnvColor.b * ratio;
} else {
chld->mPrmColor = dc.pssp->getPrm();
chld->mEnvColor = dc.pssp->getEnv();
chld_params->mPrmColor = dc.pssp->getPrm();
chld_params->mEnvColor = dc.pssp->getEnv();
}
if (dc.pssp->isInheritedAlpha()) {
f32 ratio = dc.pssp->getInheritAlpha() * ptcl->mAlphaOut;
chld->mPrmColor.a = ptcl->mPrmColor.a * ratio;
chld->mEnvColor.a = ptcl->mEnvColor.a * ratio;
f32 ratio = dc.pssp->getInheritAlpha() * params->mAlphaOut;
chld_params->mPrmColor.a = params->mPrmColor.a * ratio;
chld_params->mEnvColor.a = params->mEnvColor.a * ratio;
} else {
chld->mPrmColor.a = dc.pssp->getPrmAlpha();
chld->mEnvColor.a = dc.pssp->getEnvAlpha();
chld_params->mPrmColor.a = dc.pssp->getPrmAlpha();
chld_params->mEnvColor.a = dc.pssp->getEnvAlpha();
}
if (dc.pssp->isInheritedScale()) {
f32 ratio = dc.pssp->getInheritScale();
chld->mScaleX = chld->mScaleOut = ratio * ptcl->mScaleX;
chld->mScaleY = chld->mAlphaWaveRandom = ratio * ptcl->mScaleY;
chld_params->mScaleX = chld_params->mScaleOut = ratio * params->mScaleX;
chld_params->mScaleY = chld_params->mAlphaWaveRandom = ratio * params->mScaleY;
} else {
chld->mAlphaWaveRandom = 1.0f;
chld->mScaleY = 1.0f;
chld->mScaleOut = 1.0f;
chld->mScaleX = 1.0f;
chld_params->mAlphaWaveRandom = 1.0f;
chld_params->mScaleY = 1.0f;
chld_params->mScaleOut = 1.0f;
chld_params->mScaleX = 1.0f;
}
chld->mRotateAngle = ptcl->mRotateAngle;
chld_params->mRotateAngle = params->mRotateAngle;
if (dc.pssp->isEnableRotate()) {
chld->mRotateSpeed = dc.pssp->getRotateSpeed() * 32768.0f;
chld_params->mRotateSpeed = dc.pssp->getRotateSpeed() * 32768.0f;
} else {
chld->mRotateSpeed = 0;
chld_params->mRotateSpeed = 0;
}
}
src/JSystem/JParticle/JPADrawVisitor.cpp
+139 -105
View File
@@ -168,39 +168,44 @@ void JPADrawExecLoadTexture::exec(const JPADrawContext* pDC) {
/* 80260364-802603A4 .text exec__23JPADrawExecSetPointSizeFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecSetPointSize::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
GXSetPointSize(JPADrawContext::pcb->mGlobalScaleX * ptcl->mScaleX, GX_TO_ONE);
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXSetPointSize(JPADrawContext::pcb->mGlobalScaleX * params->mScaleX, GX_TO_ONE);
}
/* 802603A4-802603E4 .text exec__23JPADrawExecSetLineWidthFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecSetLineWidth::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
GXSetLineWidth(JPADrawContext::pcb->mGlobalScaleX * ptcl->mScaleX, GX_TO_ONE);
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXSetLineWidth(JPADrawContext::pcb->mGlobalScaleX * params->mScaleX, GX_TO_ONE);
}
/* 802603E4-802604AC .text exec__30JPADrawExecRegisterPrmColorAnmFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecRegisterPrmColorAnm::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
GXColor prm = ptcl->mPrmColor;
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXColor prm = params->mPrmColor;
prm.r = JPA_U8_THRE(prm.r, JPADrawContext::pcb->mPrmColor.r);
prm.g = JPA_U8_THRE(prm.g, JPADrawContext::pcb->mPrmColor.g);
prm.b = JPA_U8_THRE(prm.b, JPADrawContext::pcb->mPrmColor.b);
u8 a = JPA_U8_THRE(prm.a, JPADrawContext::pcb->mPrmColor.a);
prm.a = ptcl->mAlphaOut * a;
prm.a = params->mAlphaOut * a;
GXSetTevColor(GX_TEVREG0, prm);
}
/* 802604AC-80260578 .text exec__30JPADrawExecRegisterPrmAlphaAnmFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecRegisterPrmAlphaAnm::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXColor prm = pDC->mpDraw->mPrmColor;
prm.r = JPA_U8_THRE(prm.r, JPADrawContext::pcb->mPrmColor.r);
prm.g = JPA_U8_THRE(prm.g, JPADrawContext::pcb->mPrmColor.g);
prm.b = JPA_U8_THRE(prm.b, JPADrawContext::pcb->mPrmColor.b);
u8 a = JPA_U8_THRE(prm.a, JPADrawContext::pcb->mPrmColor.a);
prm.a = ptcl->mAlphaOut * a;
prm.a = params->mAlphaOut * a;
GXSetTevColor(GX_TEVREG0, prm);
}
/* 80260578-802605FC .text exec__30JPADrawExecRegisterEnvColorAnmFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecRegisterEnvColorAnm::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
GXColor env = ptcl->mEnvColor;
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXColor env = params->mEnvColor;
env.r = JPA_U8_THRE(env.r, JPADrawContext::pcb->mEnvColor.r);
env.g = JPA_U8_THRE(env.g, JPADrawContext::pcb->mEnvColor.g);
env.b = JPA_U8_THRE(env.b, JPADrawContext::pcb->mEnvColor.b);
@@ -209,13 +214,14 @@ void JPADrawExecRegisterEnvColorAnm::exec(const JPADrawContext* pDC, JPABasePart
/* 802605FC-80260728 .text exec__26JPADrawExecRegisterPrmCEnvFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecRegisterPrmCEnv::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
GXColor prm = ptcl->mPrmColor;
GXColor env = ptcl->mEnvColor;
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXColor prm = params->mPrmColor;
GXColor env = params->mEnvColor;
prm.r = JPA_U8_THRE(prm.r, JPADrawContext::pcb->mPrmColor.r);
prm.g = JPA_U8_THRE(prm.g, JPADrawContext::pcb->mPrmColor.g);
prm.b = JPA_U8_THRE(prm.b, JPADrawContext::pcb->mPrmColor.b);
u8 a = JPA_U8_THRE(prm.a, JPADrawContext::pcb->mPrmColor.a);
prm.a = ptcl->mAlphaOut * a;
prm.a = params->mAlphaOut * a;
env.r = JPA_U8_THRE(env.r, JPADrawContext::pcb->mEnvColor.r);
env.g = JPA_U8_THRE(env.g, JPADrawContext::pcb->mEnvColor.g);
env.b = JPA_U8_THRE(env.b, JPADrawContext::pcb->mEnvColor.b);
@@ -225,13 +231,14 @@ void JPADrawExecRegisterPrmCEnv::exec(const JPADrawContext* pDC, JPABaseParticle
/* 80260728-80260858 .text exec__26JPADrawExecRegisterPrmAEnvFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecRegisterPrmAEnv::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
GXColor prm = pDC->mpDraw->mPrmColor;
GXColor env = ptcl->mEnvColor;
GXColor env = params->mEnvColor;
prm.r = JPA_U8_THRE(prm.r, JPADrawContext::pcb->mPrmColor.r);
prm.g = JPA_U8_THRE(prm.g, JPADrawContext::pcb->mPrmColor.g);
prm.b = JPA_U8_THRE(prm.b, JPADrawContext::pcb->mPrmColor.b);
u8 a = JPA_U8_THRE(prm.a, JPADrawContext::pcb->mPrmColor.a);
prm.a = ptcl->mAlphaOut * a;
prm.a = params->mAlphaOut * a;
env.r = JPA_U8_THRE(env.r, JPADrawContext::pcb->mEnvColor.r);
env.g = JPA_U8_THRE(env.g, JPADrawContext::pcb->mEnvColor.g);
env.b = JPA_U8_THRE(env.b, JPADrawContext::pcb->mEnvColor.b);
@@ -273,7 +280,8 @@ void JPADrawExecSetTexMtx::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl
/* 80260B68-80260BAC .text exec__22JPADrawExecLoadTextureFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecLoadTexture::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
pDC->mpTextureResource->load(ptcl->mTexIdx, GX_TEXMAP0);
JPADrawParams* params = ptcl->getDrawParamPPtr();
pDC->mpTextureResource->load(params->mTexIdx, GX_TEXMAP0);
}
/* 80260BAC-80260D24 .text exec__20JPADrawExecBillBoardFPC14JPADrawContextP15JPABaseParticle */
@@ -281,8 +289,9 @@ void JPADrawExecBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl
if (ptcl->isInvisibleParticle())
return;
f32 scaleX = ptcl->mScaleX;
f32 scaleY = ptcl->mScaleY;
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 scaleX = params->mScaleX;
f32 scaleY = params->mScaleY;
f32 x0 = scaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX);
f32 y0 = scaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY);
@@ -311,16 +320,17 @@ void JPADrawExecRotBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle* p
if (ptcl->isInvisibleParticle())
return;
f32 sin = JMASSin(ptcl->mRotateAngle);
f32 cos = JMASCos(ptcl->mRotateAngle);
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 sin = JMASSin(params->mRotateAngle);
f32 cos = JMASCos(params->mRotateAngle);
f32 scaleX = ptcl->mScaleX;
f32 scaleY = ptcl->mScaleY;
f32 scaleX = params->mScaleX;
f32 scaleY = params->mScaleY;
f32 x0 = -ptcl->mScaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX);
f32 y0 = +ptcl->mScaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY);
f32 x1 = +ptcl->mScaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX);
f32 y1 = -ptcl->mScaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY);
f32 x0 = -params->mScaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX);
f32 y0 = +params->mScaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY);
f32 x1 = +params->mScaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX);
f32 y1 = -params->mScaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY);
JGeometry::TVec3<f32> pt;
ptcl->getGlobalPosition(pt);
@@ -350,7 +360,7 @@ void JPADrawExecRotYBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle*
/* 8026134C-80261368 .text dirTypeVel__FP15JPABaseParticleP14JPABaseEmitterRQ29JGeometry8TVec3<f> */
void dirTypeVel(JPABaseParticle* ptcl, JPABaseEmitter* emtr, JGeometry::TVec3<f32>& out) {
out.set(ptcl->mVelocity);
ptcl->getVelVec(out);
}
/* 80261368-80261384 .text dirTypePos__FP15JPABaseParticleP14JPABaseEmitterRQ29JGeometry8TVec3<f> */
@@ -526,33 +536,33 @@ void JPADrawExecRotation::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl)
if (ptcl->isInvisibleParticle())
return;
f32 sin = JMASSin(ptcl->mRotateAngle);
f32 cos = JMASCos(ptcl->mRotateAngle);
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 sin = JMASSin(params->mRotateAngle);
f32 cos = JMASCos(params->mRotateAngle);
Mtx rotMtx;
JGeometry::TVec3<f32> pt[4];
JPADrawContext::pcb->mBasePlaneTypeFunc(
-ptcl->mScaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX),
+ptcl->mScaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX),
+ptcl->mScaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY),
-ptcl->mScaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY),
-params->mScaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX),
+params->mScaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX),
+params->mScaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY),
-params->mScaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY),
pt
);
JPADrawContext::pcb->mRotTypeFunc(sin, cos, rotMtx);
MTXMultVecArray(rotMtx, pt, pt, ARRAY_SIZE(pt));
f32 x = ptcl->mGlobalPosition.x;
f32 y = ptcl->mGlobalPosition.y;
f32 z = ptcl->mGlobalPosition.z;
JGeometry::TVec3<f32> pos;
ptcl->getGlobalPosition(pos);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3f32(pt[0].x + x, pt[0].y + y, pt[0].z + z);
GXPosition3f32(pt[0].x + pos.x, pt[0].y + pos.y, pt[0].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(pt[1].x + x, pt[1].y + y, pt[1].z + z);
GXPosition3f32(pt[1].x + pos.x, pt[1].y + pos.y, pt[1].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(pt[2].x + x, pt[2].y + y, pt[2].z + z);
GXPosition3f32(pt[2].x + pos.x, pt[2].y + pos.y, pt[2].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(pt[3].x + x, pt[3].y + y, pt[3].z + z);
GXPosition3f32(pt[3].x + pos.x, pt[3].y + pos.y, pt[3].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXEnd();
}
@@ -563,13 +573,14 @@ void JPADrawExecRotationCross::exec(const JPADrawContext* pDC, JPABaseParticle*
if (ptcl->isInvisibleParticle())
return;
f32 sin = JMASSin(ptcl->mRotateAngle);
f32 cos = JMASCos(ptcl->mRotateAngle);
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 sin = JMASSin(params->mRotateAngle);
f32 cos = JMASCos(params->mRotateAngle);
f32 x0 = -ptcl->mScaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX);
f32 y0 = +ptcl->mScaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY);
f32 x1 = +ptcl->mScaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX);
f32 y1 = -ptcl->mScaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY);
f32 x0 = -params->mScaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX);
f32 y0 = +params->mScaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY);
f32 x1 = +params->mScaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX);
f32 y1 = -params->mScaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY);
JGeometry::TVec3<f32> pt[8];
pt[0].set(x0, y0, 0.0f);
@@ -589,26 +600,25 @@ void JPADrawExecRotationCross::exec(const JPADrawContext* pDC, JPABaseParticle*
JPADrawContext::pcb->mRotTypeFunc(sin, cos, rotMtx);
MTXMultVecArray(rotMtx, pt, pt, ARRAY_SIZE(pt));
f32 x = ptcl->mGlobalPosition.x;
f32 y = ptcl->mGlobalPosition.y;
f32 z = ptcl->mGlobalPosition.z;
JGeometry::TVec3<f32> pos;
ptcl->getGlobalPosition(pos);
GXBegin(GX_QUADS, GX_VTXFMT0, 8);
GXPosition3f32(pt[0].x + x, pt[0].y + y, pt[0].z + z);
GXPosition3f32(pt[0].x + pos.x, pt[0].y + pos.y, pt[0].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(pt[1].x + x, pt[1].y + y, pt[1].z + z);
GXPosition3f32(pt[1].x + pos.x, pt[1].y + pos.y, pt[1].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(pt[2].x + x, pt[2].y + y, pt[2].z + z);
GXPosition3f32(pt[2].x + pos.x, pt[2].y + pos.y, pt[2].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(pt[3].x + x, pt[3].y + y, pt[3].z + z);
GXPosition3f32(pt[3].x + pos.x, pt[3].y + pos.y, pt[3].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXPosition3f32(pt[4].x + x, pt[4].y + y, pt[4].z + z);
GXPosition3f32(pt[4].x + pos.x, pt[4].y + pos.y, pt[4].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(pt[5].x + x, pt[5].y + y, pt[5].z + z);
GXPosition3f32(pt[5].x + pos.x, pt[5].y + pos.y, pt[5].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(pt[6].x + x, pt[6].y + y, pt[6].z + z);
GXPosition3f32(pt[6].x + pos.x, pt[6].y + pos.y, pt[6].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(pt[7].x + x, pt[7].y + y, pt[7].z + z);
GXPosition3f32(pt[7].x + pos.x, pt[7].y + pos.y, pt[7].z + pos.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXEnd();
}
@@ -631,15 +641,16 @@ void JPADrawExecLine::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
if (ptcl->isInvisibleParticle())
return;
JPADrawParams* params = ptcl->getDrawParamPPtr();
JGeometry::TVec3<f32> pt0;
JGeometry::TVec3<f32> vel;
ptcl->getGlobalPosition(pt0);
vel.set(ptcl->mVelocity);
ptcl->getVelVec(vel);
if (!vel.isZero()) {
vel.normalize();
f32 size = JPADrawContext::pcb->mGlobalScaleY * ptcl->mScaleY;
f32 size = JPADrawContext::pcb->mGlobalScaleY * params->mScaleY;
vel.scale(size);
JGeometry::TVec3<f32> pt1;
pt1.sub(pt0, vel);
@@ -811,57 +822,62 @@ void JPADrawExecCallBack::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl)
/* 80264C88-80264DB8 .text calc__17JPADrawCalcScaleXFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcScaleX::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
if (JPADrawContext::pcb->mScaleAnmTiming < pDC->pesp->getScaleInTiming()) {
ptcl->mScaleX = ptcl->mScaleOut * ((pDC->pesp->getIncreaseRateX() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueX());
params->mScaleX = params->mScaleOut * ((pDC->pesp->getIncreaseRateX() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueX());
} else if (JPADrawContext::pcb->mScaleAnmTiming > pDC->pesp->getScaleOutTiming()) {
ptcl->mScaleX = ptcl->mScaleOut * ((pDC->pesp->getDecreaseRateX() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
params->mScaleX = params->mScaleOut * ((pDC->pesp->getDecreaseRateX() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
} else {
ptcl->mScaleX = ptcl->mScaleOut;
params->mScaleX = params->mScaleOut;
}
}
/* 80264DB8-80264EE8 .text calc__17JPADrawCalcScaleYFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcScaleY::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
if (JPADrawContext::pcb->mScaleAnmTiming < pDC->pesp->getScaleInTiming()) {
ptcl->mScaleY = ptcl->mScaleOut * ((pDC->pesp->getIncreaseRateY() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueY());
params->mScaleY = params->mScaleOut * ((pDC->pesp->getIncreaseRateY() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueY());
} else if (JPADrawContext::pcb->mScaleAnmTiming > pDC->pesp->getScaleOutTiming()) {
ptcl->mScaleY = ptcl->mScaleOut * ((pDC->pesp->getDecreaseRateY() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
params->mScaleY = params->mScaleOut * ((pDC->pesp->getDecreaseRateY() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
} else {
ptcl->mScaleY = ptcl->mScaleOut;
params->mScaleY = params->mScaleOut;
}
}
/* 80264EE8-802650B8 .text calc__24JPADrawCalcScaleXBySpeedFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcScaleXBySpeed::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
JGeometry::TVec3<f32> vel;
vel.set(ptcl->mVelocity);
ptcl->getVelVec(vel);
if (JPADrawContext::pcb->mScaleAnmTiming < pDC->pesp->getScaleInTiming()) {
ptcl->mScaleX = ptcl->mScaleOut * ((pDC->pesp->getIncreaseRateX() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueX());
params->mScaleX = params->mScaleOut * ((pDC->pesp->getIncreaseRateX() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueX());
} else if (JPADrawContext::pcb->mScaleAnmTiming > pDC->pesp->getScaleOutTiming()) {
ptcl->mScaleX = ptcl->mScaleOut * ((pDC->pesp->getDecreaseRateX() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
params->mScaleX = params->mScaleOut * ((pDC->pesp->getDecreaseRateX() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
} else {
ptcl->mScaleX = ptcl->mScaleOut;
params->mScaleX = params->mScaleOut;
}
ptcl->mScaleX *= vel.length() * 0.01f;
params->mScaleX *= vel.length() * 0.01f;
}
/* 802650B8-80265288 .text calc__24JPADrawCalcScaleYBySpeedFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcScaleYBySpeed::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
JGeometry::TVec3<f32> vel;
vel.set(ptcl->mVelocity);
ptcl->getVelVec(vel);
if (JPADrawContext::pcb->mScaleAnmTiming < pDC->pesp->getScaleInTiming()) {
ptcl->mScaleY = ptcl->mScaleOut * ((pDC->pesp->getIncreaseRateY() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueY());
params->mScaleY = params->mScaleOut * ((pDC->pesp->getIncreaseRateY() * JPADrawContext::pcb->mScaleAnmTiming) + pDC->pesp->getScaleInValueY());
} else if (JPADrawContext::pcb->mScaleAnmTiming > pDC->pesp->getScaleOutTiming()) {
ptcl->mScaleY = ptcl->mScaleOut * ((pDC->pesp->getDecreaseRateY() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
params->mScaleY = params->mScaleOut * ((pDC->pesp->getDecreaseRateY() * (JPADrawContext::pcb->mScaleAnmTiming - pDC->pesp->getScaleOutTiming())) + 1.0f);
} else {
ptcl->mScaleY = ptcl->mScaleOut;
params->mScaleY = params->mScaleOut;
}
ptcl->mScaleY *= vel.length() * 0.01f;
params->mScaleY *= vel.length() * 0.01f;
}
/* 80265288-80265294 .text calc__23JPADrawCalcScaleCopyX2YFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcScaleCopyX2Y::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
ptcl->mScaleY = ptcl->mScaleX;
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mScaleY = params->mScaleX;
}
/* 80265294-802652A4 .text calc__31JPADrawCalcScaleAnmTimingNormalFPC14JPADrawContextP15JPABaseParticle */
@@ -895,18 +911,21 @@ void JPADrawCalcScaleAnmTimingReverseY::calc(const JPADrawContext* pDC, JPABaseP
/* 802656CC-80265734 .text calc__19JPADrawCalcColorPrmFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorPrm::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
ptcl->mPrmColor = pDC->pbsp->getPrmColor(JPADrawContext::pcb->mColorAnmFrame);
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mPrmColor = pDC->pbsp->getPrmColor(JPADrawContext::pcb->mColorAnmFrame);
}
/* 80265734-8026579C .text calc__19JPADrawCalcColorEnvFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorEnv::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
ptcl->mEnvColor = pDC->pbsp->getEnvColor(JPADrawContext::pcb->mColorAnmFrame);
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mEnvColor = pDC->pbsp->getEnvColor(JPADrawContext::pcb->mColorAnmFrame);
}
/* 8026579C-802657E8 .text calc__31JPADrawCalcColorCopyFromEmitterFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorCopyFromEmitter::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
ptcl->mPrmColor = pDC->mpDraw->mPrmColor;
ptcl->mEnvColor = pDC->mpDraw->mEnvColor;
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mPrmColor = pDC->mpDraw->mPrmColor;
params->mEnvColor = pDC->mpDraw->mEnvColor;
}
/* 802657E8-80265880 .text calc__30JPADrawCalcColorAnmFrameNormalFPC14JPADrawContextP15JPABaseParticle */
@@ -917,15 +936,17 @@ void JPADrawCalcColorAnmFrameNormal::calc(const JPADrawContext* pDC, JPABasePart
/* 80265880-80265918 .text calc__30JPADrawCalcColorAnmFrameRepeatFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorAnmFrameRepeat::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 tick = ptcl->getAge();
s32 frame = ((ptcl->mLoopOffset & pDC->pbsp->getColLoopOffset()) + tick) % (pDC->pbsp->getColorRegAnmMaxFrm() + 1);
s32 frame = ((params->mLoopOffset & pDC->pbsp->getColLoopOffset()) + tick) % (pDC->pbsp->getColorRegAnmMaxFrm() + 1);
JPADrawContext::pcb->mColorAnmFrame = frame;
}
/* 80265918-802659C4 .text calc__31JPADrawCalcColorAnmFrameReverseFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorAnmFrameReverse::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 loopOffset = pDC->pbsp->getColLoopOffset();
loopOffset = ptcl->mLoopOffset & loopOffset;
loopOffset = params->mLoopOffset & loopOffset;
s32 maxFrame = pDC->pbsp->getColorRegAnmMaxFrm();
s32 t = loopOffset + ptcl->getAge();
s32 odd = (t / maxFrame) & 1;
@@ -935,7 +956,8 @@ void JPADrawCalcColorAnmFrameReverse::calc(const JPADrawContext* pDC, JPABasePar
/* 802659C4-80265A90 .text calc__29JPADrawCalcColorAnmFrameMergeFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorAnmFrameMerge::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
s32 start = ptcl->mLoopOffset & pDC->pbsp->getColLoopOffset();
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 start = params->mLoopOffset & pDC->pbsp->getColLoopOffset();
s32 maxFrame = pDC->pbsp->getColorRegAnmMaxFrm() + 1;
s32 frame = (s32)(start + maxFrame * ptcl->mCurNormTime) % maxFrame;
JPADrawContext::pcb->mColorAnmFrame = frame;
@@ -943,12 +965,14 @@ void JPADrawCalcColorAnmFrameMerge::calc(const JPADrawContext* pDC, JPABaseParti
/* 80265A90-80265B14 .text calc__30JPADrawCalcColorAnmFrameRandomFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcColorAnmFrameRandom::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
s32 frame = (ptcl->mLoopOffset & pDC->pbsp->getColLoopOffset()) % (pDC->pbsp->getColorRegAnmMaxFrm() + 1);
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 frame = (params->mLoopOffset & pDC->pbsp->getColLoopOffset()) % (pDC->pbsp->getColorRegAnmMaxFrm() + 1);
JPADrawContext::pcb->mColorAnmFrame = frame;
}
/* 80265B14-80265C40 .text calc__16JPADrawCalcAlphaFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcAlpha::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 time = ptcl->mCurNormTime;
f32 alpha;
if (time < pDC->pesp->getAlphaInTiming()) {
@@ -958,83 +982,93 @@ void JPADrawCalcAlpha::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
} else {
alpha = pDC->pesp->getAlphaBaseValue();
}
ptcl->mAlphaOut = alpha;
params->mAlphaOut = alpha;
}
/* 80265C40-80265D54 .text calc__27JPADrawCalcAlphaFlickNrmSinFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcAlphaFlickNrmSin::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
f32 sin = JMASSin((ptcl->getAge() * 16384) * ptcl->mAlphaWaveRandom * (1.0f - pDC->pesp->getAlphaWaveParam1()));
ptcl->mAlphaOut *= ptcl->mAlphaWaveRandom * (((sin - 1.0f) * 0.5f) * pDC->pesp->getAlphaWaveParam3()) + 1.0f;
if (ptcl->mAlphaOut < 0.0f)
ptcl->mAlphaOut = 0.0f;
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 sin = JMASSin((ptcl->getAge() * 16384) * params->mAlphaWaveRandom * (1.0f - pDC->pesp->getAlphaWaveParam1()));
params->mAlphaOut *= params->mAlphaWaveRandom * (((sin - 1.0f) * 0.5f) * pDC->pesp->getAlphaWaveParam3()) + 1.0f;
if (params->mAlphaOut < 0.0f)
params->mAlphaOut = 0.0f;
}
/* 80265D54-80265EC4 .text calc__27JPADrawCalcAlphaFlickAddSinFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcAlphaFlickAddSin::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
/* Nonmatching - operand swap */
f32 theta = (ptcl->getAge() * 16384) * ptcl->mAlphaWaveRandom;
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 theta = (ptcl->getAge() * 16384) * params->mAlphaWaveRandom;
f32 sin2 = JMASSin(theta * (1.0f - pDC->pesp->getAlphaWaveParam2()));
f32 sin1 = JMASSin(theta * (1.0f - pDC->pesp->getAlphaWaveParam1()));
ptcl->mAlphaOut *= (ptcl->mAlphaWaveRandom * ((((sin1 + sin2) - 2.0f) * 0.5f) * pDC->pesp->getAlphaWaveParam3()) + 2.0f) * 0.5f;
if (ptcl->mAlphaOut < 0.0f)
ptcl->mAlphaOut = 0.0f;
params->mAlphaOut *= (params->mAlphaWaveRandom * ((((sin1 + sin2) - 2.0f) * 0.5f) * pDC->pesp->getAlphaWaveParam3()) + 2.0f) * 0.5f;
if (params->mAlphaOut < 0.0f)
params->mAlphaOut = 0.0f;
}
/* 80265EC4-80266048 .text calc__28JPADrawCalcAlphaFlickMultSinFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcAlphaFlickMultSin::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
f32 theta = (ptcl->getAge() * 16384) * ptcl->mAlphaWaveRandom;
f32 mul3 = (pDC->pesp->getAlphaWaveParam3() * 0.5f) * ptcl->mAlphaWaveRandom;
JPADrawParams* params = ptcl->getDrawParamPPtr();
f32 theta = (ptcl->getAge() * 16384) * params->mAlphaWaveRandom;
f32 mul3 = (pDC->pesp->getAlphaWaveParam3() * 0.5f) * params->mAlphaWaveRandom;
f32 sin2 = JMASSin(theta * (1.0f - pDC->pesp->getAlphaWaveParam2()));
f32 sin1 = JMASSin(theta * (1.0f - pDC->pesp->getAlphaWaveParam1()));
ptcl->mAlphaOut *= ((mul3 * (sin1 - 1.0f)) + 1.0f) * ((mul3 * (sin2 - 1.0f)) + 1.0f);
if (ptcl->mAlphaOut < 0.0f)
ptcl->mAlphaOut = 0.0f;
params->mAlphaOut *= ((mul3 * (sin1 - 1.0f)) + 1.0f) * ((mul3 * (sin2 - 1.0f)) + 1.0f);
if (params->mAlphaOut < 0.0f)
params->mAlphaOut = 0.0f;
}
/* 80266048-80266100 .text calc__32JPADrawCalcTextureAnmIndexNormalFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcTextureAnmIndexNormal::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 idx = ((pDC->pbsp->getTextureAnmKeyNum() - 1) < (s32)ptcl->getAge()) ? (pDC->pbsp->getTextureAnmKeyNum() - 1) : ptcl->getAge();
ptcl->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(idx)];
params->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(idx)];
}
/* 80266100-802661B4 .text calc__32JPADrawCalcTextureAnmIndexRepeatFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcTextureAnmIndexRepeat::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 tick = ptcl->getAge();
ptcl->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(((ptcl->mLoopOffset & pDC->pbsp->getTexLoopOffset()) + tick) % pDC->pbsp->getTextureAnmKeyNum())];
params->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(((params->mLoopOffset & pDC->pbsp->getTexLoopOffset()) + tick) % pDC->pbsp->getTextureAnmKeyNum())];
}
/* 802661B4-80266284 .text calc__33JPADrawCalcTextureAnmIndexReverseFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcTextureAnmIndexReverse::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 loopOffset = pDC->pbsp->getTexLoopOffset();
loopOffset = ptcl->mLoopOffset & loopOffset;
loopOffset = params->mLoopOffset & loopOffset;
s32 maxFrame = pDC->pbsp->getTextureAnmKeyNum() - 1;
s32 t = loopOffset + ptcl->getAge();
s32 odd = (t / maxFrame) & 1;
s32 frame = t % maxFrame;
ptcl->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(frame + (odd * maxFrame) - 2 * (odd * frame))];
params->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(frame + (odd * maxFrame) - 2 * (odd * frame))];
}
/* 80266284-8026636C .text calc__31JPADrawCalcTextureAnmIndexMergeFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcTextureAnmIndexMerge::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 maxFrame = pDC->pbsp->getTextureAnmKeyNum();
s32 start = ptcl->mLoopOffset & pDC->pbsp->getTexLoopOffset();
s32 start = params->mLoopOffset & pDC->pbsp->getTexLoopOffset();
s32 frame = (s32)(start + maxFrame * ptcl->mCurNormTime) % maxFrame;
ptcl->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(frame)];
params->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(frame)];
}
/* 8026636C-8026640C .text calc__32JPADrawCalcTextureAnmIndexRandomFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcTextureAnmIndexRandom::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
s32 start = ptcl->mLoopOffset & pDC->pbsp->getTexLoopOffset();
ptcl->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(start % pDC->pbsp->getTextureAnmKeyNum())];
JPADrawParams* params = ptcl->getDrawParamPPtr();
s32 start = params->mLoopOffset & pDC->pbsp->getTexLoopOffset();
params->mTexIdx = pDC->pTexIdx[pDC->pbsp->getTextureIndex(start % pDC->pbsp->getTextureAnmKeyNum())];
}
/* 8026640C-80266420 .text calc__24JPADrawCalcChildAlphaOutFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcChildAlphaOut::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
ptcl->mAlphaOut = 1.0f - ptcl->mCurNormTime;
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mAlphaOut = 1.0f - ptcl->mCurNormTime;
}
/* 80266420-80266450 .text calc__24JPADrawCalcChildScaleOutFPC14JPADrawContextP15JPABaseParticle */
void JPADrawCalcChildScaleOut::calc(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
ptcl->mScaleX = ptcl->mScaleOut * (1.0f - ptcl->mCurNormTime);
ptcl->mScaleY = ptcl->mAlphaWaveRandom * (1.0f - ptcl->mCurNormTime);
JPADrawParams* params = ptcl->getDrawParamPPtr();
params->mScaleX = params->mScaleOut * (1.0f - ptcl->mCurNormTime);
params->mScaleY = params->mAlphaWaveRandom * (1.0f - ptcl->mCurNormTime);
}
src/d/actor/d_a_nh.cpp
+1 -1
View File
@@ -460,7 +460,7 @@ BOOL daNh_c::draw() {
mBrkAnm.entry(modelData);
mDoExt_modelUpdateDL(mpModel);
modelData->getMaterialTable().removeTevRegAnimator(mBrkAnm.getBrkAnm());
mBrkAnm.remove(modelData);
J3DMaterial* mat = modelData->getMaterialNodePointer(0);
if (mat) {
src/d/actor/d_a_obj_doguu.cpp
+1 -1
View File
@@ -585,7 +585,7 @@ bool daObjDoguu_c::_draw() {
field_0x6CC->getModelData()->setMaterialTable(bmt, J3DMatCopyFlag_All);
mBrk.entry(field_0x6CC->getModelData());
mDoExt_modelUpdateDL(field_0x6CC);
field_0x6CC->getModelData()->getMaterialTable().removeTevRegAnimator(mBrk.getBrkAnm());
mBrk.remove(field_0x6CC->getModelData());
}
if (field_0x8A0 == true) {
mBckCrystal.entry(field_0x6D8->getModelData());
src/d/actor/d_a_pedestal.cpp
+1 -1
View File
@@ -400,7 +400,7 @@ bool daPds_c::_draw() {
mBrk.entry(modelData);
mDoExt_modelUpdateDL(mpModel);
modelData->getMaterialTable().removeTevRegAnimator(mBrk.getBrkAnm());
mBrk.remove(modelData);
dComIfGd_setList();
src/d/d_attention.cpp
+2 -2
View File
@@ -970,7 +970,7 @@ void dAttDraw_c::draw(cXyz &pos, Mtx mtx) {
J3DModelData *modeldata = model->getModelData();
if (mpAnmClr == NULL) {
J3DAnmColor *color = (J3DAnmColor*)dComIfG_getObjectRes("Always", ALWAYS_BPK_YJ_IN);
modeldata->getMaterialTable().removeMatColorAnimator(color);
modeldata->removeMatColorAnimator(color);
} else {
mpAnmClr->setFrame(anm->mFrameCtrl.getFrame());
J3DMatColorAnm *p = mpAnmMatClr;
@@ -979,7 +979,7 @@ void dAttDraw_c::draw(cXyz &pos, Mtx mtx) {
p->setAnmIndex(i);
p++;
}
modeldata->getMaterialTable().setMatColorAnimator(mpAnmClr, mpAnmMatClr);
modeldata->setMatColorAnimator(mpAnmClr, mpAnmMatClr);
}
if (mDoGph_gInf_c::isMonotone()) {
src/d/d_particle.cpp
+68 -33
View File
@@ -72,58 +72,93 @@ dPa_J3DmodelEmitter_c::~dPa_J3DmodelEmitter_c() {
/* 8007A8C8-8007ADC4 .text draw__21dPa_J3DmodelEmitter_cFv */
void dPa_J3DmodelEmitter_c::draw() {
/* Nonmatching */
mpBaseEmitter->quitImmortalEmitter();
mpBaseEmitter->playDrawParticle();
JSUList<JPABaseParticle>* list = mpBaseEmitter->getParticleList();
if (list != NULL) {
Mtx mtx1, mtx2;
mDoMtx_identity(mtx1);
mDoMtx_identity(mtx2);
Mtx sp44, sp14;
mDoMtx_identity(sp44);
mDoMtx_identity(sp14);
for (JSULink<JPABaseParticle>* link = list->getFirst(); link != NULL; link = link->getNext()) {
JPABaseParticle* ptcl = link->getObject();
J3DModel* model = dPa_modelControl_c::newModel(modelData);
if (model == NULL)
return;
mtx1[0][1] = ptcl->mVelocity.x;
mtx1[1][1] = ptcl->mVelocity.y;
mtx1[2][1] = ptcl->mVelocity.z;
f32 sq = mtx1[0][1]*mtx1[0][1] + mtx1[1][1]*mtx1[1][1] + mtx1[2][1]*mtx1[2][1];
if (!cM3d_IsZero(sq)) {
if (!cM3d_IsZero(sq)) {
f32 mag = std::sqrtf(sq);
mtx1[0][1] *= mag;
mtx1[1][1] *= mag;
mtx1[2][1] *= mag;
}
JPABaseParticle* ptcl = link->getObject();
JPADrawParams* params = ptcl->getDrawParamPPtr();
JGeometry::TVec3<f32> vel;
ptcl->getVelVec(vel);
if (vel.isZero()) {
vel.set(0.0f, 1.0f, 0.0f);
} else {
mtx1[0][1] = 0.0f;
mtx1[1][1] = 1.0f;
mtx1[2][1] = 0.0f;
vel.normalize();
}
JGeometry::TVec3<f32> tmp;
tmp.cross_hack(params->mAxis, vel); // fake inline
if (tmp.isZero()) {
tmp.set(0.0f, 0.0f, 1.0f);
} else {
tmp.normalize();
}
params->mAxis.cross(vel, tmp);
params->mAxis.normalize();
sp44[0][0] = params->mAxis.x;
sp44[0][1] = vel.x;
sp44[0][2] = tmp.x;
sp44[1][0] = params->mAxis.y;
sp44[1][1] = vel.y;
sp44[1][2] = tmp.y;
sp44[2][0] = params->mAxis.z;
sp44[2][1] = vel.z;
sp44[2][2] = tmp.z;
f32 f1 = params->mRotateAngle * 0.005493164f; // SAngle -> Degree conversion
if (f1) {
switch (field_0x26) {
case 0:
MTXRotRad(sp14, 'y', f1 * 0.017453292f); // Degree -> Radian conversion
break;
case 1:
MTXRotRad(sp14, 'x', f1 * 0.017453292f); // Degree -> Radian conversion
break;
case 2:
MTXRotRad(sp14, 'z', f1 * 0.017453292f); // Degree -> Radian conversion
break;
case 3:
Vec sp08 = {1.0f, 1.0f, 1.0f};
MTXRotAxisRad(sp14, &sp08, f1 * 0.017453292f); // Degree -> Radian conversion
break;
}
MTXConcat(sp44, sp14, sp44);
}
MTXConcat(sp44, sp14, sp44);
JGeometry::TVec3<f32> temp;
ptcl->getGlobalPosition(temp);
sp44[0][3] = temp.x;
sp44[1][3] = temp.y;
sp44[2][3] = temp.z;
JGeometry::TVec3<f32> scale;
mpBaseEmitter->getGlobalParticleScale(scale);
scale.x *= params->mScaleX;
scale.y *= params->mScaleY;
scale.z *= params->mScaleX;
// TODO: all the math
mtx1[0][3] = ptcl->mGlobalPosition.x;
mtx1[1][3] = ptcl->mGlobalPosition.y;
mtx1[2][3] = ptcl->mGlobalPosition.z;
g_env_light.setLightTevColorType(model, &tevStr);
if (field_0x1c != NULL && field_0x20 != NULL) {
field_0x1c->setFrame(field_0x24);
modelData->getMaterialTable().setTexNoAnimator(field_0x1c, field_0x20);
modelData->setTexNoAnimator(field_0x1c, field_0x20);
}
cXyz scale;
scale.x = mpBaseEmitter->mGlobalParticleScale.x * ptcl->mScaleX;
scale.y = mpBaseEmitter->mGlobalParticleScale.y * ptcl->mScaleY;
scale.z = mpBaseEmitter->mGlobalParticleScale.z * ptcl->mScaleX;
model->setBaseScale(scale);
model->setBaseTRMtx(mtx1);
mDoExt_modelUpdate(model);
model->setBaseTRMtx(sp44);
mDoExt_modelUpdateDL(model);
if (field_0x1c != NULL) {
modelData->getMaterialTable().removeTexNoAnimator(field_0x1c);
modelData->removeTexNoAnimator(field_0x1c);
}
}
}