From ff92ba3abce0a68ac540e3f4b3125b806fa06836 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 16 Apr 2026 00:22:40 -0700 Subject: [PATCH 1/3] bloom viewport fix --- src/m_Do/m_Do_graphic.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index d087ff61e9..edab073c3b 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -1344,6 +1344,11 @@ void mDoGph_gInf_c::bloom_c::draw2() { static_cast(prev.h / 2), }; } + for (int i = 0; i < ARRAY_SIZE(divRects); i++) { + auto & rect = divRects[i]; + if (rect.w == 0) rect.w = 1; + if (rect.h == 0) rect.h = 1; + } auto divCopySrc = [&](int divNo) { auto const& rect = divRects[divNo]; From 06e6a97ee704cecdeb7d907f3c1939eff0c370fd Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 16 Apr 2026 00:43:13 -0700 Subject: [PATCH 2/3] e&c --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25d5d386f8..1dbaefd7d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,7 +297,7 @@ endif () # Edit & Continue if (MSVC) - if (CMAKE_MSVC_DEBUG_INFORMATION_FORMAT STREQUAL "" AND CMAKE_BUILD_TYPE STREQUAL Debug) + if ("${CMAKE_MSVC_DEBUG_INFORMATION_FORMAT}" STREQUAL "" AND CMAKE_BUILD_TYPE STREQUAL "Debug") set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "EditAndContinue") endif () if (CMAKE_MSVC_DEBUG_INFORMATION_FORMAT STREQUAL "EditAndContinue") From 6bc1d3d84741a4aeda36c59d05493aca06c18011 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 16 Apr 2026 01:05:03 -0700 Subject: [PATCH 3/3] bloom blend tweakk --- src/m_Do/m_Do_graphic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index edab073c3b..d774a7de7d 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -1493,7 +1493,7 @@ void mDoGph_gInf_c::bloom_c::draw2() { GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ONE, GX_LO_OR); for (int i = divNum; i > divStart; i--) { - float alpha = 255.0f * powf(0.25f * dusk::getSettings().game.bloomMultiplier.getValue(), 1.0f / (divNum - i + 1)); + float alpha = 255.0f * powf(0.25f * dusk::getSettings().game.bloomMultiplier.getValue(), 1.0f / (i - divStart + 1)); GXSetTevColorS10(GX_TEVREG0, {0, 0, 0, s16(alpha)}); divCopySrc(i);