1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 23:14:37 +00:00

db_camera (#842)

* Decompile shrink_window.c

* progress

* progress

* makefile

* progress

* match 8 functions

* 1 more match

* match 2 functions

* decompile func_800B9638

* fix flow

* migrate .bss

* doc

* name some stuff

* fixes

* comment fix

* remove scene .c files

* old z_camera .s files

* revert z_camera change

* revert unwanted z_camera change

* fixes

* remove unused files, run clang-format and fix non-matching

* fix clang-format causing non-matching

* remove newline + old comment in func_800B3BD4

* make db_camera global variables static

* add s prefix to startic variables

* change magic constants

* rename "unk_50"

* Match func_800B3BD4 and Match DbCamera_UpdateDemoControl (-bss)

* Lots of progress on update

* Mainly cleanup

* run format.sh + remove unused asm

* replace chevrons with add quotes

* remove useless cast + use correct empty argument function declaration

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
This commit is contained in:
Random 2021-07-26 00:34:25 +02:00 committed by GitHub
parent ed54be7cf6
commit d223e246c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 2744 additions and 3224 deletions

File diff suppressed because it is too large Load diff

View file

@ -6781,12 +6781,12 @@ void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, GlobalCon
PREG(i) = sPREGInit[i];
}
DbgCamera_FirstInit(camera, &D_8015BD80);
DbCamera_Reset(camera, &D_8015BD80);
sInitRegs = false;
PREG(88) = -1;
}
camera->globalCtx = D_8015BD7C = globalCtx;
DbgCamera_Init(&D_8015BD80, camera);
DbCamera_Init(&D_8015BD80, camera);
curUID = sNextUID;
sNextUID++;
while (curUID != 0) {
@ -7437,7 +7437,7 @@ Vec3s Camera_Update(Camera* camera) {
// Debug cam update
if (gDbgCamEnabled) {
camera->globalCtx->view.fovy = D_8015BD80.fov;
DbgCamera_Update(&D_8015BD80, camera);
DbCamera_Update(&D_8015BD80, camera);
func_800AA358(&camera->globalCtx->view, &D_8015BD80.eye, &D_8015BD80.at, &D_8015BD80.up);
if (R_DBG_CAM_UPDATE) {
osSyncPrintf("camera: debug out\n");