mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-09 12:37:18 -04:00
Merge branch 'main' of https://github.com/TakaRikka/dusk
This commit is contained in:
+1
-1
@@ -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")
|
||||
|
||||
@@ -1344,6 +1344,11 @@ void mDoGph_gInf_c::bloom_c::draw2() {
|
||||
static_cast<u16>(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];
|
||||
@@ -1488,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);
|
||||
|
||||
Reference in New Issue
Block a user