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

Try to avoid modifying indexes of non-modified tiles in Auto mode

Browse Source
This commit is contained in:
David Capello 2020-10-19 22:21:31 -03:00
parent 423cec71e5
commit 0993248189
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,8 @@ struct Mod {
static void remove_unused_tiles_from_tileset( static void remove_unused_tiles_from_tileset(
CmdSequence* cmds, CmdSequence* cmds,
doc::Tileset* tileset, doc::Tileset* tileset,
std::vector<size_t>& tilesHistogram); std::vector<size_t>& tilesHistogram,
const std::vector<bool>& modifiedTileIndexes);
doc::ImageRef crop_cel_image( doc::ImageRef crop_cel_image(
const doc::Cel* cel, const doc::Cel* cel,
@ -479,6 +480,7 @@ void modify_tilemap_cel_region(
regionToPatch -= gfx::Region(grid.tileToCanvas(oldTilemapBounds)); regionToPatch -= gfx::Region(grid.tileToCanvas(oldTilemapBounds));
regionToPatch |= region; regionToPatch |= region;
std::vector<bool> modifiedTileIndexes(tileset->size(), false);
std::vector<size_t> tilesHistogram(tileset->size(), 0); std::vector<size_t> tilesHistogram(tileset->size(), 0);
if (tilesetMode == TilesetMode::Auto) { if (tilesetMode == TilesetMode::Auto) {
for_each_tile_using_tileset( for_each_tile_using_tileset(
@ -549,6 +551,9 @@ void modify_tilemap_cel_region(
ti >= 0 && ti < tilesHistogram.size() && ti >= 0 && ti < tilesHistogram.size() &&
ti != tileIndex) { ti != tileIndex) {
--tilesHistogram[ti]; --tilesHistogram[ti];
if (tilesetMode == TilesetMode::Auto)
modifiedTileIndexes[ti] = true;
} }
OPS_TRACE(" - tile %d -> %d\n", OPS_TRACE(" - tile %d -> %d\n",
@ -583,7 +588,9 @@ void modify_tilemap_cel_region(
// Remove unused tiles // Remove unused tiles
if (tilesetMode == TilesetMode::Auto) { if (tilesetMode == TilesetMode::Auto) {
remove_unused_tiles_from_tileset(cmds, tileset, tilesHistogram); remove_unused_tiles_from_tileset(cmds, tileset,
tilesHistogram,
modifiedTileIndexes);
} }
doc->notifyTilesetChanged(tileset); doc->notifyTilesetChanged(tileset);
@ -703,7 +710,8 @@ void clear_mask_from_cel(CmdSequence* cmds,
static void remove_unused_tiles_from_tileset( static void remove_unused_tiles_from_tileset(
CmdSequence* cmds, CmdSequence* cmds,
doc::Tileset* tileset, doc::Tileset* tileset,
std::vector<size_t>& tilesHistogram) std::vector<size_t>& tilesHistogram,
const std::vector<bool>& modifiedTileIndexes)
{ {
OPS_TRACE("remove_unused_tiles_from_tileset\n"); OPS_TRACE("remove_unused_tiles_from_tileset\n");
@ -725,7 +733,8 @@ static void remove_unused_tiles_from_tileset(
OPS_TRACE(" - ti=%d tj=%d tilesHistogram[%d]=%d\n", OPS_TRACE(" - ti=%d tj=%d tilesHistogram[%d]=%d\n",
ti, tj, ti, (ti < tilesHistogram.size() ? tilesHistogram[ti]: 0)); ti, tj, ti, (ti < tilesHistogram.size() ? tilesHistogram[ti]: 0));
if (ti < tilesHistogram.size() && if (ti < tilesHistogram.size() &&
tilesHistogram[ti] == 0) { tilesHistogram[ti] == 0 &&
modifiedTileIndexes[ti]) {
cmds->executeAndAdd(new cmd::RemoveTile(tileset, tj)); cmds->executeAndAdd(new cmd::RemoveTile(tileset, tj));
// Map to nothing, so the map can be invertible // Map to nothing, so the map can be invertible
remap.map(ti, doc::Remap::kNoMap); remap.map(ti, doc::Remap::kNoMap);