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

Merge branch 'mr-origin-69'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:26:40 -05:00
parent d55a8d829d d36f6a807c
commit 425e05a58b
80 changed files with 806 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core2/code_6B030.c
View File

@@ -3,6 +3,8 @@
#include "variables.h"
#include "ml/mtx.h"
#include <core1/viewport.h>
extern s16 D_803A5D00[2][0xF660];
@@ -69,11 +71,11 @@ void func_802F1FC0(Struct65s *self, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
s32 width;
s32 height;
viewport_get_position_vec3f(spDC);
viewport_getPosition_vec3f(spDC);
spD0[0] = self->unk0[0] - spDC[0];
spD0[1] = self->unk0[1] - spDC[1];
spD0[2] = self->unk0[2] - spDC[2];
mlMtxSet(func_8024DD90());
mlMtxSet(viewport_getMatrix());
func_80252330(spD0[0], spD0[1], spD0[2]);
mlMtxApply(*mtx);
gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -328,7 +330,7 @@ void func_802F2ED0(Struct64s *arg0, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 sp38[3];
if (arg0 != NULL && arg0->unk4) {
viewport_get_rotation_vec3f(sp38);
viewport_getRotation_vec3f(sp38);
mlMtxIdent();
mlMtxRotPitch(-sp38[0]);
mlMtxRotYaw(-sp38[1]);