kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

core2/modelRender.c documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-01 13:27:28 -06:00
parent b74c76a430
commit aa33833595
43 changed files with 385 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/RBB/code_3CB0.c
View File

@@ -4,7 +4,6 @@
extern void func_8028F9DC(s32);
extern void func_803253A0(Actor *);
extern void func_8033A2D4(void(*)(Actor *), Actor *);
/* typedefs and declarations */
typedef struct {
@@ -77,7 +76,7 @@ Actor *func_8038A224(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
return actor;
}
func_8033A2D4(func_803253A0, actor);
modelRender_preDraw(func_803253A0, actor);
if(local->unk4){
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, local->unk4);
}
@@ -121,4 +120,4 @@ void func_8038A324(Actor *this){
RBB_func_8038A0A0(this, 1);
}
}
}
}

2
src/RBB/code_4C70.c
View File

@@ -111,7 +111,7 @@ Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3){
sp3C[0] = actor->pitch;
sp3C[1] = actor->yaw;
sp3C[2] = actor->roll;
func_8033A2D4(&func_803253A0, actor);
modelRender_preDraw(&func_803253A0, actor);
func_8033A450(func_80329934());
modelRender_draw(gdl, mptr, &actor->position, &sp3C, actor->scale, NULL, func_80330B1C(marker));
func_8034A174(func_80329934(), 5, &local->unk4);

26
src/RBB/code_5F80.c
View File

@@ -265,7 +265,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
int i;
f32 pad;
f32 sp68[3];
f32 sp64;
f32 player_position;
f32 sp60;
f32 sp5C;
f32 sp58;
@@ -404,11 +404,11 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
if(this->state == 3 || this->state == 4 || this->state == 5){
local->unk20 = RBB_func_8038CBF0(this);
if( local->unk20 == 0){
sp64 = local->unk0->unk4*300.0f;
player_position = local->unk0->unk4*300.0f;
for(i = 0; i < 10; i++){
local->unk14[0] = local->unk8[0] + randf2(-sp64, sp64);
local->unk14[0] = local->unk8[0] + randf2(-player_position, player_position);
local->unk14[1] = local->unk14[1];
local->unk14[2] = local->unk8[2] + randf2(-sp64, sp64);
local->unk14[2] = local->unk8[2] + randf2(-player_position, player_position);
func_8038CA70(this, &local->unk14);
local->unk20 = RBB_func_8038CBF0(this);
if(local->unk20)
@@ -465,9 +465,9 @@ Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3){
func_8033A45C(6, (actor->state == 4)? 2: 1);
func_8033A45C(7, (actor->state == 4)? 2: 1);
}
func_8033A2D4(func_803253A0, actor);
func_8033A2E8(func_80325794, marker);
modelRender_draw(gdl, mptr, &actor->position, &sp3C, actor->scale, NULL, func_80330B1C(marker));
modelRender_preDraw( (GenMethod_1)func_803253A0, (s32)actor);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_draw(gdl, mptr, actor->position, sp3C, actor->scale, NULL, func_80330B1C(marker));
return actor;
}
@@ -493,7 +493,7 @@ void func_8038D7E8(ActorMarker *marker, s32 arg1){
void func_8038D8B4(Actor *actor){}
void func_8038D8BC(Actor *this){
f32 sp64[3];
f32 player_position[3];
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
f32 sp5C;
f32 sp58;
@@ -540,7 +540,7 @@ void func_8038D8BC(Actor *this){
return;
}
player_getPosition(&sp64);
player_getPosition(player_position);
if(this->state == 1){
if(func_803203FC(2)){
if(func_803203FC(3)){
@@ -548,7 +548,7 @@ void func_8038D8BC(Actor *this){
}
}
else{//L8038DAA8
if(ml_vec3f_distance(&this->position, &sp64) < 1200.0f){
if(ml_vec3f_distance(this->position, player_position) < 1200.0f){
RBB_func_8038CC9C(this, 2);
}
}
@@ -565,7 +565,7 @@ void func_8038D8BC(Actor *this){
if(func_8033567C(this->unk148) == ASSET_147_ANIM_BOOMBOX_MOVE){
func_8033568C(this->unk148, &sp5C, &sp58);
if(sp5C < 0.6 && 0.6 <= sp58){
func_8030E878(SFX_6C_LOCKUP_CLOSING, randf2(-0.05f, 0.05f) + local->unk0->unk14, 0x4e20, &this->position, 500.0f, 1000.0f);
func_8030E878(SFX_6C_LOCKUP_CLOSING, randf2(-0.05f, 0.05f) + local->unk0->unk14, 20000, this->position, 500.0f, 1000.0f);
}//L8038DC04
if(sp5C < 0.1 && 0.1 <= sp58){
func_8038C39C(this);
@@ -584,7 +584,7 @@ void func_8038D8BC(Actor *this){
func_8033568C(this->unk148, &sp54, &sp50);
if(0.1 <= sp50 && sp50 <= 0.6){
sp4C = (sp50 - 0.1)/0.5;
func_80255FE4(&this->position, &local->unk8, &local->unk14, sp4C);
func_80255FE4(this->position, local->unk8, local->unk14, sp4C);
this->yaw = local->unk24 + sp4C*(local->unk28 - local->unk24);
}
@@ -602,7 +602,7 @@ void func_8038D8BC(Actor *this){
tmp_f2 = tmp_f2/0.3;
else
tmp_f2 = 1.0f;
func_80255FE4(&this->position, &local->unk8, &local->unk14, tmp_f2);
func_80255FE4(this->position, local->unk8, local->unk14, tmp_f2);
}
}//L8038DE10

2
src/RBB/code_8520.c
View File

@@ -305,7 +305,7 @@ Actor * func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
D_803912A0[0] = actor->pitch;
D_803912A0[1] = actor->yaw;
D_803912A0[2] = actor->roll;
func_8033A334(sp28, &D_80390DDC);
modelRender_setPrimAndEnvColors(sp28, &D_80390DDC);
}//L8038F5F8
return func_80325888(marker, gdl, mptr, arg3);
}