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 branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_particle.cpp
+18 -16
View File
@@ -214,7 +214,7 @@ static void dPa_group_id_change(u32* param_0, u8* param_1) {
}
}
static void initiateLighting8(_GXColor& param_0, s16 param_1) {
static void initiateLighting8(GXColor& param_0, s16 param_1) {
GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
s32 r,g,b;
@@ -246,7 +246,7 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) {
GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
}
static void initiate_b_Lighting8(_GXColor& param_0) {
static void initiate_b_Lighting8(GXColor& param_0) {
GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
GXSetChanAmbColor(GX_COLOR0A0, param_0);
@@ -804,7 +804,7 @@ JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) {
}
u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 param_3,
_GXColor const& param_4, _GXColor const& param_5, int param_6,
GXColor const& param_4, GXColor const& param_5, int param_6,
f32 param_7) {
f32 fVar1;
f32 dVar7 = param_7;
@@ -1201,6 +1201,7 @@ void dPa_control_c::createCommon(void const* param_0) {
OS_REPORT("常駐パーティクルリソースサイズ<%d>\n", heapSize);
#endif
mHeap = mDoExt_createSolidHeapFromSystem(0, 0);
JKRHEAP_NAME(mHeap, "dPa_control_c::mHeap");
JUT_ASSERT(2518, mHeap != NULL);
mCommonResMng = JKR_NEW_ARGS (mHeap, 0) JPAResourceManager(param_0, mHeap);
JUT_ASSERT(2521, mCommonResMng != NULL);
@@ -1226,6 +1227,7 @@ void dPa_control_c::createCommon(void const* param_0) {
void dPa_control_c::createRoomScene() {
mSceneHeap = mDoExt_createSolidHeapFromGame(0, 0);
JKRHEAP_NAME(mSceneHeap, "dPa_control_c::mSceneHeap");
JUT_ASSERT(2573, mSceneHeap != NULL);
mSceneResMng = JKR_NEW_ARGS (mSceneHeap, 0) JPAResourceManager(m_sceneRes, mSceneHeap);
JUT_ASSERT(2576, mSceneResMng != NULL);
@@ -1459,7 +1461,7 @@ void dPa_control_c::setWaterRipple(u32* param_0, cBgS_PolyInfo& param_1, cXyz co
JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
dKy_tevstr_c const* param_3, csXyz const* i_rotation,
cXyz const* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7,
s8 param_8, _GXColor const* param_9, _GXColor const* param_10,
s8 param_8, GXColor const* param_9, GXColor const* param_10,
cXyz const* param_11, f32 param_12) {
u8 local_e0 = getRM_ID(param_1);
JPAResourceManager* local_a8 = mEmitterMng->getResourceManager(local_e0);
@@ -1596,13 +1598,13 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
return this_00;
}
s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* param_2,
_GXColor* param_3, u8* param_4, f32* param_5) {
s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, GXColor* param_2,
GXColor* param_3, u8* param_4, f32* param_5) {
if (!dComIfG_Bgsp().ChkPolySafe(param_0)) {
return 0;
}
if (param_1 == NULL) {
if (param_1 == 0) {
dKy_pol_eff_prim_get(&param_0, param_2);
dKy_pol_eff_env_get(&param_0, param_3);
*param_4 = dKy_pol_eff_alpha_get(&param_0);
@@ -1654,7 +1656,7 @@ bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) {
}
u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const* param_2,
u8 param_3, _GXColor const& param_4, _GXColor const& param_5,
u8 param_3, GXColor const& param_4, GXColor const& param_5,
int param_6, f32 param_7) {
dPa_simpleEcallBack* cb = getSimple(param_0);
if (cb == NULL) {
@@ -1679,7 +1681,7 @@ dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) {
static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
dKy_tevstr_c const* param_2, u32 param_3, cXyz const* param_4,
_GXColor const* param_5, _GXColor const* param_6) {
GXColor const* param_5, GXColor const* param_6) {
f32 fVar1 = param_0;
if ((param_3 & 0xef0000) >> 0x10 < 100) {
fVar1 = ((param_3 & 0xef0000) >> 0x10) / 99.0f;
@@ -1723,8 +1725,8 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos,
dKy_tevstr_c const* param_4, csXyz const* i_rotation, cXyz const* i_scale,
u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, _GXColor const* param_10,
_GXColor const* param_11, cXyz const* param_12, f32 param_13) {
u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, GXColor const* param_10,
GXColor const* param_11, cXyz const* param_12, f32 param_13) {
level_c::emitter_c* this_00 = field_0x210.get(param_0);
u8 uVar7 = getRM_ID(param_2);
JPAResourceManager* this_01 = mEmitterMng->getResourceManager(uVar7);
@@ -1913,7 +1915,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 +2000,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 +2086,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 +2180,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 +2209,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;