0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unit tint when submerged, and fix unit shadow when tinted

Browse source
This commit is contained in:
Tommy 2022-07-02 14:10:52 +12:00
parent 09186f841c
commit 23baabf6d5
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/display.cpp
View file

@ -1583,29 +1583,31 @@ void display::render_image(int x, int y, const display::drawing_layer drawing_la
// Clamp blend ratio so nothing weird happens
blend_ratio = std::clamp(blend_ratio, 0.0, 1.0);
blit_helper& bh = drawing_buffer_add(drawing_layer, loc, dest, tex);
bh.hflip = hreverse;
bh.vflip = vreverse;
bh.alpha_mod = alpha;
bh.highlight = float_to_color(highlight);
// SDL hax to apply an active washout tint at the correct ratio
if (blend_ratio > 0.0) {
// Get a pure-white version of the texture
const image::locator whiteout_locator(
i_locator.get_filename(),
i_locator.get_modifications() + "~CHAN(255, 255, 255, alpha)"
i_locator.get_modifications()
+ new_modifications
+ "~CHAN(255, 255, 255, alpha)"
);
const texture& wt = image::get_texture(whiteout_locator);
// Blit the pure white version, tinted to the right colour
blit_helper &wh = drawing_buffer_add(drawing_layer, loc, dest, wt);
wh.hflip = hreverse;
wh.vflip = vreverse;
wh.alpha_mod = alpha;
wh.alpha_mod = uint8_t(alpha * blend_ratio);
wh.r_mod = blendto.r;
wh.g_mod = blendto.g;
wh.b_mod = blendto.b;
}
blit_helper& bh = drawing_buffer_add(drawing_layer, loc, dest, tex);
bh.hflip = hreverse;
bh.vflip = vreverse;
bh.alpha_mod = uint8_t(alpha * (1.0 - blend_ratio));
bh.highlight = float_to_color(highlight);
}
void display::select_hex(map_location hex)