Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support most Maniac Patch Picture enhancements #2628

Merged
merged 9 commits into from
Oct 16, 2021
Merged

Support most Maniac Patch Picture enhancements #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9b485e3
Bitmap: Support specifying of a Pixman Blend Mode for most Blit funct…
Ghabry Sep 1, 2021
336dde2
Maniac: Support some "Show Picture" enhancements
Ghabry Sep 1, 2021
a460de6
Maniac: Support some "Move Picture" enhancements
Ghabry Sep 1, 2021
4392df8
Add an additional abstraction between pixman_op_t and the Blend Mode
Ghabry Sep 1, 2021
077e4e8
Bitmap: Remember the filename, useful for debugging purposes
Ghabry Sep 9, 2021
71633d8
Maniac: Warn about unimplemented Show/Move Picture features
Ghabry Sep 9, 2021
56475ae
Simplify lookup functions
Ghabry Sep 12, 2021
5094f93
Maniac: Implement Erase Picture enhancements
Ghabry Sep 12, 2021
602a70f
Maniac: Warn about unimplemented Loop enhancements
Ghabry Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 63 additions & 24 deletions src/bitmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ Bitmap::Bitmap(Filesystem_Stream::InputStream stream, bool transparent, uint32_t
ConvertImage(w, h, pixels, transparent);

CheckPixels(flags);

filename = ToString(stream.GetName());
}

Bitmap::Bitmap(const uint8_t* data, unsigned bytes, bool transparent, uint32_t flags) {
Expand Down Expand Up @@ -569,14 +571,14 @@ namespace {
}
} // anonymous namespace

