mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix painting on flipped tiles in manual mode

Browse Source
This commit is contained in:
David Capello 2023-07-28 17:36:49 -03:00
parent 3606a54826
commit 0796d3732c
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/util/cel_ops.cpp
View File

@ -23,6 +23,7 @@
#include "app/cmd_sequence.h"
#include "app/doc.h"
#include "doc/algorithm/fill_selection.h"
#include "doc/algorithm/flip_image.h"
#include "doc/algorithm/resize_image.h"
#include "doc/algorithm/shrink_bounds.h"
#include "doc/cel.h"
@ -657,6 +658,8 @@ void modify_tilemap_cel_region(
continue;
const doc::tile_index ti = doc::tile_geti(t);
const doc::tile_flags tf = doc::tile_getf(t);
const doc::ImageRef existentTileImage = tileset->get(ti);
if (!existentTileImage) {
// TODO add support to fill the tileset with the tile "ti"
@ -668,10 +671,51 @@ void modify_tilemap_cel_region(
if (grid.hasMask())
mask_image(tileImage.get(), grid.mask().get());
const gfx::Rect tileImageBounds = tileImage->bounds();
gfx::Region tileRgn(tileInCanvasRc);
tileRgn.createIntersection(tileRgn, region);
tileRgn.offset(-tileInCanvasRc.origin());
// TODO implement all flips at once
// Undo flips in tileImage and tileRgn
if (tf & doc::tile_f_xflip) {
doc::algorithm::flip_image(tileImage.get(),
tileImageBounds,
doc::algorithm::FlipHorizontal);
gfx::Region flippedTileRgn;
for (auto& rc : tileRgn) {
flippedTileRgn |= gfx::Region(
gfx::Rect(tileImageBounds.x2() - rc.x2(), rc.y, rc.w, rc.h));
}
tileRgn = flippedTileRgn;
}
if (tf & doc::tile_f_yflip) {
doc::algorithm::flip_image(tileImage.get(),
tileImageBounds,
doc::algorithm::FlipVertical);
gfx::Region flippedTileRgn;
for (auto& rc : tileRgn) {
flippedTileRgn |= gfx::Region(
gfx::Rect(rc.x, tileImageBounds.y2() - rc.y2(), rc.w, rc.h));
}
tileRgn = flippedTileRgn;
}
if (tf & doc::tile_f_dflip) {
doc::algorithm::flip_image(tileImage.get(),
tileImageBounds,
doc::algorithm::FlipDiagonal);
gfx::Region flippedTileRgn;
for (auto& rc : tileRgn) {
flippedTileRgn |= gfx::Region(gfx::Rect(rc.y, rc.x, rc.h, rc.w));
}
tileRgn = flippedTileRgn;
}
ImageRef tileDstImage = tileset->get(ti);
// Compare with the original tile from the original tileset