documentations:

- various particle system functions/structs
- more in src/fight
- beehive
- added prototypes (reduced compiler warnings)
This commit is contained in:
mariob92
2024-09-07 12:52:35 +02:00
parent 78142ca162
commit c8598c2677
77 changed files with 356 additions and 332 deletions

View File

@@ -5,7 +5,6 @@
extern void actor_predrawMethod(Actor *);
extern void actor_postdrawMethod(ActorMarker *);
extern void func_8030E394(u8);
extern void func_80326310(Actor *);
extern int func_803342AC(f32 (*)[3], f32(*)[3], f32);
extern void particleEmitter_setModel(ParticleEmitter *, s32);
@@ -466,7 +465,7 @@ Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3){
}
modelRender_preDraw( (GenFunction_1)actor_predrawMethod, (s32)actor);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)marker);
modelRender_draw(gdl, mptr, actor->position, sp3C, actor->scale, NULL, func_80330B1C(marker));
modelRender_draw(gdl, mptr, actor->position, sp3C, actor->scale, NULL, marker_loadModelBin(marker));
return actor;
}

View File

@@ -81,7 +81,7 @@ Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 ar
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, local->unk4);
}
else{
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, func_80330B1C(marker));
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, marker_loadModelBin(marker));
}
return actor;
}

View File

@@ -46,7 +46,7 @@ ActorInfo RBB_D_803909F8 = {
0, 0, 0.0f, 0
};
struct31s D_80390A1C = {
ParticleScaleAndLifetimeRanges D_80390A1C = {
{ 1.0f, 2.0f},
{ 3.0f, 5.0f},
{ 0.05f, 0.1f},
@@ -91,7 +91,7 @@ void RBB_func_8038B0B8(Actor *this, s32 arg1){
-400.0f, 0.0f, -30.0f,
-800.0f, 0.0f, 30.0f
);
func_802EFB98(other, &D_80390A1C);
particleEmitter_setScaleAndLifetimeRanges(other, &D_80390A1C);
particleEmitter_setSpawnInterval(other, 0.5f);
}
}
@@ -113,7 +113,7 @@ Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3){
sp3C[2] = actor->roll;
modelRender_preDraw(&actor_predrawMethod, actor);
func_8033A450(func_80329934());
modelRender_draw(gdl, mptr, &actor->position, &sp3C, actor->scale, NULL, func_80330B1C(marker));
modelRender_draw(gdl, mptr, &actor->position, &sp3C, actor->scale, NULL, marker_loadModelBin(marker));
func_8034A174(func_80329934(), 5, &local->unk4);
local->unk4[0] -= 60.0f;
return actor;

View File

@@ -69,7 +69,7 @@ void func_8038AC18(Actor *this, s32 new_state){
local->unk8 = 0.0f;
if(new_state == 2){
func_8030E6D4(SFX_90_SWITCH_PRESS);
local->unkC = vtxList_clone(model_getVtxList(func_80330B1C(this->marker)));
local->unkC = vtxList_clone(model_getVtxList(marker_loadModelBin(this->marker)));
mapSpecificFlags_set(local->unk4->unk10, TRUE);
this->position_y -= 30.0f;
@@ -113,7 +113,7 @@ Actor *func_8038AD9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
if( actor->state == 2
&& local->unk0 != 0
){
temp_v0 = func_80330B1C(marker);
temp_v0 = marker_loadModelBin(marker);
sp1C = (local->unk0 == 2) ? &D_80390938 : &D_8039092C;
vtxList_tint(local->unkC, sp1C,
(local->unk4->unk4[1] - actor->position_y)/30.0,

View File

@@ -27,7 +27,7 @@ f32 D_803902D4[3] = {4500.0f, 0.0f, 500.0f};
f32 D_803902E0[3] = {4500.0f, 0.0f, 500.0f};
f32 D_803902EC[3] = {4000.0f, -600.0f, 0.0f};
f32 D_803902F8[3] = {4500.0f, 0.0f, 500.0f};
struct31s D_80390304 = {
ParticleScaleAndLifetimeRanges D_80390304 = {
{ 5.0f, 5.0f},
{ 5.0f, 5.0f},
{ 0.0f, 0.01f},
@@ -142,7 +142,7 @@ void func_80387D80(void){
ParticleEmitter *actor = partEmitMgr_newEmitter(3);
particleEmitter_setSprite(actor, ASSET_70E_SPRITE_SMOKE_2);
particleEmitter_setStartingFrameRange(actor, 0, 7);
func_802EFB98(actor, &D_80390304);
particleEmitter_setScaleAndLifetimeRanges(actor, &D_80390304);
particleEmitter_setParticleVelocityRange(actor, 0.0f, 100.0f, 0.0f, 0.0f, 200.0f ,0.0f);
particleEmitter_emitInVolume(actor, &D_803902EC, &D_803902F8, 3);
}