mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 07:21:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge decomp/main into dusk

Browse Source 
Merges 44 upstream commits from zeldaret/tp decomp/main.

Conflict resolutions:
- .github/workflows/build.yml: keep deleted (not needed for PC port)
- README.md: keep PC port README
- J3DAnimation.h: keep OFFSET_PTR macro + add upstream forward decl
- J3DModelLoader.h: keep BE(u32) mBlockNum + add field_0x1c
- d_com_inf_game.h: keep PC port inlines + add upstream declarations
- global.h: keep MULTI_CHAR macro + add FABSF macro
- JUTConsole.cpp: keep uintptr_t cast for 64-bit
- JUTDbPrint.cpp: keep PC enter_() helper + add cstring include
- JUTResFont.cpp: take upstream loop/struct improvements with BE types
- JUTCacheFont.cpp: take upstream decomp fix
- float.h: use upstream !PLATFORM_GCN guard
- d_a_npc_bouS/theB.cpp: keep MULTI_CHAR() for PC portability
- d_a_npc_henna.cpp: keep uintptr_t + use upstream var name
- d_demo.cpp: keep near_/far_ field renames for PC
- d_resorce.cpp: keep uintptr_t + fix var name to res
- d_s_room.cpp, m_Do_graphic.cpp: keep dusk includes + add cstring
- m_Do_main.cpp: keep JHIComPortManager + use JAS_GLOBAL_INSTANCE_INIT
- angle_utils.h: remove redundant types.h include
This commit is contained in:
Luke Street
2026-02-28 13:28:42 -07:00
parent f38dcf3aef a290c2d52c
commit 3b8300d0d2
3803 changed files with 240344 additions and 16831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_particle.cpp
+5 -5
View File
@@ -1913,7 +1913,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons
void dPa_wbPcallBack_c::execute(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) {
UNUSED(i_emitter);
JGeometry::TVec3<f32> local_18;
param_1->getGlobalPosition(local_18);
param_1->getGlobalPosition(&local_18);
cXyz cStack_24(local_18.x, local_18.y, local_18.z);
if (fopAcM_wt_c::waterCheck(&cStack_24) && cStack_24.y > fopAcM_wt_c::getWaterY()) {
param_1->setInvisibleParticleFlag();
@@ -1998,7 +1998,7 @@ void dPa_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2
MTXRotAxisRad(auStack_90, &local_178, (M_PI / 180.0f) * fVar3);
MTXConcat(local_60, auStack_90, local_60);
}
param_2->getGlobalPosition(local_100);
param_2->getGlobalPosition(&local_100);
local_60[0][3] = local_100.x;
local_60[1][3] = local_100.y;
local_60[2][3] = local_100.z;
@@ -2084,7 +2084,7 @@ void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p
JGeometry::TVec3<f32> local_e0;
JGeometry::TVec3<f32> local_ec;
JGeometry::TVec3<f32> local_f8;
param_2->getGlobalPosition(local_8c);
param_2->getGlobalPosition(&local_8c);
MTXMultVec(j3dSys.getViewMtx(), &local_8c, &local_8c);
f32 dVar9 = JMASSin(param_2->getRotateAngle());
f32 dVar10 = JMASCos(param_2->getRotateAngle());
@@ -2178,7 +2178,7 @@ void dPa_gen_d_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p
MTXIdentity(local_60);
MTXIdentity(auStack_90);
param_2->getBaseAxis(local_10c);
param_2->getLocalPosition(local_118);
param_2->getLocalPosition(&local_118);
if (local_118.isZero()) {
local_118.set(0.0f, 1.0f, 0.0f);
} else {
@@ -2207,7 +2207,7 @@ void dPa_gen_d_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p
MTXRotAxisRad(auStack_90, &local_178, (M_PI / 180.0f) * fVar3);
MTXConcat(local_60, auStack_90, local_60);
}
param_2->getGlobalPosition(local_100);
param_2->getGlobalPosition(&local_100);
local_60[0][3] = local_100.x;
local_60[1][3] = local_100.y;
local_60[2][3] = local_100.z;