Merge remote-tracking branch 'origin/main' into feature/dynamic-aspect-ratio

src/d/actor/d_a_alink_kandelaar.inc

@@ -180,7 +180,12 @@ void daAlink_c::preKandelaarDraw() {
     mat_p->setTevColor(2, &color);
 
     cXyz proj;
+
+    #if TARGET_PC
+    mDoLib_project(&mKandelaarFlamePos, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&mKandelaarFlamePos, &proj);
+    #endif
 
     camera_process_class* camera_p = dComIfGp_getCamera(0);
     f32 trimHeight;

src/d/actor/d_a_demo00.cpp

@@ -1658,7 +1658,12 @@ int daDemo00_c::draw() {
             MTXCopy(mModel.field_0x5d4->getAnmMtx(0), mDoMtx_stack_c::get());
             spb0.set(0.0f, 0.0f, 0.0f);
             mDoMtx_stack_c::multVec(&spb0, &sp98);
+
+            #if TARGET_PC
+            mDoLib_project(&sp98, &spa4, {0, 0, FB_WIDTH, FB_HEIGHT});
+            #else
             mDoLib_project(&sp98, &spa4);
+            #endif
 
             if (spa4.x >= -700.0f && spa4.x < 1600.0f && spa4.y >= -200.0f && spa4.y < 600.0f) {
                 if (mModel.mID.field_0x18 == 0 || mModel.mID.field_0x18 == 1) {

src/d/actor/d_a_e_fk.cpp

@@ -429,7 +429,13 @@ void daE_FK_c::DamageAction() {
 
 bool daE_FK_c::checkViewArea() {
     Vec proj;
+
+    #if TARGET_PC
+    mDoLib_project(&current.pos, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&current.pos, &proj);
+    #endif
+
     return (proj.x >= 0.0f && proj.x <= FB_WIDTH) && (proj.y >= 0.0f && proj.y <= FB_HEIGHT);
 }
 

src/d/actor/d_a_e_fs.cpp

@@ -463,7 +463,13 @@ static void damage_check(e_fs_class* i_this) {
 
 static bool checkViewArea(cXyz* i_pos) {
     Vec proj;
+
+    #if TARGET_PC
+    mDoLib_project(i_pos, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(i_pos, &proj);
+    #endif
+
     bool ret = false;
     if (proj.x >= 0.0f && proj.x <= FB_WIDTH && proj.y >= 0.0f && proj.y <= FB_HEIGHT) {
         ret = true;

src/d/actor/d_a_e_sm.cpp

@@ -1362,7 +1362,13 @@ void daE_SM_c::E_SM_C_Hook() {
 
 bool daE_SM_c::CheckViewArea() {
     Vec vec;
+
+    #if TARGET_PC
+    mDoLib_project(&current.pos, &vec, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&current.pos, &vec);
+    #endif
+
     bool rv = false;
 
     if (vec.x >= 0.0f && vec.x <= FB_WIDTH && vec.y >= 0.0f && vec.y <= FB_HEIGHT) {

src/d/actor/d_a_npc.cpp

@@ -2694,16 +2694,15 @@ BOOL daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32
         }
 
         for (int i = 0; i < 8; i++) {
+            #if TARGET_PC
+            mDoLib_project(&pos_array[i], &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+            #else
             mDoLib_project(&pos_array[i], &proj);
-#if TARGET_PC
-            if (0.0f < proj.x && proj.x < mDoGph_gInf_c::getWidth() && 0.0f < proj.y && proj.y < mDoGph_gInf_c::getHeight()) {
-                continue;
-            }
-#else
+            #endif
+
             if (0.0f < proj.x && proj.x < FB_WIDTH && 0.0f < proj.y && proj.y < FB_HEIGHT) {
                 continue;
             }
-#endif
             return false;
         }
 

src/d/actor/d_a_obj_ari.cpp

@@ -499,7 +499,13 @@ void daObjARI_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
     vec1.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&vec1, &vec2, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&vec1, &vec2);
+    #endif
+
     f32 trim_height;
     camera_process_class* camera = dComIfGp_getCamera(0);
     if (camera != NULL) {

src/d/actor/d_a_obj_bhashi.cpp

@@ -285,7 +285,13 @@ bool Hahen_c::CheckCull() {
 
 bool Hahen_c::checkViewArea() {
     Vec proj;
+
+    #if TARGET_PC
+    mDoLib_project(&pos, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&pos, &proj);
+    #endif
+
     return (proj.x >= -50.0f && proj.x <= 658.0f) && (proj.y >= -50.0f && proj.y <= 498.0f);
 }
 

src/d/actor/d_a_obj_cho.cpp

@@ -289,7 +289,13 @@ void daObjCHO_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
     vec1.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&vec1, &vec2, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&vec1, &vec2);
+    #endif
+
     f32 trim_height;
     camera_process_class* camera = dComIfGp_getCamera(0);
     if (camera != NULL) {

src/d/actor/d_a_obj_crvfence.cpp

@@ -224,7 +224,13 @@ void daObjCRVFENCE_c::NormalAction() {
 
 bool daObjCRVFENCE_c::checkViewArea(cXyz* param_1) {
     Vec sp24;
+
+    #if TARGET_PC
+    mDoLib_project(param_1, &sp24, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(param_1, &sp24);
+    #endif
+
     bool rv = false;
     bool bVar1 = false;
 

src/d/actor/d_a_obj_crvhahen.cpp

@@ -137,7 +137,12 @@ void daObjCRVHAHEN_c::CheckCull() {
 
 bool daObjCRVHAHEN_c::checkViewArea(cXyz* i_this) {
     Vec proj;
+
+    #if TARGET_PC
+    mDoLib_project(i_this, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(i_this, &proj);
+    #endif
 
     bool ret = false;
 

src/d/actor/d_a_obj_dan.cpp

@@ -267,7 +267,13 @@ void daObjDAN_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
     vec1.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&vec1, &vec2, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&vec1, &vec2);
+    #endif
+
     f32 trim_height;
     camera_process_class* camera = dComIfGp_getCamera(0);
     if (camera != NULL) {

src/d/actor/d_a_obj_gomikabe.cpp

@@ -201,7 +201,13 @@ void daObjGOMIKABE_c::CheckCull() {
 
 bool daObjGOMIKABE_c::checkViewArea(cXyz param_1) {
     Vec local_24;
+
+    #if TARGET_PC
+    mDoLib_project(&param_1, &local_24, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&param_1, &local_24);
+    #endif
+
     bool rv = false;
     if (local_24.x >= 0.0f && local_24.x <= FB_WIDTH && local_24.y >= 0.0f && local_24.y <= FB_HEIGHT) {
         rv = true;

src/d/actor/d_a_obj_hhashi.cpp

@@ -214,7 +214,13 @@ void daObjHHASHI_c::CheckCull() {
 
 bool daObjHHASHI_c::checkViewArea(int param_1) {
     Vec local_20;
+
+    #if TARGET_PC
+    mDoLib_project(&field_0x5b0[param_1], &local_20, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&field_0x5b0[param_1], &local_20);
+    #endif
+
     bool rv = false;
     if (local_20.x >= 0.0f && local_20.x <= FB_WIDTH && local_20.y >= 0.0f && local_20.y <= FB_HEIGHT) {
         rv = true;

src/d/actor/d_a_obj_kamakiri.cpp

@@ -517,7 +517,13 @@ void daObjKAM_c::Z_BufferChk() {
     cXyz currentOffset;
     currentOffset = current.pos;
     currentOffset.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&currentOffset, &currentProj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&currentOffset, &currentProj);
+    #endif
+
     camera_process_class* camera = dComIfGp_getCamera(0);
     f32 cameraHeight;
     if (camera != NULL) {

src/d/actor/d_a_obj_katatsumuri.cpp

@@ -611,7 +611,12 @@ void daObjKAT_c::Z_BufferChk() {
     cXyz curWithOff;
     curWithOff = current.pos;
     curWithOff.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&curWithOff, &projected, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&curWithOff, &projected);
+    #endif
 
     camera_process_class* camera = dComIfGp_getCamera(0);
     f32 unkFloat1;

src/d/actor/d_a_obj_kuwagata.cpp

@@ -528,7 +528,12 @@ void daObjKUW_c::Z_BufferChk() {
 
     cStack_68 = current.pos;
     cStack_68.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&cStack_68, &local_5c, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&cStack_68, &local_5c);
+    #endif
     
     camera_process_class* cc = dComIfGp_getCamera(0);
     f32 trimHeight;

src/d/actor/d_a_obj_ten.cpp

@@ -593,7 +593,13 @@ void daObjTEN_c::Z_BufferChk() {
     cXyz cStack_68;
     cStack_68 = current.pos;
     cStack_68.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&cStack_68, &local_5c, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&cStack_68, &local_5c);
+    #endif
+
     camera_process_class* camera = dComIfGp_getCamera(0);
     f32 trimHeight;
     if (camera != NULL) {

src/d/actor/d_a_obj_tombo.cpp

@@ -504,7 +504,13 @@ void daObjTOMBO_c::Z_BufferChk() {
     cXyz cStack_68;
     cStack_68 = current.pos;
     cStack_68.y += 20.0f;
+
+    #if TARGET_PC
+    mDoLib_project(&cStack_68, &local_5c, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(&cStack_68, &local_5c);
+    #endif
+
     camera_process_class* pCamera = dComIfGp_getCamera(0);
     f32 trimHeight;
     if (pCamera != NULL) {

src/d/actor/d_a_obj_zra_freeze.cpp

@@ -38,7 +38,12 @@ BOOL daZraFreeze_c::chkActorInScreen() {
     mDoMtx_stack_c::transM(0.0f, 0.0f, 0.0f);
     PSMTXMultVecArray(mDoMtx_stack_c::get(), vec, vec, 8);
     for (int i = 0; i < 8; i++) {
+        #if TARGET_PC
+        mDoLib_project(&vec[i], &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+        #else
         mDoLib_project(&vec[i], &proj);
+        #endif
+
         if (0.0f < proj.x && proj.x < FB_WIDTH && 0.0f < proj.y && proj.y < FB_HEIGHT) {
             continue;
         }