mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-10 19:17:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on various units, mostly d_menu_letter (#2240)

Browse Source
This commit is contained in:
hatal175
2024-11-09 20:20:06 +02:00
committed by GitHub
parent 083991a8d0
commit bec20e3dd4
12 changed files with 654 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JParticle/JPAParticle.cpp
+3 -3
View File
@@ -17,7 +17,7 @@ JPAParticleCallBack::~JPAParticleCallBack() {
/* 8027EFEC-8027F8C8 27992C 08DC+00 0/0 1/1 0/0 .text
* init_p__15JPABaseParticleFP18JPAEmitterWorkData */
// NONMATCHING a couple problems, likely issues with setLength and get_r_ss
// NONMATCHING a couple problems, likely issues with setLength
void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
JPABaseEmitter* emtr = work->mpEmtr;
JPAExtraShape* esp = work->mpRes->getEsp();
@@ -56,8 +56,8 @@ void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
JGeometry::TVec3<f32> velDir;
if (emtr->mDirSpeed) {
Mtx mtx;
s16 angleY = emtr->get_r_ss();
s16 angleZ = emtr->get_r_zp() * 0x8000 * emtr->mSpread;
int angleZ = emtr->get_r_ss();
f32 angleY = emtr->get_r_zp() * 0x8000 * emtr->mSpread;
JPAGetYZRotateMtx(angleY, angleZ, mtx);
MTXConcat(work->mDirectionMtx, mtx, mtx);
velDir.set(emtr->mDirSpeed * mtx[0][2],
src/JSystem/JParticle/JPAResource.cpp
+5
View File
@@ -1117,3 +1117,8 @@ void JPAResource::calcWorkData_d(JPAEmitterWorkData* work) {
MTXConcat(work->mpEmtr->mGlobalRot, mtx, work->mGlobalRot);
MTXMultVecSR(work->mGlobalRot, &work->mpEmtr->mLocalDir, &work->mGlobalEmtrDir);
}
#pragma push
#pragma force_active on
static u8 jpa_resource_padding[28] = {0};
#pragma pop