mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Performance: Limit blitting work to overlapping area
This commit is contained in:
parent
ffec698d3e
commit
40bf88ac74
@ -539,14 +539,11 @@ u32 TextureSource::getTextureId(const std::string &name)
|
|||||||
|
|
||||||
// Draw an image on top of another one, using the alpha channel of the
|
// Draw an image on top of another one, using the alpha channel of the
|
||||||
// source image
|
// source image
|
||||||
|
// overlay: only modify destination pixels that are fully opaque.
|
||||||
|
template<bool overlay = false>
|
||||||
static void blit_with_alpha(video::IImage *src, video::IImage *dst,
|
static void blit_with_alpha(video::IImage *src, video::IImage *dst,
|
||||||
v2s32 src_pos, v2s32 dst_pos, v2u32 size);
|
v2s32 src_pos, v2s32 dst_pos, v2u32 size);
|
||||||
|
|
||||||
// Like blit_with_alpha, but only modifies destination pixels that
|
|
||||||
// are fully opaque
|
|
||||||
static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
|
|
||||||
v2s32 src_pos, v2s32 dst_pos, v2u32 size);
|
|
||||||
|
|
||||||
// Apply a color to an image. Uses an int (0-255) to calculate the ratio.
|
// Apply a color to an image. Uses an int (0-255) to calculate the ratio.
|
||||||
// If the ratio is 255 or -1 and keep_alpha is true, then it multiples the
|
// If the ratio is 255 or -1 and keep_alpha is true, then it multiples the
|
||||||
// color alpha with the destination alpha.
|
// color alpha with the destination alpha.
|
||||||
@ -2042,35 +2039,21 @@ static inline video::SColor blitPixel(const video::SColor src_c, const video::SC
|
|||||||
This exists because IImage::copyToWithAlpha() doesn't seem to always
|
This exists because IImage::copyToWithAlpha() doesn't seem to always
|
||||||
work.
|
work.
|
||||||
*/
|
*/
|
||||||
|
template<bool overlay>
|
||||||
static void blit_with_alpha(video::IImage *src, video::IImage *dst,
|
static void blit_with_alpha(video::IImage *src, video::IImage *dst,
|
||||||
v2s32 src_pos, v2s32 dst_pos, v2u32 size)
|
v2s32 src_pos, v2s32 dst_pos, v2u32 size)
|
||||||
{
|
{
|
||||||
// FIXME: loop should be restricted to actual overlap
|
auto src_dim = src->getDimension();
|
||||||
// (if dst smaller than size or dst_pos negative)
|
auto dst_dim = dst->getDimension();
|
||||||
for (u32 y0=0; y0<size.Y; y0++)
|
|
||||||
for (u32 x0=0; x0<size.X; x0++)
|
|
||||||
{
|
|
||||||
s32 src_x = src_pos.X + x0;
|
|
||||||
s32 src_y = src_pos.Y + y0;
|
|
||||||
s32 dst_x = dst_pos.X + x0;
|
|
||||||
s32 dst_y = dst_pos.Y + y0;
|
|
||||||
video::SColor src_c = src->getPixel(src_x, src_y);
|
|
||||||
video::SColor dst_c = dst->getPixel(dst_x, dst_y);
|
|
||||||
dst_c = blitPixel(src_c, dst_c, src_c.getAlpha());
|
|
||||||
dst->setPixel(dst_x, dst_y, dst_c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
// Limit y and x to the overlapping ranges
|
||||||
Draw an image on top of another one, using the alpha channel of the
|
// s.t. the positions are all in bounds after offsetting.
|
||||||
source image; only modify fully opaque pixels in destinaion
|
for (u32 y0 = std::max(0, -dst_pos.Y);
|
||||||
*/
|
y0 < std::min<s64>({size.Y, src_dim.Height, dst_dim.Height - (s64) dst_pos.Y});
|
||||||
static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
|
++y0)
|
||||||
v2s32 src_pos, v2s32 dst_pos, v2u32 size)
|
for (u32 x0 = std::max(0, -dst_pos.X);
|
||||||
{
|
x0 < std::min<s64>({size.X, src_dim.Width, dst_dim.Width - (s64) dst_pos.X});
|
||||||
// FIXME: same as above here
|
++x0)
|
||||||
for (u32 y0=0; y0<size.Y; y0++)
|
|
||||||
for (u32 x0=0; x0<size.X; x0++)
|
|
||||||
{
|
{
|
||||||
s32 src_x = src_pos.X + x0;
|
s32 src_x = src_pos.X + x0;
|
||||||
s32 src_y = src_pos.Y + y0;
|
s32 src_y = src_pos.Y + y0;
|
||||||
@ -2078,45 +2061,13 @@ static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
|
|||||||
s32 dst_y = dst_pos.Y + y0;
|
s32 dst_y = dst_pos.Y + y0;
|
||||||
video::SColor src_c = src->getPixel(src_x, src_y);
|
video::SColor src_c = src->getPixel(src_x, src_y);
|
||||||
video::SColor dst_c = dst->getPixel(dst_x, dst_y);
|
video::SColor dst_c = dst->getPixel(dst_x, dst_y);
|
||||||
if (dst_c.getAlpha() == 255 && src_c.getAlpha() != 0)
|
if (!overlay || (dst_c.getAlpha() == 255 && src_c.getAlpha() != 0)) {
|
||||||
{
|
|
||||||
dst_c = blitPixel(src_c, dst_c, src_c.getAlpha());
|
dst_c = blitPixel(src_c, dst_c, src_c.getAlpha());
|
||||||
dst->setPixel(dst_x, dst_y, dst_c);
|
dst->setPixel(dst_x, dst_y, dst_c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// This function has been disabled because it is currently unused.
|
|
||||||
// Feel free to re-enable if you find it handy.
|
|
||||||
#if 0
|
|
||||||
/*
|
|
||||||
Draw an image on top of another one, using the specified ratio
|
|
||||||
modify all partially-opaque pixels in the destination.
|
|
||||||
*/
|
|
||||||
static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst,
|
|
||||||
v2s32 src_pos, v2s32 dst_pos, v2u32 size, int ratio)
|
|
||||||
{
|
|
||||||
for (u32 y0 = 0; y0 < size.Y; y0++)
|
|
||||||
for (u32 x0 = 0; x0 < size.X; x0++)
|
|
||||||
{
|
|
||||||
s32 src_x = src_pos.X + x0;
|
|
||||||
s32 src_y = src_pos.Y + y0;
|
|
||||||
s32 dst_x = dst_pos.X + x0;
|
|
||||||
s32 dst_y = dst_pos.Y + y0;
|
|
||||||
video::SColor src_c = src->getPixel(src_x, src_y);
|
|
||||||
video::SColor dst_c = dst->getPixel(dst_x, dst_y);
|
|
||||||
if (dst_c.getAlpha() > 0 && src_c.getAlpha() != 0)
|
|
||||||
{
|
|
||||||
if (ratio == -1)
|
|
||||||
dst_c = src_c.getInterpolated(dst_c, (float)src_c.getAlpha()/255.0f);
|
|
||||||
else
|
|
||||||
dst_c = src_c.getInterpolated(dst_c, (float)ratio/255.0f);
|
|
||||||
dst->setPixel(dst_x, dst_y, dst_c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Apply color to destination, using a weighted interpolation blend
|
Apply color to destination, using a weighted interpolation blend
|
||||||
*/
|
*/
|
||||||
@ -2455,7 +2406,7 @@ static void draw_crack(video::IImage *crack, video::IImage *dst,
|
|||||||
if (!crack_scaled)
|
if (!crack_scaled)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
auto blit = use_overlay ? blit_with_alpha_overlay : blit_with_alpha;
|
auto blit = use_overlay ? blit_with_alpha<true> : blit_with_alpha<false>;
|
||||||
for (s32 i = 0; i < frame_count; ++i) {
|
for (s32 i = 0; i < frame_count; ++i) {
|
||||||
v2s32 dst_pos(0, frame_size.Height * i);
|
v2s32 dst_pos(0, frame_size.Height * i);
|
||||||
blit(crack_scaled, dst, v2s32(0,0), dst_pos, frame_size);
|
blit(crack_scaled, dst, v2s32(0,0), dst_pos, frame_size);
|
||||||
|
Loading…
Reference in New Issue
Block a user