diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp index 2371b1f1d1..487df7822c 100644 --- a/src/blitter/32bpp_anim.cpp +++ b/src/blitter/32bpp_anim.cpp @@ -118,17 +118,27 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel switch (mode) { case BM_COLOUR_REMAP: + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: if (src_px->a == 255) { do { uint m = *src_n; /* In case the m-channel is zero, do not remap this pixel in any way */ if (m == 0) { - *dst = src_px->data; + Colour c = *src_px; + if (mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = c; *anim = 0; } else { uint r = remap[GB(m, 0, 8)]; + if (r != 0) { + uint8 brightness = GB(m, 8, 8); + if (mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) { + brightness = Clamp(brightness + bp->brightness_adjust, 0, 255); + SB(m, 8, 8, brightness); + } + *dst = this->AdjustBrightness(this->LookupColourInPalette(r), brightness); + } *anim = r | (m & 0xFF00); - if (r != 0) *dst = this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8)); } anim++; dst++; @@ -139,12 +149,18 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel do { uint m = *src_n; if (m == 0) { - *dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst); + Colour c = *src_px; + if (mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = ComposeColourRGBANoCheck(c.r, c.g, c.b, c.a, *dst); *anim = 0; } else { uint r = remap[GB(m, 0, 8)]; *anim = 0; - if (r != 0) *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8)), src_px->a, *dst); + if (r != 0) { + uint8 brightness = GB(m, 8, 8); + if (mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) brightness = Clamp(brightness + bp->brightness_adjust, 0, 255); + *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), brightness), src_px->a, *dst); + } } anim++; dst++; @@ -234,17 +250,27 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel if (fast_path || (src_px->a == 255 && (sprite_flags & SF_NO_ANIM))) { do { *anim++ = 0; - *dst++ = src_px->data; + Colour c = *src_px; + if (mode == BM_NORMAL_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst++ = c; src_px++; src_n++; } while (--n != 0); } else if (src_px->a == 255) { do { /* Compiler assumes pointer aliasing, can't optimise this on its own */ - uint m = GB(*src_n, 0, 8); + uint16 mv = *src_n; + uint m = GB(mv, 0, 8); /* Above PALETTE_ANIM_START is palette animation */ - *anim++ = *src_n; - *dst++ = (m >= PALETTE_ANIM_START) ? this->AdjustBrightness(this->LookupColourInPalette(m), GB(*src_n, 8, 8)) : src_px->data; + if (m >= PALETTE_ANIM_START) { + if (mode == BM_NORMAL_WITH_BRIGHTNESS) SB(mv, 8, 8, Clamp(GB(mv, 8, 8) + bp->brightness_adjust, 0, 255)); + *dst++ = this->AdjustBrightness(this->LookupColourInPalette(m), GB(mv, 8, 8)); + } else if (mode == BM_NORMAL_WITH_BRIGHTNESS) { + *dst++ = AdjustBrightness(src_px->data, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + } else { + *dst++ = src_px->data; + } + *anim++ = mv; src_px++; src_n++; } while (--n != 0); @@ -253,9 +279,13 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel uint m = GB(*src_n, 0, 8); *anim++ = 0; if (m >= PALETTE_ANIM_START) { - *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(m), GB(*src_n, 8, 8)), src_px->a, *dst); + uint8 brightness = GB(*src_n, 8, 8); + if (mode == BM_NORMAL_WITH_BRIGHTNESS) brightness = Clamp(brightness + bp->brightness_adjust, 0, 255); + *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(m), brightness), src_px->a, *dst); } else { - *dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst); + Colour c = *src_px; + if (mode == BM_NORMAL_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = ComposeColourRGBANoCheck(c.r, c.g, c.b, c.a, *dst); } dst++; src_px++; @@ -286,6 +316,17 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL switch (mode) { default: NOT_REACHED(); + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: + if (!(sprite_flags & SF_NO_REMAP)) { + Draw(bp, zoom); + return; + } + /* FALL THROUGH */ + + case BM_NORMAL_WITH_BRIGHTNESS: + Draw(bp, zoom); + return; + case BM_COLOUR_REMAP: if (!(sprite_flags & SF_NO_REMAP)) { Draw(bp, zoom); diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp index b3af3ac702..5701d0c13d 100644 --- a/src/blitter/32bpp_anim_sse4.cpp +++ b/src/blitter/32bpp_anim_sse4.cpp @@ -345,6 +345,75 @@ bmcr_alpha_blend_single: anim++; } break; + + case BM_NORMAL_WITH_BRIGHTNESS: + for (uint x = (uint) bp->width; x > 0; x--) { + if (src->a == 0) { + } else if (src->a == 255) { + MapValue mv = *src_mv; + if (src_mv->m >= PALETTE_ANIM_START) { + mv.v = Clamp(mv.v + bp->brightness_adjust, 0, 255); + *dst = AdjustBrightneSSE(LookupColourInPalette(mv.m), mv.v); + } else { + *dst = AdjustBrightneSSE(src->data, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + } + *anim = *(const uint16*) &mv; + } else { + *anim = 0; + __m128i srcABCD; + __m128i dstABCD = _mm_cvtsi32_si128(dst->data); + if (src_mv->m >= PALETTE_ANIM_START) { + Colour colour = AdjustBrightneSSE(LookupColourInPalette(src_mv->m), Clamp(src_mv->v + bp->brightness_adjust, 0, 255)); + colour.a = src->a; + srcABCD = _mm_cvtsi32_si128(colour.data); + } else { + srcABCD = _mm_cvtsi32_si128(AdjustBrightneSSE(src->data, DEFAULT_BRIGHTNESS + bp->brightness_adjust).data); + } + dst->data = _mm_cvtsi128_si32(AlphaBlendTwoPixels(srcABCD, dstABCD, a_cm, pack_low_cm)); + } + src_mv++; + dst++; + src++; + anim++; + } + break; + + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: + for (uint x = (uint) bp->width; x > 0; x--) { + /* In case the m-channel is zero, do not remap this pixel in any way. */ + __m128i srcABCD; + if (src->a == 0) { + } else if (src_mv->m) { + MapValue mv = *src_mv; + mv.v = Clamp(mv.v + bp->brightness_adjust, 0, 255); + const uint r = remap[mv.m]; + *anim = (animated && src->a == 255) ? r | ((uint16) mv.v << 8) : 0; + if (r != 0) { + Colour remapped_colour = AdjustBrightneSSE(this->LookupColourInPalette(r), mv.v); + if (src->a == 255) { + *dst = remapped_colour; + } else { + remapped_colour.a = src->a; + srcABCD = _mm_cvtsi32_si128(remapped_colour.data); + goto bmcr_alpha_blend_single_brightness; + } + } + } else { + *anim = 0; + srcABCD = _mm_cvtsi32_si128(AdjustBrightneSSE(src->data, DEFAULT_BRIGHTNESS + bp->brightness_adjust).data); + if (src->a < 255) { +bmcr_alpha_blend_single_brightness: + __m128i dstABCD = _mm_cvtsi32_si128(dst->data); + srcABCD = AlphaBlendTwoPixels(srcABCD, dstABCD, a_cm, pack_low_cm); + } + dst->data = _mm_cvtsi128_si32(srcABCD); + } + src_mv++; + dst++; + src++; + anim++; + } + break; } next_line: @@ -407,6 +476,17 @@ bm_normal: case BM_TRANSPARENT: Draw(bp, zoom); return; case BM_CRASH_REMAP: Draw(bp, zoom); return; case BM_BLACK_REMAP: Draw(bp, zoom); return; + + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: + if (!(sprite_flags & SF_NO_REMAP)) { + Draw(bp, zoom); + return; + } + /* FALL THROUGH */ + + case BM_NORMAL_WITH_BRIGHTNESS: + Draw(bp, zoom); + return; } } diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp index c40c8686dd..eb23ba241e 100644 --- a/src/blitter/32bpp_optimized.cpp +++ b/src/blitter/32bpp_optimized.cpp @@ -111,15 +111,18 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL switch (mode) { case BM_COLOUR_REMAP: + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: if (src_px->a == 255) { do { uint m = *src_n; /* In case the m-channel is zero, do not remap this pixel in any way */ if (m == 0) { - *dst = src_px->data; + Colour c = *src_px; + if (mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = c; } else { uint r = remap[GB(m, 0, 8)]; - if (r != 0) *dst = this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8)); + if (r != 0) *dst = this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8) + ((mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) ? bp->brightness_adjust : 0)); } dst++; src_px++; @@ -129,10 +132,12 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL do { uint m = *src_n; if (m == 0) { - *dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst); + Colour c = *src_px; + if (mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = ComposeColourRGBANoCheck(c.r, c.g, c.b, c.a, *dst); } else { uint r = remap[GB(m, 0, 8)]; - if (r != 0) *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8)), src_px->a, *dst); + if (r != 0) *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8) + ((mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) ? bp->brightness_adjust : 0)), src_px->a, *dst); } dst++; src_px++; @@ -211,14 +216,18 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL /* faster than memcpy(), n is usually low */ src_n += n; do { - *dst = src_px->data; + Colour c = *src_px; + if (mode == BM_NORMAL_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = c; dst++; src_px++; } while (--n != 0); } else { src_n += n; do { - *dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst); + Colour c = *src_px; + if (mode == BM_NORMAL_WITH_BRIGHTNESS) c = AdjustBrightness(c, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = ComposeColourRGBANoCheck(c.r, c.g, c.b, c.a, *dst); dst++; src_px++; } while (--n != 0); @@ -249,6 +258,8 @@ void Blitter_32bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, case BM_TRANSPARENT: Draw (bp, zoom); return; case BM_CRASH_REMAP: Draw (bp, zoom); return; case BM_BLACK_REMAP: Draw (bp, zoom); return; + case BM_NORMAL_WITH_BRIGHTNESS: Draw (bp, zoom); return; + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: Draw (bp, zoom); return; } } diff --git a/src/blitter/32bpp_simple.cpp b/src/blitter/32bpp_simple.cpp index a8096d801d..569ea5c419 100644 --- a/src/blitter/32bpp_simple.cpp +++ b/src/blitter/32bpp_simple.cpp @@ -45,6 +45,18 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo } break; + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: + /* In case the m-channel is zero, do not remap this pixel in any way */ + if (src->m == 0) { + if (src->a != 0) { + Colour c = AdjustBrightness(Colour(src->r, src->g, src->b, src->a), DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = ComposeColourRGBA(c.r, c.g, c.b, c.a, *dst); + } + } else { + if (bp->remap[src->m] != 0) *dst = ComposeColourPA(this->AdjustBrightness(this->LookupColourInPalette(bp->remap[src->m]), Clamp(src->v + bp->brightness_adjust, 0, 255)), src->a, *dst); + } + break; + case BM_CRASH_REMAP: if (src->m == 0) { if (src->a != 0) { @@ -71,6 +83,13 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo if (src->a != 0) *dst = MakeTransparent(*dst, 192); break; + case BM_NORMAL_WITH_BRIGHTNESS: + if (src->a != 0) { + Colour c = AdjustBrightness(Colour(src->r, src->g, src->b, src->a), DEFAULT_BRIGHTNESS + bp->brightness_adjust); + *dst = ComposeColourRGBA(c.r, c.g, c.b, c.a, *dst); + } + break; + default: if (src->a != 0) *dst = ComposeColourRGBA(src->r, src->g, src->b, src->a, *dst); break; diff --git a/src/blitter/32bpp_sse_func.hpp b/src/blitter/32bpp_sse_func.hpp index cf06acc2bf..4dc8d38ca4 100644 --- a/src/blitter/32bpp_sse_func.hpp +++ b/src/blitter/32bpp_sse_func.hpp @@ -210,6 +210,12 @@ inline void Blitter_32bppSSE4::Draw(const Blitter::BlitterParams *bp, ZoomLevel const MapValue *src_mv_line = (const MapValue *) &sd->data[si->mv_offset] + bp->skip_top * si->sprite_width; const Colour *src_rgba_line = (const Colour *) ((const byte *) &sd->data[si->sprite_offset] + bp->skip_top * si->sprite_line_size); + uint32 bm_normal_brightness = 0; + if (mode == BM_NORMAL_WITH_BRIGHTNESS) { + bm_normal_brightness = (DEFAULT_BRIGHTNESS + bp->brightness_adjust) << 8; + bm_normal_brightness |= bm_normal_brightness << 16; + } + if (read_mode != RM_WITH_MARGIN) { src_rgba_line += bp->skip_left; src_mv_line += bp->skip_left; @@ -236,13 +242,13 @@ inline void Blitter_32bppSSE4::Draw(const Blitter::BlitterParams *bp, ZoomLevel for (int y = bp->height; y != 0; y--) { Colour *dst = dst_line; const Colour *src = src_rgba_line + META_LENGTH; - if (mode == BM_COLOUR_REMAP || mode == BM_CRASH_REMAP) src_mv = src_mv_line; + if (mode == BM_COLOUR_REMAP || mode == BM_CRASH_REMAP || mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) src_mv = src_mv_line; if (read_mode == RM_WITH_MARGIN) { assert(bt_last == BT_NONE); // or you must ensure block type is preserved src += src_rgba_line[0].data; dst += src_rgba_line[0].data; - if (mode == BM_COLOUR_REMAP || mode == BM_CRASH_REMAP) src_mv += src_rgba_line[0].data; + if (mode == BM_COLOUR_REMAP || mode == BM_CRASH_REMAP || mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) src_mv += src_rgba_line[0].data; const int width_diff = si->sprite_width - bp->width; effective_width = bp->width - (int) src_rgba_line[0].data; const int delta_diff = (int) src_rgba_line[1].data - width_diff; @@ -403,10 +409,62 @@ bmcr_alpha_blend_single: src++; } break; + + case BM_NORMAL_WITH_BRIGHTNESS: + for (uint x = (uint) effective_width / 2; x > 0; x--) { + __m128i srcABCD = _mm_loadl_epi64((const __m128i*) src); + srcABCD = AdjustBrightnessOfTwoPixels(srcABCD, bm_normal_brightness); + __m128i dstABCD = _mm_loadl_epi64((__m128i*) dst); + _mm_storel_epi64((__m128i*) dst, AlphaBlendTwoPixels(srcABCD, dstABCD, ALPHA_BLEND_PARAM_1, ALPHA_BLEND_PARAM_2)); + src += 2; + dst += 2; + } + + if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) { + __m128i srcABCD = _mm_cvtsi32_si128(src->data); + srcABCD = AdjustBrightnessOfTwoPixels(srcABCD, bm_normal_brightness); + __m128i dstABCD = _mm_cvtsi32_si128(dst->data); + dst->data = _mm_cvtsi128_si32(AlphaBlendTwoPixels(srcABCD, dstABCD, ALPHA_BLEND_PARAM_1, ALPHA_BLEND_PARAM_2)); + } + break; + + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: + for (uint x = (uint) bp->width; x > 0; x--) { + /* In case the m-channel is zero, do not remap this pixel in any way. */ + __m128i srcABCD; + if (src_mv->m) { + const uint r = remap[src_mv->m]; + if (r != 0) { + Colour remapped_colour = AdjustBrightneSSE(this->LookupColourInPalette(r), Clamp(src_mv->v + bp->brightness_adjust, 0, 255)); + if (src->a == 255) { + *dst = remapped_colour; + } else { + remapped_colour.a = src->a; + srcABCD = _mm_cvtsi32_si128(remapped_colour.data); + goto bmcr_alpha_blend_single_brightness; + } + } + } else { + { + Colour c = AdjustBrightneSSE(src->data, DEFAULT_BRIGHTNESS + bp->brightness_adjust); + srcABCD = _mm_cvtsi32_si128(c.data); + } + if (src->a < 255) { +bmcr_alpha_blend_single_brightness: + __m128i dstABCD = _mm_cvtsi32_si128(dst->data); + srcABCD = AlphaBlendTwoPixels(srcABCD, dstABCD, ALPHA_BLEND_PARAM_1, ALPHA_BLEND_PARAM_2); + } + dst->data = _mm_cvtsi128_si32(srcABCD); + } + src_mv++; + dst++; + src++; + } + break; } next_line: - if (mode == BM_COLOUR_REMAP || mode == BM_CRASH_REMAP) src_mv_line += si->sprite_width; + if (mode == BM_COLOUR_REMAP || mode == BM_CRASH_REMAP || mode == BM_COLOUR_REMAP_WITH_BRIGHTNESS) src_mv_line += si->sprite_width; src_rgba_line = (const Colour*) ((const byte*) src_rgba_line + si->sprite_line_size); dst_line += bp->pitch; } @@ -457,6 +515,17 @@ bm_normal: case BM_TRANSPARENT: Draw(bp, zoom); return; case BM_CRASH_REMAP: Draw(bp, zoom); return; case BM_BLACK_REMAP: Draw(bp, zoom); return; + + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: + if (!(((const Blitter_32bppSSE_Base::SpriteData *) bp->sprite)->flags & SF_NO_REMAP)) { + Draw(bp, zoom); + return; + } + /* FALL THROUGH */ + + case BM_NORMAL_WITH_BRIGHTNESS: + Draw(bp, zoom); + return; } } #endif /* FULL_ANIMATION */ diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp index 83458f759f..e153ec829f 100644 --- a/src/blitter/8bpp_optimized.cpp +++ b/src/blitter/8bpp_optimized.cpp @@ -85,7 +85,8 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z switch (mode) { case BM_COLOUR_REMAP: - case BM_CRASH_REMAP: { + case BM_CRASH_REMAP: + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: { const uint8 *remap = bp->remap; do { uint m = remap[*src]; diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp index d40530536e..d0d30a2d3c 100644 --- a/src/blitter/8bpp_simple.cpp +++ b/src/blitter/8bpp_simple.cpp @@ -38,6 +38,7 @@ void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoom switch (mode) { case BM_COLOUR_REMAP: case BM_CRASH_REMAP: + case BM_COLOUR_REMAP_WITH_BRIGHTNESS: colour = bp->remap[*src]; break; diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp index dbb1b5feac..14b59fb15e 100644 --- a/src/blitter/base.hpp +++ b/src/blitter/base.hpp @@ -23,6 +23,8 @@ enum BlitterMode { BM_TRANSPARENT, ///< Perform transparency colour remapping. BM_CRASH_REMAP, ///< Perform a crash remapping. BM_BLACK_REMAP, ///< Perform remapping to a completely blackened sprite + BM_NORMAL_WITH_BRIGHTNESS, ///< Perform a simple blitting with brightness adjustment + BM_COLOUR_REMAP_WITH_BRIGHTNESS, ///< Perform a colour remapping with brightness adjustment }; /** Helper for using specialised functions designed to prevent whenever it's possible things like: @@ -47,6 +49,7 @@ public: struct BlitterParams { const void *sprite; ///< Pointer to the sprite how ever the encoder stored it const byte *remap; ///< XXX -- Temporary storage for remap array + int brightness_adjust; ///< Brightness adjustment int skip_left; ///< How much pixels of the source to skip on the left (based on zoom of dst) int skip_top; ///< How much pixels of the source to skip on the top (based on zoom of dst) diff --git a/src/gfx.cpp b/src/gfx.cpp index 1032855caf..87660d3041 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -99,6 +99,7 @@ int8 _font_zoom_cfg; ///< Font zoom level in config. */ static const byte *_colour_remap_ptr; static byte _string_colourremap[3]; ///< Recoloursprite for stringdrawing. The grf loader ensures that #ST_FONT sprites only use colours 0 to 2. +static int _sprite_brightness_adjust; static const uint DIRTY_BLOCK_HEIGHT = 8; static const uint DIRTY_BLOCK_WIDTH = 64; @@ -952,6 +953,9 @@ Dimension GetSpriteSize(SpriteID sprid, Point *offset, ZoomLevel zoom) */ static BlitterMode GetBlitterMode(PaletteID pal) { + if (HasBit(pal, PALETTE_BRIGHTNESS_MODIFY)) { + return GB(pal, 0, PALETTE_WIDTH) != PAL_NONE ? BM_COLOUR_REMAP_WITH_BRIGHTNESS : BM_NORMAL_WITH_BRIGHTNESS; + } switch (pal) { case PAL_NONE: return BM_NORMAL; case PALETTE_CRASH: return BM_CRASH_REMAP; @@ -977,9 +981,15 @@ void DrawSpriteViewport(SpriteID img, PaletteID pal, int x, int y, const SubSpri } else if (pal != PAL_NONE) { if (HasBit(pal, PALETTE_TEXT_RECOLOUR)) { SetColourRemap((TextColour)GB(pal, 0, PALETTE_WIDTH)); - } else { + } else if (GB(pal, 0, PALETTE_WIDTH) != PAL_NONE) { _colour_remap_ptr = GetNonSprite(GB(pal, 0, PALETTE_WIDTH), ST_RECOLOUR) + 1; } + if (HasBit(pal, PALETTE_BRIGHTNESS_MODIFY)) { + int adjust = GB(pal, PALETTE_BRIGHTNESS_OFFSET, PALETTE_BRIGHTNESS_WIDTH); + /* Sign extend */ + int sign_bit = 1 << (PALETTE_BRIGHTNESS_WIDTH - 1); + _sprite_brightness_adjust = (adjust ^ sign_bit) - sign_bit; + } GfxMainBlitterViewport(GetSprite(real_sprite, ST_NORMAL), x, y, GetBlitterMode(pal), sub, real_sprite); } else { GfxMainBlitterViewport(GetSprite(real_sprite, ST_NORMAL), x, y, BM_NORMAL, sub, real_sprite); @@ -1076,6 +1086,7 @@ static void GfxBlitter(const Sprite * const sprite, int x, int y, BlitterMode mo bp.dst = dpi->dst_ptr; bp.pitch = dpi->pitch; bp.remap = _colour_remap_ptr; + bp.brightness_adjust = _sprite_brightness_adjust; if (bp.width <= 0) return; if (bp.height <= 0) return; diff --git a/src/table/sprites.h b/src/table/sprites.h index f632ce1961..97d1a6df66 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -1552,6 +1552,9 @@ enum SpriteSetup { /* This bit is applied to palette ID */ PALETTE_TEXT_RECOLOUR = 31, ///< Set if palette is actually a magic text recolour + PALETTE_BRIGHTNESS_MODIFY = 30, ///< Set if palette has a brightness adjustment + PALETTE_BRIGHTNESS_OFFSET = 24, ///< Palette brightness adjustment bit offset + PALETTE_BRIGHTNESS_WIDTH = 5, ///< Palette brightness adjustment width PALETTE_WIDTH = 24, ///< number of bits of the sprite containing the recolour palette SPRITE_WIDTH = 24, ///< number of bits for the sprite number