diff --git a/src/actors/banana/render.inc.c b/src/actors/banana/render.inc.c index ef8abb19a..abd2fa7b7 100644 --- a/src/actors/banana/render.inc.c +++ b/src/actors/banana/render.inc.c @@ -16,7 +16,7 @@ void render_actor_banana(Camera* camera, UNUSED Mat4 arg1, struct BananaActor* b Mat4 sp3C; f32 temp = - render_distance_squared(camera->pos, banana->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 490000.0f); + distance_if_visible(camera->pos, banana->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 490000.0f); if (temp < 0.0f) { actor_not_rendered(camera, (struct Actor*) banana); return; @@ -34,12 +34,12 @@ void render_actor_banana(Camera* camera, UNUSED Mat4 arg1, struct BananaActor* b actor_rendered(camera, (struct Actor*) banana); if (banana->state == 5) { - mtxf_rotation_zxy_translate(sp3C, banana->pos, banana->rot); + mtxf_rotate_zxy_translate(sp3C, banana->pos, banana->rot); } else { sp7C[0] = 0; sp7C[1] = 0; sp7C[2] = 0; - mtxf_rotation_zxy_translate(sp3C, banana->pos, sp7C); + mtxf_rotate_zxy_translate(sp3C, banana->pos, sp7C); } maxObjectsReached = render_set_position(sp3C, 0) == 0; diff --git a/src/actors/box_truck/render.inc.c b/src/actors/box_truck/render.inc.c index b7d215fb7..f4ab446e7 100644 --- a/src/actors/box_truck/render.inc.c +++ b/src/actors/box_truck/render.inc.c @@ -17,7 +17,7 @@ void render_actor_box_truck(Camera* arg0, struct Actor* arg1) { Mat4 spD8; UNUSED s32 pad2[32]; f32 temp_f0 = - render_distance_squared(arg0->pos, arg1->pos, arg0->rot[1], 2500.0f, gCameraZoom[arg0 - camera1], 9000000.0f); + distance_if_visible(arg0->pos, arg1->pos, arg0->rot[1], 2500.0f, gCameraZoom[arg0 - camera1], 9000000.0f); if (temp_f0 < 0.0f) { return; } @@ -25,7 +25,7 @@ void render_actor_box_truck(Camera* arg0, struct Actor* arg1) { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(spD8, arg1->pos, arg1->rot); + mtxf_rotate_zxy_translate(spD8, arg1->pos, arg1->rot); if (render_set_position(spD8, 0) != 0) { switch (arg1->state) { diff --git a/src/actors/car/render.inc.c b/src/actors/car/render.inc.c index 0b65093ae..87980f80c 100644 --- a/src/actors/car/render.inc.c +++ b/src/actors/car/render.inc.c @@ -15,14 +15,14 @@ void render_actor_car(Camera* arg0, struct Actor* arg1) { Mat4 spC8; UNUSED s32 pad2[32]; f32 temp_f0 = - render_distance_squared(arg0->pos, arg1->pos, arg0->rot[1], 2500.0f, gCameraZoom[arg0 - camera1], 9000000.0f); + distance_if_visible(arg0->pos, arg1->pos, arg0->rot[1], 2500.0f, gCameraZoom[arg0 - camera1], 9000000.0f); if (!(temp_f0 < 0.0f)) { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(spC8, arg1->pos, arg1->rot); + mtxf_rotate_zxy_translate(spC8, arg1->pos, arg1->rot); mtxf_scale(spC8, 0.1f); if (render_set_position(spC8, 0) != 0) { diff --git a/src/actors/cow/render.inc.c b/src/actors/cow/render.inc.c index fe67eab84..a313043d6 100644 --- a/src/actors/cow/render.inc.c +++ b/src/actors/cow/render.inc.c @@ -13,7 +13,7 @@ * @param arg2 */ void render_actor_cow(Camera* camera, Mat4 arg1, struct Actor* arg2) { - if (render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], + if (distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < 0) { return; } diff --git a/src/actors/fake_item_box/render.inc.c b/src/actors/fake_item_box/render.inc.c index 15e8118c7..36e4cf9e0 100644 --- a/src/actors/fake_item_box/render.inc.c +++ b/src/actors/fake_item_box/render.inc.c @@ -24,7 +24,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox) f32 temp_f2_2; f32 someMultiplier; - if (render_distance_squared(camera->pos, fakeItemBox->pos, camera->rot[1], 2500.0f, gCameraZoom[camera - camera1], + if (distance_if_visible(camera->pos, fakeItemBox->pos, camera->rot[1], 2500.0f, gCameraZoom[camera - camera1], 1000000.0f) < 0) { actor_not_rendered(camera, (struct Actor*) fakeItemBox); return; @@ -42,7 +42,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox) someRot[0] = 0; someRot[1] = fakeItemBox->rot[1]; someRot[2] = 0; - mtxf_rotation_zxy_translate(someMatrix2, fakeItemBox->pos, someRot); + mtxf_rotate_zxy_translate(someMatrix2, fakeItemBox->pos, someRot); mtxf_scale(someMatrix2, fakeItemBox->sizeScaling); if (fakeItemBox->state != 2) { @@ -51,7 +51,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox) } gSPDisplayList(gDisplayListHead++, common_model_fake_itembox); - mtxf_rotation_zxy_translate(someMatrix2, fakeItemBox->pos, fakeItemBox->rot); + mtxf_rotate_zxy_translate(someMatrix2, fakeItemBox->pos, fakeItemBox->rot); mtxf_scale(someMatrix2, fakeItemBox->sizeScaling); if (!render_set_position(someMatrix2, 0)) { @@ -78,7 +78,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox) gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); gDPSetBlendMask(gDisplayListHead++, 0xFF); thing = fakeItemBox->someTimer; - mtxf_rotation_zxy_translate(someMatrix2, fakeItemBox->pos, fakeItemBox->rot); + mtxf_rotate_zxy_translate(someMatrix2, fakeItemBox->pos, fakeItemBox->rot); if (thing < 10.0f) { someMultiplier = 1.0f; } else { diff --git a/src/actors/falling_rock/render.inc.c b/src/actors/falling_rock/render.inc.c index ba94bb2e8..5b3e09927 100644 --- a/src/actors/falling_rock/render.inc.c +++ b/src/actors/falling_rock/render.inc.c @@ -20,7 +20,7 @@ void render_actor_falling_rock(Camera* camera, struct FallingRock* rock) { return; } - height = render_distance_squared(camera->pos, rock->pos, camera->rot[1], 400.0f, gCameraZoom[camera - camera1], + height = distance_if_visible(camera->pos, rock->pos, camera->rot[1], 400.0f, gCameraZoom[camera - camera1], 4000000.0f); if (height < 0.0f) { @@ -37,14 +37,14 @@ void render_actor_falling_rock(Camera* camera, struct FallingRock* rock) { sp98[1] = 0; sp98[2] = 0; sp8C[1] = height + 2.0f; - mtxf_rotation_zxy_translate(sp4C, sp8C, sp98); + mtxf_rotate_zxy_translate(sp4C, sp8C, sp98); if (render_set_position(sp4C, 0) == 0) { return; } gSPDisplayList(gDisplayListHead++, d_course_choco_mountain_dl_6F88); } } - mtxf_rotation_zxy_translate(sp4C, rock->pos, rock->rot); + mtxf_rotate_zxy_translate(sp4C, rock->pos, rock->rot); if (render_set_position(sp4C, 0) == 0) { return; } diff --git a/src/actors/item_box/render.inc.c b/src/actors/item_box/render.inc.c index 17cbbcda0..d0288a637 100644 --- a/src/actors/item_box/render.inc.c +++ b/src/actors/item_box/render.inc.c @@ -26,7 +26,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { f32 temp_f2_2; f32 someMultiplier; - temp_f0 = render_distance_squared(camera->pos, item_box->pos, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], + temp_f0 = distance_if_visible(camera->pos, item_box->pos, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], 4000000.0f); if (!(temp_f0 < 0.0f) && !(600000.0f < temp_f0)) { if ((item_box->state == 2) && (temp_f0 < 100000.0f)) { @@ -36,7 +36,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { someVec2[0] = item_box->pos[0]; someVec2[1] = item_box->resetDistance + 2.0f; someVec2[2] = item_box->pos[2]; - mtxf_rotation_zxy_translate(someMatrix1, someVec2, someRot); + mtxf_rotate_zxy_translate(someMatrix1, someVec2, someRot); if (!render_set_position(someMatrix1, 0)) { return; @@ -45,7 +45,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { gSPDisplayList(gDisplayListHead++, D_0D002EE8); someRot[1] = item_box->rot[1] * 2; someVec2[1] = item_box->pos[1]; - mtxf_rotation_zxy_translate(someMatrix1, someVec2, someRot); + mtxf_rotate_zxy_translate(someMatrix1, someVec2, someRot); if (!render_set_position(someMatrix1, 0)) { return; @@ -54,7 +54,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { gSPDisplayList(gDisplayListHead++, itemBoxQuestionMarkModel); } if (item_box->state == 5) { - mtxf_rotation_zxy_translate(someMatrix1, item_box->pos, item_box->rot); + mtxf_rotate_zxy_translate(someMatrix1, item_box->pos, item_box->rot); if (!render_set_position(someMatrix1, 0)) { return; @@ -63,7 +63,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { gSPDisplayList(gDisplayListHead++, itemBoxQuestionMarkModel); } if (item_box->state != 3) { - mtxf_rotation_zxy_translate(someMatrix1, item_box->pos, item_box->rot); + mtxf_rotate_zxy_translate(someMatrix1, item_box->pos, item_box->rot); if (!render_set_position(someMatrix1, 0)) { return; @@ -90,7 +90,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); gDPSetBlendMask(gDisplayListHead++, 0xFF); thing = item_box->someTimer; - mtxf_rotation_zxy_translate(someMatrix1, item_box->pos, item_box->rot); + mtxf_rotate_zxy_translate(someMatrix1, item_box->pos, item_box->rot); if (thing < 10.0f) { someMultiplier = 1.0f; } else { diff --git a/src/actors/mario_sign/render.inc.c b/src/actors/mario_sign/render.inc.c index 1383b0c6c..f9e7eb59e 100644 --- a/src/actors/mario_sign/render.inc.c +++ b/src/actors/mario_sign/render.inc.c @@ -19,11 +19,11 @@ void render_actor_mario_sign(Camera* arg0, UNUSED Mat4 arg1, struct Actor* arg2) return; } - unk = render_distance_squared(arg0->pos, arg2->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f); + unk = distance_if_visible(arg0->pos, arg2->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f); if (!(unk < 0.0f)) { gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(sp40, arg2->pos, arg2->rot); + mtxf_rotate_zxy_translate(sp40, arg2->pos, arg2->rot); if (render_set_position(sp40, 0) != 0) { gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_sign); } diff --git a/src/actors/paddle_boat/render.inc.c b/src/actors/paddle_boat/render.inc.c index 2eb0223b4..fdd16a2e4 100644 --- a/src/actors/paddle_boat/render.inc.c +++ b/src/actors/paddle_boat/render.inc.c @@ -29,7 +29,7 @@ void render_actor_paddle_boat(Camera* arg0, struct PaddleWheelBoat* boat, UNUSED } temp = - render_distance_squared(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f); + distance_if_visible(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f); if (temp < 0.0f) { return; @@ -38,7 +38,7 @@ void render_actor_paddle_boat(Camera* arg0, struct PaddleWheelBoat* boat, UNUSED gSPSetLights1(gDisplayListHead++, D_800DC610[1]); gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - mtxf_rotation_zxy_translate(spE0, boat->pos, boat->boatRot); + mtxf_rotate_zxy_translate(spE0, boat->pos, boat->boatRot); if (render_set_position(spE0, 1) != 0) { // Render the boat diff --git a/src/actors/palm_tree/render.inc.c b/src/actors/palm_tree/render.inc.c index 94fa5c4b8..60690e4e3 100644 --- a/src/actors/palm_tree/render.inc.c +++ b/src/actors/palm_tree/render.inc.c @@ -21,13 +21,13 @@ void render_actor_palm_tree(Camera* arg0, UNUSED Mat4 arg1, struct PalmTree* arg } temp_f0 = - render_distance_squared(arg0->pos, arg2->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], 4000000.0f); + distance_if_visible(arg0->pos, arg2->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], 4000000.0f); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) { func_8029794C(arg2->pos, arg2->rot, 2.0f); } - mtxf_rotation_zxy_translate(sp68, arg2->pos, spA8); + mtxf_rotate_zxy_translate(sp68, arg2->pos, spA8); if (render_set_position(sp68, 0) != 0) { gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); diff --git a/src/actors/piranha_plant/render.inc.c b/src/actors/piranha_plant/render.inc.c index c57754c34..6c98bd599 100644 --- a/src/actors/piranha_plant/render.inc.c +++ b/src/actors/piranha_plant/render.inc.c @@ -25,7 +25,7 @@ void render_actor_piranha_plant(Camera* arg0, Mat4 arg1, struct PiranhaPlant* ar return; } - temp_f0 = render_distance_squared(arg0->pos, arg2->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 1000000.0f); + temp_f0 = distance_if_visible(arg0->pos, arg2->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 1000000.0f); if (temp_f0 < 0.0f) { diff --git a/src/actors/railroad_crossing/render.inc.c b/src/actors/railroad_crossing/render.inc.c index be0af549a..674bc3da5 100644 --- a/src/actors/railroad_crossing/render.inc.c +++ b/src/actors/railroad_crossing/render.inc.c @@ -13,11 +13,11 @@ void render_actor_railroad_crossing(Camera* arg0, struct RailroadCrossing* rr_crossing) { UNUSED Vec3s sp80 = { 0, 0, 0 }; Mat4 sp40; - f32 unk = render_distance_squared(arg0->pos, rr_crossing->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], + f32 unk = distance_if_visible(arg0->pos, rr_crossing->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], 4000000.0f); if (!(unk < 0.0f)) { - mtxf_rotation_zxy_translate(sp40, rr_crossing->pos, rr_crossing->rot); + mtxf_rotate_zxy_translate(sp40, rr_crossing->pos, rr_crossing->rot); if (render_set_position(sp40, 0) != 0) { gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING); diff --git a/src/actors/school_bus/render.inc.c b/src/actors/school_bus/render.inc.c index d3edba36c..81cccd8c4 100644 --- a/src/actors/school_bus/render.inc.c +++ b/src/actors/school_bus/render.inc.c @@ -18,7 +18,7 @@ void render_actor_school_bus(Camera* arg0, struct Actor* arg1) { f32 temp_f0; temp_f0 = - render_distance_squared(arg0->pos, arg1->pos, arg0->rot[1], 2500.0f, gCameraZoom[arg0 - camera1], 9000000.0f); + distance_if_visible(arg0->pos, arg1->pos, arg0->rot[1], 2500.0f, gCameraZoom[arg0 - camera1], 9000000.0f); if (temp_f0 < 0.0f) { return; } @@ -26,7 +26,7 @@ void render_actor_school_bus(Camera* arg0, struct Actor* arg1) { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(spC8, arg1->pos, arg1->rot); + mtxf_rotate_zxy_translate(spC8, arg1->pos, arg1->rot); if (render_set_position(spC8, 0) != 0) { if (gActiveScreenMode == SCREEN_MODE_1P) { diff --git a/src/actors/tanker_truck/render.inc.c b/src/actors/tanker_truck/render.inc.c index c16564207..1703b99c9 100644 --- a/src/actors/tanker_truck/render.inc.c +++ b/src/actors/tanker_truck/render.inc.c @@ -14,7 +14,7 @@ void render_actor_tanker_truck(Camera* camera, struct Actor* arg1) { UNUSED s32 pad[6]; Mat4 spC8; UNUSED s32 pad2[32]; - f32 temp_f0 = render_distance_squared(camera->pos, arg1->pos, camera->rot[1], 2500.0f, + f32 temp_f0 = distance_if_visible(camera->pos, arg1->pos, camera->rot[1], 2500.0f, gCameraZoom[camera - camera1], 9000000.0f); if (!(temp_f0 < 0.0f)) { @@ -22,7 +22,7 @@ void render_actor_tanker_truck(Camera* camera, struct Actor* arg1) { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(spC8, arg1->pos, arg1->rot); + mtxf_rotate_zxy_translate(spC8, arg1->pos, arg1->rot); if (render_set_position(spC8, 0) != 0) { if (gActiveScreenMode == SCREEN_MODE_1P) { diff --git a/src/actors/train/render.inc.c b/src/actors/train/render.inc.c index 86f4a6ce2..c5b8dfc7c 100644 --- a/src/actors/train/render.inc.c +++ b/src/actors/train/render.inc.c @@ -19,7 +19,7 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) { Mat4 spE0; Mat4 spA0; - f32 distance = render_distance_squared(camera->pos, actor->pos, camera->rot[1], 2500.0f, + f32 distance = distance_if_visible(camera->pos, actor->pos, camera->rot[1], 2500.0f, gCameraZoom[camera - camera1], 9000000.0f); if (distance < 0.0f) { @@ -28,7 +28,7 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) { gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(sp120, actor->pos, actor->rot); + mtxf_rotate_zxy_translate(sp120, actor->pos, actor->rot); maxObjectsReached = render_set_position(sp120, 0) == 0; if (maxObjectsReached) { return; @@ -166,7 +166,7 @@ void render_actor_train_tender(Camera* camera, struct TrainCar* actor) { Mat4 spE0; Mat4 spA0; - f32 temp_f0 = render_distance_squared(camera->pos, actor->pos, camera->rot[1], 625.0f, + f32 temp_f0 = distance_if_visible(camera->pos, actor->pos, camera->rot[1], 625.0f, gCameraZoom[camera - camera1], 9000000.0f); if (temp_f0 < 0.0f) { @@ -175,7 +175,7 @@ void render_actor_train_tender(Camera* camera, struct TrainCar* actor) { gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(sp120, actor->pos, actor->rot); + mtxf_rotate_zxy_translate(sp120, actor->pos, actor->rot); if (render_set_position(sp120, 0) == 0) { return; } @@ -251,7 +251,7 @@ void render_actor_train_passenger_car(Camera* camera, struct TrainCar* actor) { Mat4 spE0; Mat4 spA0; - f32 temp_f0 = render_distance_squared(camera->pos, actor->pos, camera->rot[1], 2025.0f, + f32 temp_f0 = distance_if_visible(camera->pos, actor->pos, camera->rot[1], 2025.0f, gCameraZoom[camera - camera1], 9000000.0f); if (temp_f0 < 0.0f) { @@ -260,7 +260,7 @@ void render_actor_train_passenger_car(Camera* camera, struct TrainCar* actor) { gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(sp120, actor->pos, actor->rot); + mtxf_rotate_zxy_translate(sp120, actor->pos, actor->rot); if (render_set_position(sp120, 0) == 0) { return; diff --git a/src/actors/trees/render.inc.c b/src/actors/trees/render.inc.c index 28b6ac7da..f7b6cea3a 100644 --- a/src/actors/trees/render.inc.c +++ b/src/actors/trees/render.inc.c @@ -20,7 +20,7 @@ void render_actor_tree_mario_raceway(Camera* camera, Mat4 arg1, struct Actor* ar } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 16000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 16000000.0f); if (temp_f0 < 0.0f) { return; @@ -55,7 +55,7 @@ void render_actor_tree_yoshi_valley(Camera* camera, Mat4 arg1, struct Actor* arg } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -90,7 +90,7 @@ void render_actor_tree_royal_raceway(Camera* camera, Mat4 arg1, struct Actor* ar } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -125,7 +125,7 @@ void render_actor_tree_moo_moo_farm(Camera* camera, Mat4 arg1, struct Actor* arg } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 6250000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 6250000.0f); if (temp_f0 < 0.0f) { return; @@ -154,7 +154,7 @@ void func_80299864(Camera* camera, Mat4 arg1, struct Actor* arg2) { } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -193,7 +193,7 @@ void render_actor_tree_bowser_castle(Camera* camera, Mat4 arg1, struct Actor* ar } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -228,7 +228,7 @@ void render_actor_bush_bowser_castle(Camera* camera, Mat4 arg1, struct Actor* ar } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f); if (temp_f0 < 0.0f) { return; @@ -263,7 +263,7 @@ void render_actor_tree_frappe_snowland(Camera* camera, Mat4 arg1, struct Actor* } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -297,7 +297,7 @@ void render_actor_tree_cactus1_kalimari_desert(Camera* camera, Mat4 arg1, struct } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -331,7 +331,7 @@ void render_actor_tree_cactus2_kalimari_desert(Camera* camera, Mat4 arg1, struct } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; @@ -365,7 +365,7 @@ void render_actor_tree_cactus3_kalimari_desert(Camera* camera, Mat4 arg1, struct } temp_f0 = - render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 < 0.0f) { return; diff --git a/src/actors/wario_sign/render.inc.c b/src/actors/wario_sign/render.inc.c index 1a9c37295..46058d050 100644 --- a/src/actors/wario_sign/render.inc.c +++ b/src/actors/wario_sign/render.inc.c @@ -12,13 +12,13 @@ */ void render_actor_wario_sign(Camera* arg0, struct Actor* arg1) { Mat4 sp38; - f32 unk = render_distance_squared(arg0->pos, arg1->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f); + f32 unk = distance_if_visible(arg0->pos, arg1->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f); if (!(unk < 0.0f)) { gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - mtxf_rotation_zxy_translate(sp38, arg1->pos, arg1->rot); + mtxf_rotate_zxy_translate(sp38, arg1->pos, arg1->rot); if (render_set_position(sp38, 0) != 0) { gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign); diff --git a/src/actors/yoshi_egg/render.inc.c b/src/actors/yoshi_egg/render.inc.c index b7acefb1b..c5e0db9b4 100644 --- a/src/actors/yoshi_egg/render.inc.c +++ b/src/actors/yoshi_egg/render.inc.c @@ -20,7 +20,7 @@ void render_actor_yoshi_egg(Camera* arg0, Mat4 arg1, struct YoshiValleyEgg* egg, f32 temp_f0; if (gGamestate != CREDITS_SEQUENCE) { - temp_f0 = render_distance_squared(arg0->pos, egg->pos, arg0->rot[1], 200.0f, gCameraZoom[arg0 - camera1], + temp_f0 = distance_if_visible(arg0->pos, egg->pos, arg0->rot[1], 200.0f, gCameraZoom[arg0 - camera1], 16000000.0f); if (temp_f0 < 0.0f) { return; @@ -42,7 +42,7 @@ void render_actor_yoshi_egg(Camera* arg0, Mat4 arg1, struct YoshiValleyEgg* egg, sp5C[0] = 0; sp5C[1] = egg->eggRot; sp5C[2] = 0; - mtxf_rotation_zxy_translate(sp60, egg->pos, sp5C); + mtxf_rotate_zxy_translate(sp60, egg->pos, sp5C); if (render_set_position(sp60, 0) == 0) { return; } diff --git a/src/racing/actors.c b/src/racing/actors.c index 2dcf614b4..c4b2bd88b 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -424,7 +424,7 @@ void func_8029794C(Vec3f pos, Vec3s rot, f32 scale) { Mat4 sp20; pos[1] += 2.0f; - mtxf_rotation_zxy_translate(sp20, pos, rot); + mtxf_rotate_zxy_translate(sp20, pos, rot); mtxf_scale(sp20, scale); if (render_set_position(sp20, 0) != 0) { gSPDisplayList(gDisplayListHead++, D_0D007B20); @@ -490,7 +490,7 @@ void render_cows(Camera* camera, Mat4 arg1, UNUSED struct Actor* actor) { sp88[1] = var_s1->pos[1]; sp88[2] = var_s1->pos[2]; temp_f0 = - render_distance_squared(camera->pos, sp88, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], 4000000.0f); + distance_if_visible(camera->pos, sp88, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], 4000000.0f); if (temp_f0 > 0.0f) { if (temp_f0 < D_8015F704) { D_8015F704 = temp_f0; @@ -631,7 +631,7 @@ void render_palm_trees(Camera* camera, Mat4 arg1, UNUSED struct Actor* actor) { spD4[1] = var_s1->pos[1]; spD4[2] = var_s1->pos[2]; - if (render_distance_squared(camera->pos, spD4, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], var_f22) < + if (distance_if_visible(camera->pos, spD4, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], var_f22) < 0.0f) { var_s1++; continue; @@ -640,7 +640,7 @@ void render_palm_trees(Camera* camera, Mat4 arg1, UNUSED struct Actor* actor) { test &= 0xF; test = (s16) test; if (test == 6) { - mtxf_rotation_zxy_translate(sp90, spD4, sp88); + mtxf_rotate_zxy_translate(sp90, spD4, sp88); if (!(gMatrixObjectCount < MTX_OBJECT_POOL_SIZE)) { break; } @@ -692,7 +692,7 @@ void render_actor_shell(Camera* camera, Mat4 matrix, struct ShellActor* shell) { uintptr_t phi_t3; f32 temp_f0 = - render_distance_squared(camera->pos, shell->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 490000.0f); + distance_if_visible(camera->pos, shell->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 490000.0f); s32 maxObjectsReached; if (temp_f0 < 0.0f) { actor_not_rendered(camera, (struct Actor*) shell); @@ -755,7 +755,7 @@ UNUSED void func_8029ABD4(f32* pos, s16 state) { } void func_8029AC18(Camera* camera, Mat4 arg1, struct Actor* arg2) { - if (render_distance_squared(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < + if (distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < 0) { return; } diff --git a/src/racing/math_util.c b/src/racing/math_util.c index e2b6c99bb..f677863d5 100644 --- a/src/racing/math_util.c +++ b/src/racing/math_util.c @@ -227,15 +227,15 @@ void mtxf_identity(Mat4 mtx) { } /* - * @brief Add a translation vector to a matrix - * @param scr The matrix to be copied - * @param dest The matrix to be overriden with the result - * @param vecTrans The translation vector to be added + * @brief Add a translation vector to a matrix + * @param scr The matrix to be copied + * @param dest The matrix to be overriden with the result + * @param translate The translation vector to be added */ -void add_translate_mat4_vec3f(Mat4 src, Mat4 dest, Vec3f vecTrans) { - dest[3][0] = src[3][0] + vecTrans[0]; - dest[3][1] = src[3][1] + vecTrans[1]; - dest[3][2] = src[3][2] + vecTrans[2]; +void add_translate_mat4_vec3f(Mat4 src, Mat4 dest, Vec3f translate) { + dest[3][0] = src[3][0] + translate[0]; + dest[3][1] = src[3][1] + translate[1]; + dest[3][2] = src[3][2] + translate[2]; dest[3][3] = src[3][3]; dest[0][0] = src[0][0]; dest[0][1] = src[0][1]; @@ -251,10 +251,10 @@ void add_translate_mat4_vec3f(Mat4 src, Mat4 dest, Vec3f vecTrans) { dest[2][3] = src[2][3]; /* - * src(0,0) src(0,1) src(0,2) src(0,3) - * src(1,0) src(1,1) src(1,2) src(1,3) - * src(2,0) src(2,1) src(2,2) src(2,3) - * src(3,0)+vecTrans(0) src(3,1)+vecTrans(1) src(3,2)+vecTrans(2) src(3,3) + * src(0,0) src(0,1) src(0,2) src(0,3) + * src(1,0) src(1,1) src(1,2) src(1,3) + * src(2,0) src(2,1) src(2,2) src(2,3) + * src(3,0)+translate(0) src(3,1)+translate(1) src(3,2)+translate(2) src(3,3) */ } @@ -266,19 +266,19 @@ UNUSED void add_translate_mat4_vec3f_lite(Mat4 mat, Mat4 dest, Vec3f pos) { } /* - * @brief Creates a translation matrix - * @param dest The matrix to be overriden with the translation matrix - * @param vecTrans The translation vector to be added + * @brief Creates a translation matrix + * @param dest The matrix to be overriden with the translation matrix + * @param translate The translation vector to be added */ -void mtxf_translate(Mat4 dest, Vec3f vecTrans) { +void mtxf_translate(Mat4 dest, Vec3f translate) { mtxf_identity(dest); - dest[3][0] = vecTrans[0]; - dest[3][1] = vecTrans[1]; - dest[3][2] = vecTrans[2]; - /* 1 0 0 0 - * 0 1 0 0 - * 0 0 1 0 - * vecTrans[0] vecTrans[1] vecTrans[2] 1 + dest[3][0] = translate[0]; + dest[3][1] = translate[1]; + dest[3][2] = translate[2]; + /* 1 0 0 0 + * 0 1 0 0 + * 0 0 1 0 + * translate[0] translate[1] translate[2] 1 */ } /* @@ -582,10 +582,10 @@ void mtxf_scale(Mat4 mtx, f32 coef) { /* * @brief Matrix for rotating about Z, X, Y axes (in order) then translating * @param dest Matrix to output - * @param vecTrans vector to use for translation - * @param orientation vector of 3 rotation angles (Rz, Rx, Ry) + * @param translate Vector to use for translation + * @param orientation Vector of 3 rotation angles (Rz, Rx, Ry) */ -void mtxf_rotation_zxy_translate(Mat4 dest, Vec3f vecTrans, Vec3s orientation) { +void mtxf_rotate_zxy_translate(Mat4 dest, Vec3f translate, Vec3s orientation) { f32 sinX; f32 cosX; f32 sinY; @@ -602,15 +602,15 @@ void mtxf_rotation_zxy_translate(Mat4 dest, Vec3f vecTrans, Vec3s orientation) { dest[0][0] = (cosY * cosZ) + ((sinX * sinY) * sinZ); dest[1][0] = (-cosY * sinZ) + ((sinX * sinY) * cosZ); dest[2][0] = cosX * sinY; - dest[3][0] = vecTrans[0]; + dest[3][0] = translate[0]; dest[0][1] = cosX * sinZ; dest[1][1] = cosX * cosZ; dest[2][1] = -sinX; - dest[3][1] = vecTrans[1]; + dest[3][1] = translate[1]; dest[0][2] = (-sinY * cosZ) + ((sinX * cosY) * sinZ); dest[1][2] = (sinY * sinZ) + ((sinX * cosY) * cosZ); dest[2][2] = cosX * cosY; - dest[3][2] = vecTrans[2]; + dest[3][2] = translate[2]; dest[0][3] = 0.0f; dest[1][3] = 0.0f; dest[2][3] = 0.0f; @@ -1345,7 +1345,8 @@ s32 is_between_angle(u16 angleCCW, u16 angleCW, u16 angleToCheck) { } /* - * @brief Determines whether an object is within the render distance of a camera. + * @brief Finds the xz-distance squared between a point and the camera, if the point is visible (or near visible) to + * the camera * * @param cameraPos The position of the camera in 3D space. * @param objectPos The position of the object in 3D space. @@ -1353,11 +1354,11 @@ s32 is_between_angle(u16 angleCCW, u16 angleCW, u16 angleToCheck) { * @param preloadDistanceSquared Consider an object within this distance of viweable area as renderable * @param fovDegrees The field of view (FOV) of the camera (degrees). * @param maxDistanceSquared The maximum render distance. - * @return The distance between the camera and the object if it's within render distance of the - * camera's vision, or -1.0f if it exceeds the render distance. + * @return The xz-distance squared between the camera and the object if it's within render distance + of the camera's vision, or -1.0f if it exceeds the render distance. */ -f32 render_distance_squared(Vec3f cameraPos, Vec3f objectPos, u16 orientationY, f32 preloadDistanceSquared, +f32 distance_if_visible(Vec3f cameraPos, Vec3f objectPos, u16 orientationY, f32 preloadDistanceSquared, f32 fovDegrees, f32 maxDistanceSquared) { u16 angleObject; UNUSED u16 pad; diff --git a/src/racing/math_util.h b/src/racing/math_util.h index a4e052547..6ba4d0aa3 100644 --- a/src/racing/math_util.h +++ b/src/racing/math_util.h @@ -41,7 +41,7 @@ void func_802B5CAC(s16, s16, Vec3f); // Unused void func_802B5D30(s16, s16, s32); // Unused void set_course_lighting(Lights1*, s16, s16, s32); void mtxf_scale(Mat4, f32); -void mtxf_rotation_zxy_translate(Mat4, Vec3f, Vec3s); +void mtxf_rotate_zxy_translate(Mat4, Vec3f, Vec3s); void mtxf_transform_vec3f_mat3(Vec3f, Mat3); void mtxf_transform_vec3f_mat4(Vec3f, Mat4); void vec3f_rotate_y(Vec3f, s16); @@ -64,7 +64,7 @@ void planar_angles(Vec3f, Vec3f, Vec3s); f32 sins(u16); f32 coss(u16); s32 is_between_angle(u16, u16, u16); -f32 render_distance_squared(Vec3f, Vec3f, u16, f32, f32, f32); +f32 distance_if_visible(Vec3f, Vec3f, u16, f32, f32, f32); extern s32 D_802B91C0[]; // Unused extern Vec3f D_802B91C8;