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

identified/labeled camera functions

Browse Source
This commit is contained in:
Banjo Kazooie
2023-03-10 21:52:35 -06:00
parent 13728811aa
commit 7f3dd5aa12
164 changed files with 1583 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/badShad.c
View File

@@ -87,7 +87,7 @@ f32 func_802D7038(Actor *this) {
void func_802D7124(Actor *actor, f32 arg1) {
f32 sp1C[3];
func_8024C5CC(&sp1C);
viewport_getPosition(&sp1C);
if ((actor->position[0] - sp1C[0]) * (actor->position[0] - sp1C[0]) + (actor->position[2] - sp1C[2]) * (actor->position[2] - sp1C[2]) < 12250000.0f) {
func_802D729C(actor, arg1);
}

6
src/core2/ch/bottlesbonus.c
View File

@@ -135,9 +135,9 @@ void chBottlesBonus_func_802DD080(Gfx **gfx, Mtx **mtx) {
sp18[1] = 270.0f;
sp18[2] = 0.0f;
}
func_8024CD88(sp24);
func_8024CE18(sp18);
func_8024CFD4();
viewport_setPosition(sp24);
viewport_setRotation(sp18);
viewport_update();
func_8024C904(gfx, mtx);
}

8
src/core2/ch/clucker.c
View File

@@ -22,7 +22,7 @@ extern ActorInfo D_80372870 = {
};
/* .code */
void func_80357150(Actor *this){
void __clucker_setDeathCutsceneCamera(Actor *this){
f32 sp34[3];
f32 sp28[3];
f32 sp1C[3];
@@ -44,7 +44,7 @@ void func_80357150(Actor *this){
sp28[0] = -50.0f;
sp28[1] = this->yaw + 20.0f;
sp28[2] = 0.0f;
func_802BAE6C(sp34, sp28);
ncStaticCamera_setPositionAndRotation(sp34, sp28);
}
void func_80357264(Actor *this, s32 next_state){
@@ -95,8 +95,8 @@ void func_80357264(Actor *this, s32 next_state){
){
levelSpecificFlags_set(0x14, TRUE);
func_80324E38(0.0f, 3);
func_80357150(this);
func_80324E88(2.0f);
__clucker_setDeathCutsceneCamera(this);
timed_exitStaticCamera(2.0f);
func_80324E38(2.0f, 0);
}//L80357518
func_8030E6D4(SFX_1E_HITTING_AN_ENEMY_2);

12
src/core2/ch/code_468E0.c
View File

@@ -27,7 +27,7 @@ void func_802CD870(Actor *this){
void func_802CD898(Actor *this){
marker_despawn(this->marker);
func_802BBC58(2);
camera_setType(2);
}
void func_802CD8C0(Actor *this){
@@ -76,8 +76,8 @@ void func_802CD8C0(Actor *this){
mapSpecificFlags_set(4, TRUE);
}
else{
func_802BBC58(2);
func_802BD0D8(0xf);
camera_setType(2);
ncDynamicCamera_setState(0xf);
}
marker_despawn(this->marker);
}
@@ -87,12 +87,12 @@ void func_802CD8C0(Actor *this){
void func_802CDAC4(Actor *this){
f32 sp1C[3];
func_802BBC58(1);
func_8024CD88(this->position);
camera_setType(1);
viewport_setPosition(this->position);
sp1C[0] = this->pitch;
sp1C[1] = this->yaw;
sp1C[2] = 0.0f;
func_8024CE18(sp1C);
viewport_setRotation(sp1C);
}
void func_802CDB18(Actor *this){

4
src/core2/ch/crab.c
View File

@@ -146,9 +146,9 @@ void __chCrab_spawn_mutant_crab_jiggy(void) {
void __chCrab_mutantTextCallback(ActorMarker *caller, enum asset_e text_id, s32 model_id){
if (text_id == ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT) {
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 4);
timed_setStaticCameraToNode(0.0f, 4);
timedFunc_set_0(0.1f, __chCrab_spawn_mutant_crab_jiggy);
func_80324E88(3.0f);
timed_exitStaticCamera(3.0f);
func_80324E38(3.0f, 0);
return;
}

2
src/core2/ch/gameSelect.c
View File

@@ -528,7 +528,7 @@ void func_802C4C14(Actor *this){
ml_vec3f_copy(D_80365DD0[i], sp34);
}
}
func_802BAEB4(
ncStaticCamera_setPositionAndTarget(
func_802C44EC(D_80365DD0[D_8037DCE8], D_80365DD0[D_80365E00], D_8037DD30),
func_802C44EC(D_80365E04[D_8037DCE8], D_80365E04[D_80365E00], D_8037DD30)
);

8
src/core2/ch/mole.c
View File

@@ -136,7 +136,7 @@ void func_802D9600(Actor * this){
}
void func_802D9658(Actor *this){
timed_setCameraToNode(0.0f, D_80367DC4[this->unkF4_8-9].camera_node);
timed_setStaticCameraToNode(0.0f, D_80367DC4[this->unkF4_8-9].camera_node);
}
void func_802D9698(ActorMarker *marker, enum asset_e arg1, s32 arg2){
@@ -155,7 +155,7 @@ void func_802D9698(ActorMarker *marker, enum asset_e arg1, s32 arg2){
func_80347A14(1);
actor->unk138_24 = FALSE;
}
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
if(actor->state == 5){
func_8028F918(0);
func_802D9600(actor);
@@ -170,7 +170,7 @@ void func_802D9830(ActorMarker *marker, enum asset_e arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
switch(arg2){
case 1:
timed_setCameraToNode(0.0f, 0x11);
timed_setStaticCameraToNode(0.0f, 0x11);
levelSpecificFlags_set(0x1A, 1);
break;
case 2:
@@ -178,7 +178,7 @@ void func_802D9830(ActorMarker *marker, enum asset_e arg1, s32 arg2){
func_802D9658(actor);
break;
case 3:
timed_setCameraToNode(0.0f, 0x29);
timed_setStaticCameraToNode(0.0f, 0x29);
levelSpecificFlags_set(0x1A, 1);
break;
case 4:

6
src/core2/ch/overlaynocontroller.c
View File

@@ -40,9 +40,9 @@ Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vt
func_8024E258();
{sp58[0] = 0.0f; sp58[1] = 0.0f; sp58[2] = 1312.5f;};
{sp4C[0] = 0.0f; sp4C[1] = 0.0f; sp4C[2] = 0.0f;};
func_8024CD88(sp58);
func_8024CE18(sp4C);
func_8024CFD4();
viewport_setPosition(sp58);
viewport_setRotation(sp4C);
viewport_update();
func_8024C904(gdl, mptr);
{sp40[0] = 0.0f; sp40[1] = 0.0f; sp40[2] = 0.0f;};
{sp34[0] = 0.0f; sp34[1] = 165.0f; sp34[2] = 0.0f;};

6
src/core2/ch/overlaypressstart.c
View File

@@ -50,9 +50,9 @@ Actor *chOverlayPressStart_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx
func_8024E258();
{sp58[0] = 0.0f; sp58[1] = 0.0f; sp58[2] = 1312.5f;};
{sp4C[0] = 0.0f; sp4C[1] = 0.0f; sp4C[2] = 0.0f;};
func_8024CD88(sp58);
func_8024CE18(sp4C);
func_8024CFD4();
viewport_setPosition(sp58);
viewport_setRotation(sp4C);
viewport_update();
func_8024C904(gdl, mptr);
{sp40[0] = 0.0f; sp40[1] = 0.0f; sp40[2] = 0.0f;};
{sp34[0] = 0.0f; sp34[1] = 400.0f; sp34[2] = 0.0f;};

2
src/core2/ch/termite.c
View File

@@ -52,7 +52,7 @@ void __chTermite_updateWalkSFX(Actor *this) {
f32 sp24[3];
f32 sp20;
func_8024C5CC(&sp24);
viewport_getPosition(&sp24);
sp20 = ml_map_f( (300.0f - sp24[0])*(300.0f - sp24[0]) + (this->position[1] - sp24[1])*(this->position[1] - sp24[1]) + (-858.0f - sp24[2])*(-858.0f - sp24[2])
, 7617600.0f, 8236900.0f
, 8000.0f, 1000.0f