mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-07-08 05:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix suggestions by Dacap

Browse Source
This commit is contained in:
Gaspar Capello 2024-07-03 10:12:14 -03:00
parent 40d3fc131a
commit 86f1961f81
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/commands/cmd_export_sprite_sheet.cpp
View File

@ -153,17 +153,15 @@ void destroy_doc(Context* ctx, Doc* doc)
}
}
void insertLayersToSelectedLayers(Layer* layer, SelectedLayers* selectedLayers)
void insert_layers_to_selected_layers(Layer* layer, SelectedLayers& selectedLayers)
{
if (layer->isGroup()) {
auto childs = static_cast<const LayerGroup*>(layer)->layers();
if (childs.size() == 0)
return;
for (auto child : childs)
insertLayersToSelectedLayers(child, selectedLayers);
auto children = static_cast<LayerGroup*>(layer)->layers();
for (auto child : children)
insert_layers_to_selected_layers(child, selectedLayers);
}
else
selectedLayers->insert(const_cast<Layer*>(layer));
selectedLayers.insert(layer);
}
Doc* generate_sprite_sheet_from_params(
@ -222,12 +220,16 @@ Doc* generate_sprite_sheet_from_params(
SelectedLayers selLayers;
if (layerName != kSelectedLayers) {
// TODO add a getLayerByName
int i = sprite->allLayersCount();
for (Layer* layer : sprite->allLayers()) {
if (get_layer_path(layer) == layerName ) {
i--;
if (get_layer_path(layer) == layerName &&
(layerIndex == -1 || layerIndex == i)) {
if (layer->isGroup())
insertLayersToSelectedLayers(layer, &selLayers);
insert_layers_to_selected_layers(layer, selLayers);
else
selLayers.insert(const_cast<Layer*>(layer));
selLayers.insert(layer);
break;
}
}

4
tests/scripts/app_command.lua
View File

@ -100,12 +100,12 @@ do -- ExportSpriteSheet
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,
})
local s = Sprite{ fromFile="sprites/groups4.aseprite" }
local s = Sprite{ fromFile="sprites/groups3abc.aseprite" }
local c = app.pixelColor.rgba(75, 105, 47)
app.command.ExportSpriteSheet {
type=SpriteSheetType.ROWS,
textureFilename="_test_export_spritesheet4.png",
layer="G1/G2/G3/b",
layer="b/b",
trim=true,
}
local i = Image{ fromFile="_test_export_spritesheet4.png" }

BIN
tests/sprites/groups4.aseprite
View File

Binary file not shown.