summaryrefslogtreecommitdiff
path: root/src/code/z_view.c
diff options
context:
space:
mode:
authorcadmic <cadmic24@gmail.com>2024-01-16 06:59:02 -0800
committerGitHub <noreply@github.com>2024-01-16 09:59:02 -0500
commit6b5533ccd92eb79c217321a77a5ff3637cc57991 (patch)
tree1822536cbfeb9b6ea5d81b2fbe7da097fc1cd9b0 /src/code/z_view.c
parenta5fbfdba01fea1822fc63384c8a4bd5a96d137b6 (diff)
Create debug macros for LogUtils functions (#1610)
Diffstat (limited to 'src/code/z_view.c')
-rw-r--r--src/code/z_view.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 47b787bed..4b1638561 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -292,7 +292,7 @@ s32 View_ApplyPerspective(View* view) {
// Viewport
vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp));
- LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 601);
+ LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 601);
View_ViewportToVp(vp, &view->viewport);
view->vp = *vp;
@@ -303,7 +303,7 @@ s32 View_ApplyPerspective(View* view) {
// Perspective projection
projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 616);
+ LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 616);
view->projectionPtr = projection;
width = view->viewport.rightX - view->viewport.leftX;
@@ -351,7 +351,7 @@ s32 View_ApplyPerspective(View* view) {
// View matrix (look-at)
viewing = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667);
+ LOG_UTILS_CHECK_NULL_POINTER("viewing", viewing, "../z_view.c", 667);
view->viewingPtr = viewing;
if (view->eye.x == view->at.x && view->eye.y == view->at.y && view->eye.z == view->at.z) {
@@ -395,7 +395,7 @@ s32 View_ApplyOrtho(View* view) {
OPEN_DISPS(gfxCtx, "../z_view.c", 726);
vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp));
- LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 730);
+ LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 730);
View_ViewportToVp(vp, &view->viewport);
view->vp = *vp;
@@ -406,7 +406,7 @@ s32 View_ApplyOrtho(View* view) {
gSPViewport(OVERLAY_DISP++, vp);
projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744);
+ LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 744);
view->projectionPtr = projection;
guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
@@ -435,7 +435,7 @@ s32 View_ApplyOrthoToOverlay(View* view) {
OPEN_DISPS(gfxCtx, "../z_view.c", 777);
vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp));
- LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 781);
+ LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 781);
View_ViewportToVp(vp, &view->viewport);
view->vp = *vp;
@@ -445,7 +445,7 @@ s32 View_ApplyOrthoToOverlay(View* view) {
gSPViewport(OVERLAY_DISP++, vp);
projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791);
+ LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 791);
view->projectionPtr = projection;
guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
@@ -476,7 +476,7 @@ s32 View_ApplyPerspectiveToOverlay(View* view) {
OPEN_DISPS(gfxCtx, "../z_view.c", 816);
vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp));
- LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 821);
+ LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 821);
View_ViewportToVp(vp, &view->viewport);
view->vp = *vp;
@@ -486,7 +486,7 @@ s32 View_ApplyPerspectiveToOverlay(View* view) {
gSPViewport(OVERLAY_DISP++, vp);
projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 833);
+ LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 833);
view->projectionPtr = projection;
width = view->viewport.rightX - view->viewport.leftX;
@@ -501,7 +501,7 @@ s32 View_ApplyPerspectiveToOverlay(View* view) {
gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
viewing = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848);
+ LOG_UTILS_CHECK_NULL_POINTER("viewing", viewing, "../z_view.c", 848);
view->viewingPtr = viewing;
// This check avoids a divide-by-zero in guLookAt if eye == at
@@ -552,7 +552,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) {
if (mask & VIEW_VIEWPORT) {
vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp));
- LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 910);
+ LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 910);
View_ViewportToVp(vp, &view->viewport);
view->vp = *vp;
@@ -565,7 +565,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) {
if (mask & VIEW_PROJECTION_ORTHO) {
projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921);
+ LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 921);
view->projectionPtr = projection;
guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
@@ -576,7 +576,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) {
gSPMatrix(gfx++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
} else if (mask & (VIEW_PROJECTION_PERSPECTIVE | VIEW_VIEWPORT)) {
projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 932);
+ LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 932);
view->projectionPtr = projection;
width = view->viewport.rightX - view->viewport.leftX;
@@ -593,7 +593,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) {
if (mask & VIEW_VIEWING) {
viewing = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
- LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 948);
+ LOG_UTILS_CHECK_NULL_POINTER("viewing", viewing, "../z_view.c", 948);
view->viewingPtr = viewing;
View_ErrorCheckEyePosition(view->eye.x, view->eye.y, view->eye.z);