mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 21:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_drawlist work

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-11-08 21:52:15 -08:00
parent 1f4c0de0c6
commit 1166423d50
9 changed files with 517 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JAudio/JASTrack.cpp
+2 -1
View File
@@ -513,7 +513,8 @@ bool JASystem::TTrack::stopSeq() {
/* 80282908-80282944 .text stopSeqMain__Q28JASystem6TTrackFv */
void JASystem::TTrack::stopSeqMain() {
/* Nonmatching */
updateSeq(0, 1);
close();
}
/* 80282944-802829DC .text noteOffAll__Q28JASystem6TTrackFv */
src/JSystem/JParticle/JPAParticle.cpp
+32 -13
View File
@@ -5,15 +5,28 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/types.h"
#include "JSystem/JParticle/JPASweepShape.h"
#include "dolphin/mtx/mtxvec.h"
/* 8025DEF4-8025E62C .text initParticle__15JPABaseParticleFv */
void JPABaseParticle::initParticle() {
/* Nonmatching */
JPABaseEmitter * emtr = JPABaseEmitter::emtrInfo.mpCurEmitter;
mStatus = 0x01;
mFieldAccel.set(1.0f, 1.0f, 1.0f);
mFieldDrag = 1.0f;
mDrag = 1.0f;
MTXMultVec(JPABaseEmitter::emtrInfo.mEmitterGlobalSR, JPABaseEmitter::emtrInfo.mVolumePos, mLocalPosition);
if ((emtr->mDataFlag & 0x08) != 0)
mStatus |= 0x20;
mGlobalPosition = JPABaseEmitter::emtrInfo.mEmitterGlobalCenter;
// TODO: calculate vel/pos
mpCallBack2 = emtr->mpParticleCallBack;
emtr->mFieldManager.init(this);
field_0xd0 = 0;
}
/* 8025E62C-8025EB28 .text initChild__15JPABaseParticleFP15JPABaseParticle */
void JPABaseParticle::initChild(JPABaseParticle*) {
void JPABaseParticle::initChild(JPABaseParticle* parent) {
/* Nonmatching */
}
@@ -35,10 +48,9 @@ void JPABaseParticle::incFrame() {
/* 8025EB90-8025ECE8 .text calcVelocity__15JPABaseParticleFv */
void JPABaseParticle::calcVelocity() {
/* Nonmatching */
mFieldVel.zero();
if (mStatus & 0x20)
mGlobalPosition = JPABaseEmitter::emtrInfo.mEmitterGlobalCenter;
mGlobalPosition.set(JPABaseEmitter::emtrInfo.mEmitterGlobalCenter);
mBaseVel.x += mAccel.x;
mBaseVel.y += mAccel.y;
mBaseVel.z += mAccel.z;
@@ -64,20 +76,27 @@ void JPABaseParticle::calcVelocity() {
/* 8025ECE8-8025ED6C .text calcPosition__15JPABaseParticleFv */
void JPABaseParticle::calcPosition() {
/* Nonmatching */
mLocalPosition.x += mVelocity.x;
mLocalPosition.y += mVelocity.y;
mLocalPosition.z += mVelocity.z;
JGeometry::TVec3<f32> pos;
pos.x = mGlobalPosition.x + JPABaseEmitter::emtrInfo.mPublicScale.x * mLocalPosition.x;
pos.y = mGlobalPosition.y + JPABaseEmitter::emtrInfo.mPublicScale.y * mLocalPosition.y;
pos.z = mGlobalPosition.z + JPABaseEmitter::emtrInfo.mPublicScale.z * mLocalPosition.z;
mPosition = pos;
mPosition.set(
mLocalPosition.x * JPABaseEmitter::emtrInfo.mPublicScale.x + mGlobalPosition.x,
mLocalPosition.y * JPABaseEmitter::emtrInfo.mPublicScale.y + mGlobalPosition.y,
mLocalPosition.z * JPABaseEmitter::emtrInfo.mPublicScale.z + mGlobalPosition.z
);
}
/* 8025ED6C-8025EE44 .text checkCreateChild__15JPABaseParticleFv */
bool JPABaseParticle::checkCreateChild() {
/* Nonmatching */
JPASweepShape * ssp = JPABaseEmitter::emtrInfo.mpCurEmitter->mpDataLinkInfo->getSweepShape();
bool ret = false;
f32 time = mLifeTime > 1.0f ? (mCurFrame / (mLifeTime - 1.0f)) : 1.0f;
if (time >= ssp->getTiming()) {
f32 frame = mCurFrame;
s32 step = (ssp->getStep() & 0xFF) + 1;
if (((s32)frame % step) == 0)
ret = true;
}
return ret;
}