From e7dc10aefbd2f1d91803486f1099943ecfcfea0f Mon Sep 17 00:00:00 2001
From: madeline <qwertytrogi@gmail.com>
Date: Sun, 5 Apr 2026 15:05:38 -0700
Subject: [PATCH] fix cloud, sun, moon, rain, fog, lens flare, etc, culling

---
 src/d/d_kankyo_rain.cpp | 57 +++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp
index 019f30f101..c1927c5875 100644
--- a/src/d/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo_rain.cpp
@@ -113,7 +113,12 @@ void dKyr_lenzflare_move() {
     cXyz vect;
     cXyz proj;
     cXyz center;
+
+    #if TARGET_PC
+    mDoLib_project(lenz_packet->mPositions, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+    #else
     mDoLib_project(lenz_packet->mPositions, &proj);
+    #endif
 
     center.x = FB_WIDTH / 2;
     center.y = FB_HEIGHT / 2;
@@ -213,7 +218,12 @@ void dKyr_sun_move() {
         }
 
         cXyz proj;
+
+        #if TARGET_PC
+        mDoLib_project(sun_packet->mPos, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+        #else
         mDoLib_project(sun_packet->mPos, &proj);
+        #endif
 
         for (int i = 0; i < 5; i++) {
             cXyz chkpnt = proj;
@@ -4111,7 +4121,11 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) {
             }
         }
 
+        #if TARGET_PC
+        mDoLib_project(&moon_pos, &moon_proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+        #else
         mDoLib_project(&moon_pos, &moon_proj);
+        #endif
 
         GXSetNumChans(1);
         GXSetChanCtrl(GX_COLOR0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE);
@@ -4248,7 +4262,11 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) {
             sp68.y = spBC.y + star_pos.y;
             sp68.z = spBC.z + star_pos.z;
 
+            #if TARGET_PC
+            mDoLib_project(&sp68, &star_proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+            #else
             mDoLib_project(&sp68, &star_proj);
+            #endif
 
             moon_proj.z = 0.0f;
             star_proj.z = 0.0f;
@@ -4630,7 +4648,11 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
     }
 
     if (g_env_light.daytime > 105.0f && g_env_light.daytime < 240.0f && !dComIfGp_event_runCheck() && sun_packet != NULL && sun_packet->mSunAlpha > 0.0f) {
+        #if TARGET_PC
+        mDoLib_project(&sun_packet->mPos[0], &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+        #else
         mDoLib_project(&sun_packet->mPos[0], &proj);
+        #endif
         if (proj.x > 0.0f && proj.x < FB_WIDTH && proj.y > spC4 && proj.y < (458.0f - spC4)) {
             pass = 0;
         }
@@ -4895,7 +4917,12 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
                                 x = 100.0f;
                                 y = 100.0f;
                                 z = 100.0f;
+
+                                #if TARGET_PC
+                                mDoLib_project(&spF0, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+                                #else
                                 mDoLib_project(&spF0, &proj);
+                                #endif
 
                                 if (proj.x > -x && proj.x < (FB_WIDTH + x) && proj.y > -y && proj.y < (458.0f + z)) {
                                     break;
@@ -4945,7 +4972,12 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
                                     x = 100.0f;
                                     y = 100.0f;
                                     z = 100.0f;
+
+                                    #if TARGET_PC
+                                    mDoLib_project(&spE4, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+                                    #else
                                     mDoLib_project(&spE4, &proj);
+                                    #endif
 
                                     if (proj.x > -x && proj.x < (FB_WIDTH + x) && proj.y > -y && proj.y < (458.0f + z)) {
                                         break;
@@ -5986,21 +6018,18 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) {
                         sp34.y = 80.0f;
                         sp34.z = 80.0f;
 
+                        #if TARGET_PC
+                        mDoLib_project(&sp7C, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+                        #else
                         mDoLib_project(&sp7C, &proj);
+                        #endif
 
-#if TARGET_PC
-                        if (!(proj.x > -sp34.x) || !(proj.x < (dComIfGd_getViewport()->width + sp34.x)) ||
-                            !(proj.y > -sp34.y) || !(proj.y < (dComIfGd_getViewport()->height + sp34.z)))
-                        {
-                            continue;
-                        }
-#else
                         if (!(proj.x > -sp34.x) || !(proj.x < (FB_WIDTH + sp34.x)) ||
                             !(proj.y > -sp34.y) || !(proj.y < (458.0f + sp34.z)))
                         {
                             continue;
                         }
-#endif
+
                     }
 
                     f32 sp40;
@@ -6219,21 +6248,17 @@ void dKyr_evil_draw(Mtx drawMtx, u8** tex) {
                         sp44.y = 80.0f;
                         sp44.z = 80.0f;
 
+                        #if TARGET_PC
+                        mDoLib_project(&spA4, &proj, {0, 0, FB_WIDTH, FB_HEIGHT});
+                        #else
                         mDoLib_project(&spA4, &proj);
+                        #endif
 
-#if TARGET_PC
-                        if (!(proj.x > -sp44.x) || !(proj.x < (dComIfGd_getViewport()->width + sp44.x)) ||
-                            !(proj.y > -sp44.y) || !(proj.y < (dComIfGd_getViewport()->height + sp44.z)))
-                        {
-                            continue;
-                        }
-#else
                         if (!(proj.x > -sp44.x) || !(proj.x < (FB_WIDTH + sp44.x)) ||
                             !(proj.y > -sp44.y) || !(proj.y < (458.0f + sp44.z)))
                         {
                             continue;
                         }
-#endif
                     }
 
                     f32 sp5C;