From e5a03dc3bb3a29ac41a481e7718e7254b2d50d19 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 7 Oct 2025 01:01:13 +0200 Subject: [PATCH] fix translucency being only half as translucent oops lmao didnt notice in all of this doom uses the inverse of our blendlevels kek --- src/r_draw_column.cpp | 4 ++-- src/r_draw_flush.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp index 43107e721..b15294c75 100644 --- a/src/r_draw_column.cpp +++ b/src/r_draw_column.cpp @@ -44,7 +44,7 @@ static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, co } template -static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap) +static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap) { col = R_GetColumnTranslated(dc, col, colormap); @@ -71,7 +71,7 @@ static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict } } - return R_GetColumnTranslucent(dc, dest, col, colormap); + return R_GetColumnTranslucent(dc, col, colormap); } /** \brief The R_DrawColumn function diff --git a/src/r_draw_flush.cpp b/src/r_draw_flush.cpp index d27fb8cd8..fcc94a767 100644 --- a/src/r_draw_flush.cpp +++ b/src/r_draw_flush.cpp @@ -22,7 +22,7 @@ static inline UINT8 R_DrawFlushColumnPixel(UINT8 dest, UINT8 source) } else if constexpr (Type & ColumnFlushType::FLUSH_TRANS) { - return temp_dc.tranmap[(dest << 8) + source]; + return temp_dc.tranmap[(source << 8) + dest]; } else if constexpr (Type & ColumnFlushType::FLUSH_COLORMAP) { @@ -30,7 +30,7 @@ static inline UINT8 R_DrawFlushColumnPixel(UINT8 dest, UINT8 source) } else if constexpr (Type & ColumnFlushType::FLUSH_COLORMAP_TRANS) { - return temp_dc.tranmap[(dest << 8) + temp_dc.translation[source]]; + return temp_dc.tranmap[(temp_dc.translation[source] << 8) + dest]; } } @@ -180,10 +180,10 @@ static void R_FlushQuad(void) { while (--count >= 0) { - dest[0] = temp_dc.tranmap[(dest[0] << 8) + source[0]]; - dest[1] = temp_dc.tranmap[(dest[1] << 8) + source[1]]; - dest[2] = temp_dc.tranmap[(dest[2] << 8) + source[2]]; - dest[3] = temp_dc.tranmap[(dest[3] << 8) + source[3]]; + dest[0] = temp_dc.tranmap[(source[0] << 8) + dest[0]]; + dest[1] = temp_dc.tranmap[(source[1] << 8) + dest[1]]; + dest[2] = temp_dc.tranmap[(source[2] << 8) + dest[2]]; + dest[3] = temp_dc.tranmap[(source[3] << 8) + dest[3]]; source += 4; dest += stride; } @@ -204,10 +204,10 @@ static void R_FlushQuad(void) { while (--count >= 0) { - dest[0] = temp_dc.tranmap[(dest[0] << 8) + temp_dc.translation[source[0]]]; - dest[1] = temp_dc.tranmap[(dest[1] << 8) + temp_dc.translation[source[1]]]; - dest[2] = temp_dc.tranmap[(dest[2] << 8) + temp_dc.translation[source[2]]]; - dest[3] = temp_dc.tranmap[(dest[3] << 8) + temp_dc.translation[source[3]]]; + dest[0] = temp_dc.tranmap[(temp_dc.translation[source[0]] << 8) + dest[0]]; + dest[1] = temp_dc.tranmap[(temp_dc.translation[source[1]] << 8) + dest[1]]; + dest[2] = temp_dc.tranmap[(temp_dc.translation[source[2]] << 8) + dest[2]]; + dest[3] = temp_dc.tranmap[(temp_dc.translation[source[3]] << 8) + dest[3]]; source += 4; dest += stride; }