miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix highlight tinting in 32bpp-anim-sse4 blitter

Browse Source
This commit is contained in:
dP
2024-03-17 02:44:01 +07:00
parent 47bc4b514f
commit ec561070b1
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blitter/32bpp_anim_sse4.cpp
View File

@@ -16,6 +16,8 @@
#include "32bpp_anim_sse4.hpp"
#include "32bpp_sse_func.hpp"
#include "../citymania/cm_colour.hpp"
#include "../safeguards.h"
/** Instantiation of the SSE4 32bpp blitter factory. */
@@ -332,6 +334,23 @@ bmcr_alpha_blend_single:
}
break;
case CM_BM_TINT_REMAP:
for (uint x = (uint) bp->width; x > 0; x--) {
if (src_mv->m == 0) {
if (src->a != 0) {
*dst = citymania::Remap32RGBA(src->r, src->g, src->b, src->a, *dst, remap);
*anim = 0;
}
} else {
uint r = remap[src_mv->m];
if (r != 0) *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), src_mv->v), src->a, *dst);
}
src_mv++;
dst++;
src++;
anim++;
}
break;
case BM_CRASH_REMAP:
for (uint x = (uint) bp->width; x > 0; x--) {
@@ -429,6 +448,15 @@ bm_normal:
else Draw<BM_COLOUR_REMAP, RM_WITH_MARGIN, BT_NONE, true, true>(bp, zoom);
}
break;
case CM_BM_TINT_REMAP:
if (bp->skip_left != 0 || bp->width <= MARGIN_REMAP_THRESHOLD) {
if (sprite_flags & SF_NO_ANIM) Draw<CM_BM_TINT_REMAP, RM_WITH_SKIP, BT_NONE, true, false>(bp, zoom);
else Draw<CM_BM_TINT_REMAP, RM_WITH_SKIP, BT_NONE, true, true>(bp, zoom);
} else {
if (sprite_flags & SF_NO_ANIM) Draw<CM_BM_TINT_REMAP, RM_WITH_MARGIN, BT_NONE, true, false>(bp, zoom);
else Draw<CM_BM_TINT_REMAP, RM_WITH_MARGIN, BT_NONE, true, true>(bp, zoom);
}
break;
case BM_TRANSPARENT: Draw<BM_TRANSPARENT, RM_NONE, BT_NONE, true, true>(bp, zoom); return;
case BM_TRANSPARENT_REMAP: Draw<BM_TRANSPARENT_REMAP, RM_NONE, BT_NONE, true, true>(bp, zoom); return;
case BM_CRASH_REMAP: Draw<BM_CRASH_REMAP, RM_NONE, BT_NONE, true, true>(bp, zoom); return;