void Bitmap::Blit(int x, int y, Bitmap const& src, Rect const& src_rect, Opacity const& opacity) {
void Bitmap::Blit(int x, int y, Bitmap const& src, Rect const& src_rect, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
if (opacity.IsTransparent()) {
return;
}

auto mask = CreateMask(opacity, src_rect);

pixman_image_composite32(src.GetOperator(mask.get()),
pixman_image_composite32(src.GetOperator(mask.get(), blend_mode),
src.bitmap.get(),
mask.get(), bitmap.get(),
src_rect.x, src_rect.y,
Expand Down Expand Up @@ -605,11 +607,11 @@ PixmanImagePtr Bitmap::GetSubimage(Bitmap const& src, const Rect& src_rect) {
(uint32_t*) pixels, src.pitch()) };
}

void Bitmap::TiledBlit(Rect const& src_rect, Bitmap const& src, Rect const& dst_rect, Opacity const& opacity) {
TiledBlit(0, 0, src_rect, src, dst_rect, opacity);
void Bitmap::TiledBlit(Rect const& src_rect, Bitmap const& src, Rect const& dst_rect, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
TiledBlit(0, 0, src_rect, src, dst_rect, opacity, blend_mode);
}

void Bitmap::TiledBlit(int ox, int oy, Rect const& src_rect, Bitmap const& src, Rect const& dst_rect, Opacity const& opacity) {
void Bitmap::TiledBlit(int ox, int oy, Rect const& src_rect, Bitmap const& src, Rect const& dst_rect, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
if (opacity.IsTransparent()) {
return;
}
Expand All @@ -625,19 +627,19 @@ void Bitmap::TiledBlit(int ox, int oy, Rect const& src_rect, Bitmap const& src,

auto mask = CreateMask(opacity, src_rect);

pixman_image_composite32(src.GetOperator(mask.get()),
pixman_image_composite32(src.GetOperator(mask.get(), blend_mode),
src_bm.get(), mask.get(), bitmap.get(),
ox, oy,
0, 0,
dst_rect.x, dst_rect.y,
dst_rect.width, dst_rect.height);
}

void Bitmap::StretchBlit(Bitmap const& src, Rect const& src_rect, Opacity const& opacity) {
StretchBlit(GetRect(), src, src_rect, opacity);
void Bitmap::StretchBlit(Bitmap const& src, Rect const& src_rect, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
StretchBlit(GetRect(), src, src_rect, opacity, blend_mode);
}

void Bitmap::StretchBlit(Rect const& dst_rect, Bitmap const& src, Rect const& src_rect, Opacity const& opacity) {
void Bitmap::StretchBlit(Rect const& dst_rect, Bitmap const& src, Rect const& src_rect, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
if (opacity.IsTransparent()) {
return;
}
Expand All @@ -651,7 +653,7 @@ void Bitmap::StretchBlit(Rect const& dst_rect, Bitmap const& src, Rect const& sr

auto mask = CreateMask(opacity, src_rect, &xform);

pixman_image_composite32(src.GetOperator(mask.get()),
pixman_image_composite32(src.GetOperator(mask.get(), blend_mode),
src.bitmap.get(), mask.get(), bitmap.get(),
src_rect.x / zoom_x, src_rect.y / zoom_y,
0, 0,
Expand All @@ -661,7 +663,7 @@ void Bitmap::StretchBlit(Rect const& dst_rect, Bitmap const& src, Rect const& sr
pixman_image_set_transform(src.bitmap.get(), nullptr);
}

void Bitmap::WaverBlit(int x, int y, double zoom_x, double zoom_y, Bitmap const& src, Rect const& src_rect, int depth, double phase, Opacity const& opacity) {
void Bitmap::WaverBlit(int x, int y, double zoom_x, double zoom_y, Bitmap const& src, Rect const& src_rect, int depth, double phase, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
if (opacity.IsTransparent()) {
return;
}
Expand All @@ -686,7 +688,7 @@ void Bitmap::WaverBlit(int x, int y, double zoom_x, double zoom_y, Bitmap const&
const double sy = (i - yclip) * (2 * M_PI) / (32.0 * zoom_y);
const int offset = 2 * zoom_x * depth * std::sin(phase + sy);

pixman_image_composite32(src.GetOperator(mask.get()),
pixman_image_composite32(src.GetOperator(mask.get(), blend_mode),
src.bitmap.get(), mask.get(), bitmap.get(),
xoff, yoff + i,
0, i,
Expand Down Expand Up @@ -946,7 +948,7 @@ void Bitmap::BlendBlit(int x, int y, Bitmap const& src, Rect const& src_rect, co
src_rect.width, src_rect.height);
}

void Bitmap::FlipBlit(int x, int y, Bitmap const& src, Rect const& src_rect, bool horizontal, bool vertical, Opacity const& opacity) {
void Bitmap::FlipBlit(int x, int y, Bitmap const& src, Rect const& src_rect, bool horizontal, bool vertical, Opacity const& opacity, Bitmap::BlendMode blend_mode) {
if (opacity.IsTransparent()) {
return;
}
Expand All @@ -967,7 +969,7 @@ void Bitmap::FlipBlit(int x, int y, Bitmap const& src, Rect const& src_rect, boo
rect = Rect{ src_x, src_y, src_rect.width, src_rect.height };
}

Blit(x, y, src, rect, opacity);
Blit(x, y, src, rect, opacity, blend_mode);

if (has_xform) {
pixman_image_set_transform(src.bitmap.get(), nullptr);
Expand Down Expand Up @@ -1043,7 +1045,7 @@ void Bitmap::EffectsBlit(int x, int y, int ox, int oy,
Bitmap const& src, Rect const& src_rect,
Opacity const& opacity,
double zoom_x, double zoom_y, double angle,
int waver_depth, double waver_phase) {
int waver_depth, double waver_phase, Bitmap::BlendMode blend_mode) {
if (opacity.IsTransparent()) {
return;
}
Expand All @@ -1054,22 +1056,22 @@ void Bitmap::EffectsBlit(int x, int y, int ox, int oy,

if (waver) {
WaverBlit(x - ox * zoom_x, y - oy * zoom_y, zoom_x, zoom_y, src, src_rect,
waver_depth, waver_phase, opacity);
waver_depth, waver_phase, opacity, blend_mode);
}
else if (rotate) {
RotateZoomOpacityBlit(x, y, ox, oy, src, src_rect, angle, zoom_x, zoom_y, opacity);
RotateZoomOpacityBlit(x, y, ox, oy, src, src_rect, angle, zoom_x, zoom_y, opacity, blend_mode);
}
else if (scale) {
ZoomOpacityBlit(x, y, ox, oy, src, src_rect, zoom_x, zoom_y, opacity);
ZoomOpacityBlit(x, y, ox, oy, src, src_rect, zoom_x, zoom_y, opacity, blend_mode);
}
else {
Blit(x - ox, y - oy, src, src_rect, opacity);
Blit(x - ox, y - oy, src, src_rect, opacity, blend_mode);
}
}

void Bitmap::RotateZoomOpacityBlit(int x, int y, int ox, int oy,
Bitmap const& src, Rect const& src_rect,
double angle, double zoom_x, double zoom_y, Opacity const& opacity)
double angle, double zoom_x, double zoom_y, Opacity const& opacity, Bitmap::BlendMode blend_mode)
{
if (opacity.IsTransparent()) {
return;
Expand Down Expand Up @@ -1101,7 +1103,7 @@ void Bitmap::RotateZoomOpacityBlit(int x, int y, int ox, int oy,

auto mask = CreateMask(opacity, src_rect, &inv);

pixman_image_composite32(PIXMAN_OP_OVER,
pixman_image_composite32(GetOperator(mask.get(), blend_mode),
src_img, mask.get(), bitmap.get(),
dst_rect.x, dst_rect.y,
dst_rect.x, dst_rect.y,
Expand All @@ -1114,7 +1116,7 @@ void Bitmap::RotateZoomOpacityBlit(int x, int y, int ox, int oy,
void Bitmap::ZoomOpacityBlit(int x, int y, int ox, int oy,
Bitmap const& src, Rect const& src_rect,
double zoom_x, double zoom_y,
Opacity const& opacity)
Opacity const& opacity, Bitmap::BlendMode blend_mode)
{
if (opacity.IsTransparent()) {
return;
Expand All @@ -1125,10 +1127,47 @@ void Bitmap::ZoomOpacityBlit(int x, int y, int ox, int oy,
y - static_cast<int>(std::floor(oy * zoom_y)),
static_cast<int>(std::floor(src_rect.width * zoom_x)),
static_cast<int>(std::floor(src_rect.height * zoom_y)));
StretchBlit(dst_rect, src, src_rect, opacity);
StretchBlit(dst_rect, src, src_rect, opacity, blend_mode);
}

pixman_op_t Bitmap::GetOperator(pixman_image_t* mask) const {
pixman_op_t Bitmap::GetOperator(pixman_image_t* mask, Bitmap::BlendMode blend_mode) const {
if (blend_mode != BlendMode::Default) {
switch (blend_mode) {
case BlendMode::Normal:
return PIXMAN_OP_OVER;
case BlendMode::NormalWithoutAlpha:
return PIXMAN_OP_SRC;
case BlendMode::XOR:
return PIXMAN_OP_XOR;
case BlendMode::Additive:
return PIXMAN_OP_ADD;
case BlendMode::Multiply:
return PIXMAN_OP_MULTIPLY;
case BlendMode::Overlay:
return PIXMAN_OP_OVERLAY;
case BlendMode::Saturate:
return PIXMAN_OP_SATURATE;
case BlendMode::Darken:
return PIXMAN_OP_DARKEN;
case BlendMode::Lighten:
return PIXMAN_OP_LIGHTEN;
case BlendMode::ColorDodge:
return PIXMAN_OP_COLOR_DODGE;
case BlendMode::ColorBurn:
return PIXMAN_OP_COLOR_BURN;
case BlendMode::Difference:
return PIXMAN_OP_DIFFERENCE;
case BlendMode::Exclusion:
return PIXMAN_OP_EXCLUSION;
case BlendMode::SoftLight:
return PIXMAN_OP_SOFT_LIGHT;
case BlendMode::HardLight:
return PIXMAN_OP_HARD_LIGHT;
default:
return PIXMAN_OP_CLEAR;
}
}

if (!mask && (!GetTransparent() || GetImageOpacity() == ImageOpacity::Opaque)) {
return PIXMAN_OP_SRC;
}
Expand Down
Loading