mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-19 01:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support to select used/unused tiles from multiple tilemap layers using the same tileset

Browse Source 
With this commit we've also simplified the
SelectPaletteColorsCommand::selectTiles() function.
This commit is contained in:
David Capello 2021-05-20 17:49:16 -03:00
parent 405c1cfd39
commit de8b6ff2b4
1 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/app/commands/cmd_select_palette.cpp
View File

@ -47,10 +47,9 @@ protected:
std::string onGetFriendlyName() const override;
private:
bool selectTiles(Sprite* sprite,
Site* site,
PalettePicks& usedTilesIndices,
SelectedFrames& selectedFrames);
void selectTiles(const Layer* layer,
const SelectedFrames& selectedFrames,
PalettePicks& usedTiles);
Modifier m_modifier;
};
@ -89,47 +88,24 @@ void SelectPaletteColorsCommand::onLoadParams(const Params& params)
m_modifier = Modifier::UsedColors;
}
bool SelectPaletteColorsCommand::selectTiles(
Sprite* sprite,
Site* site,
PalettePicks& usedTilesIndices,
SelectedFrames& selectedFrames)
void SelectPaletteColorsCommand::selectTiles(
const Layer* layer,
const SelectedFrames& selectedFrames,
PalettePicks& usedTiles)
{
Tileset* currentTileset = site->tileset();
Layer* layer = site->layer();
ASSERT(layer);
ASSERT(layer->isTilemap());
if (!currentTileset || !site->layer() || !layer->isTilemap())
return false;
CelList tilemapCels;
// For each tile on each cel's tilemap
for (frame_t frame : selectedFrames) {
if (Cel* cel = layer->cel(frame))
tilemapCels.push_back(cel);
}
int tilesetSize = currentTileset->size();
if (usedTilesIndices.size() != tilesetSize)
usedTilesIndices.resize(tilesetSize);
usedTilesIndices.clear();
if (tilemapCels.size() <= 0 || tilesetSize <= 0)
return false;
for (tile_index i=0; i<tilesetSize; ++i) {
for (auto cel : tilemapCels) {
bool skiptilesetIndex = false;
if (Cel* cel = layer->cel(frame)) {
for (const doc::tile_t t : LockImageBits<TilemapTraits>(cel->image())) {
if (t == i) {
usedTilesIndices[doc::tile_geti(t)] = true;
skiptilesetIndex = true;
break;
}
tile_index ti = doc::tile_geti(t);
if (ti >= 0 && ti < usedTiles.size())
usedTiles[ti] = true;
}
if (skiptilesetIndex)
break;
}
}
return true;
}
void SelectPaletteColorsCommand::onExecute(Context* context)
@ -229,17 +205,23 @@ void SelectPaletteColorsCommand::onExecute(Context* context)
}
else if (m_modifier == Modifier::UsedTiles ||
m_modifier == Modifier::UnusedTiles) {
if (!site.tileset())
Tileset* tileset = site.tileset();
if (!tileset)
return;
PalettePicks usedTileIndices(site.tileset()->size());
selectTiles(sprite, &site, usedTileIndices, selectedFrames);
PalettePicks usedTiles(tileset->size());
for (const Layer* layer : selectedLayers) {
if (layer->isTilemap() &&
static_cast<const LayerTilemap*>(layer)->tileset() == tileset) {
selectTiles(layer, selectedFrames, usedTiles);
}
}
if (m_modifier == Modifier::UnusedTiles) {
for (int i=0; i<usedTileIndices.size(); ++i)
usedTileIndices[i] = !usedTileIndices[i];
for (int i=0; i<usedTiles.size(); ++i)
usedTiles[i] = !usedTiles[i];
}
context->setSelectedTiles(usedTileIndices);
context->setSelectedTiles(usedTiles);
}
}