From fe02fb8e612274edc0efbd7ad3bcf60cfca48824 Mon Sep 17 00:00:00 2001
From: MelonSpeedruns <melonspeedruns@stratobox.net>
Date: Wed, 1 Apr 2026 20:20:09 -0400
Subject: [PATCH] Fix underwater effect + Fading to work at any aspect ratio

---
 src/d/d_ovlp_fade2.cpp    | 6 ++++++
 src/d/d_ovlp_fade3.cpp    | 6 ++++++
 src/m_Do/m_Do_graphic.cpp | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp
index 093aaadddd..37dbeedba2 100644
--- a/src/d/d_ovlp_fade2.cpp
+++ b/src/d/d_ovlp_fade2.cpp
@@ -51,8 +51,14 @@ void dOvlpFd2_dlst_c::draw() {
     GXEnd();
 
     Mtx44 m;
+
+    #if TARGET_PC
+    C_MTXPerspective(m, 60.0f, 1.3571428f, 100.0f, 100000.0f);
+    #else
     C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f,
                      100000.0f);
+    #endif
+
     GXSetProjection(m, GX_PERSPECTIVE);
 #ifdef TARGET_PC
     mDoGph_gInf_c::getFrameBufferTexObj()->reset();
diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp
index 70304451fb..d6f432f3ee 100644
--- a/src/d/d_ovlp_fade3.cpp
+++ b/src/d/d_ovlp_fade3.cpp
@@ -64,8 +64,14 @@ void dOvlpFd3_dlst_c::draw() {
     GXEnd();
 
     Mtx44 m;
+
+    #if TARGET_PC
+    C_MTXPerspective(m, 60.0f, 1.3571428f, 100.0f, 100000.0f);
+    #else
     C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f,
                      100000.0f);
+    #endif
+
     GXSetProjection(m, GX_PERSPECTIVE);
 #ifdef TARGET_PC
     mDoGph_gInf_c::getFrameBufferTexObj()->reset();
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 2657b0cd16..e4a640fd88 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -2051,7 +2051,13 @@ int mDoGph_Painter() {
 
                 Mtx m2;
                 Mtx44 m;
+
+                #if TARGET_PC
+                C_MTXPerspective(m, AREG_F(8) + 60.0f, 1.3571428f, 1.0f, 100000.0f);
+                #else
                 C_MTXPerspective(m, AREG_F(8) + 60.0f, mDoGph_gInf_c::getAspect(), 1.0f, 100000.0f);
+                #endif
+
                 GXSetProjection(m, GX_PERSPECTIVE);
                 cXyz sp38c(0.0f, 0.0f, AREG_F(7) + -2.0f);
                 cXyz sp398(0.0f, 1.0f, 0.0f);