summaryrefslogtreecommitdiff
path: root/src/code/z_view.c
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2020-06-24 21:20:31 -0400
committerGitHub <noreply@github.com>2020-06-24 21:20:31 -0400
commitd77dbe046568d92ae9f2576fe107cb90520e0afe (patch)
tree2e6e65e3573ffbb54d949c2b0dc8bcaf23bf739d /src/code/z_view.c
parent6b2a013cca4eeb86d52f52c6d681fbee8b560057 (diff)
Rename culling related variables (#225)
* rename some things * reword one comment * rename vars * fix bgjyalift
Diffstat (limited to 'src/code/z_view.c')
-rw-r--r--src/code/z_view.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 99878191b..fc0cc3c71 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -46,10 +46,10 @@ void View_Init(View* view, GraphicsContext* gfxCtx) {
view->fovy = 60.0f;
view->zNear = 10.0f;
view->zFar = 12800.0f;
- view->unk_34.x = 0.0f;
- view->unk_40.x = 0.0f;
- view->unk_40.y = 1.0f;
- view->unk_40.z = 0.0f;
+ view->lookAt.x = 0.0f;
+ view->up.x = 0.0f;
+ view->up.y = 1.0f;
+ view->up.z = 0.0f;
view->eye.z = -1.0f;
if (D_8012ABF0) {
@@ -63,21 +63,21 @@ void View_Init(View* view, GraphicsContext* gfxCtx) {
func_800AA7B8(view);
}
-void func_800AA358(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3) {
- if (eye->x == vec2->x && eye->z == vec2->z) {
+void func_800AA358(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
+ if (eye->x == lookAt->x && eye->z == lookAt->z) {
eye->x += 0.1f;
}
view->eye = *eye;
- view->unk_34 = *vec2;
- view->unk_40 = *vec3;
+ view->lookAt = *lookAt;
+ view->up = *up;
view->flags |= 1;
}
-void func_800AA3F0(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3) {
+void func_800AA3F0(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
view->eye = *eye;
- view->unk_34 = *vec2;
- view->unk_40 = *vec3;
+ view->lookAt = *lookAt;
+ view->up = *up;
}
void View_SetScale(View* view, f32 scale) {
@@ -344,15 +344,15 @@ s32 func_800AAA9C(View* view) {
LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667);
view->viewingPtr = viewing;
- if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) {
+ if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) {
view->eye.x += 1.0f;
view->eye.y += 1.0f;
view->eye.z += 1.0f;
}
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
- guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
- view->unk_40.x, view->unk_40.y, view->unk_40.z);
+ guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
+ view->up.x, view->up.y, view->up.z);
view->viewing = *viewing;
@@ -493,15 +493,15 @@ s32 func_800AB560(View* view) {
LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848);
view->viewingPtr = viewing;
- if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) {
+ if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) {
view->eye.x += 1.0f;
view->eye.y += 1.0f;
view->eye.z += 1.0f;
}
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
- guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
- view->unk_40.x, view->unk_40.y, view->unk_40.z);
+ guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
+ view->up.x, view->up.y, view->up.z);
view->viewing = *viewing;
@@ -518,8 +518,8 @@ s32 func_800AB944(View* view) {
Graph_OpenDisps(dispRefs, view->gfxCtx, "../z_view.c", 878);
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
- guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
- view->unk_40.x, view->unk_40.y, view->unk_40.z);
+ guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
+ view->up.x, view->up.y, view->up.z);
Graph_CloseDisps(dispRefs, view->gfxCtx, "../z_view.c", 886);
@@ -582,8 +582,8 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) {
view->viewingPtr = viewing;
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
- guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
- view->unk_40.x, view->unk_40.y, view->unk_40.z);
+ guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
+ view->up.x, view->up.y, view->up.z);
view->viewing = *viewing;