mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-06 06:50:07 +00:00
Fix suggestions by Dacap
This commit is contained in:
parent
40d3fc131a
commit
86f1961f81
@ -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()) {
|
if (layer->isGroup()) {
|
||||||
auto childs = static_cast<const LayerGroup*>(layer)->layers();
|
auto children = static_cast<LayerGroup*>(layer)->layers();
|
||||||
if (childs.size() == 0)
|
for (auto child : children)
|
||||||
return;
|
insert_layers_to_selected_layers(child, selectedLayers);
|
||||||
for (auto child : childs)
|
|
||||||
insertLayersToSelectedLayers(child, selectedLayers);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
selectedLayers->insert(const_cast<Layer*>(layer));
|
selectedLayers.insert(layer);
|
||||||
}
|
}
|
||||||
|
|
||||||
Doc* generate_sprite_sheet_from_params(
|
Doc* generate_sprite_sheet_from_params(
|
||||||
@ -222,12 +220,16 @@ Doc* generate_sprite_sheet_from_params(
|
|||||||
|
|
||||||
SelectedLayers selLayers;
|
SelectedLayers selLayers;
|
||||||
if (layerName != kSelectedLayers) {
|
if (layerName != kSelectedLayers) {
|
||||||
|
// TODO add a getLayerByName
|
||||||
|
int i = sprite->allLayersCount();
|
||||||
for (Layer* layer : sprite->allLayers()) {
|
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())
|
if (layer->isGroup())
|
||||||
insertLayersToSelectedLayers(layer, &selLayers);
|
insert_layers_to_selected_layers(layer, selLayers);
|
||||||
else
|
else
|
||||||
selLayers.insert(const_cast<Layer*>(layer));
|
selLayers.insert(layer);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -100,12 +100,12 @@ do -- ExportSpriteSheet
|
|||||||
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,
|
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)
|
local c = app.pixelColor.rgba(75, 105, 47)
|
||||||
app.command.ExportSpriteSheet {
|
app.command.ExportSpriteSheet {
|
||||||
type=SpriteSheetType.ROWS,
|
type=SpriteSheetType.ROWS,
|
||||||
textureFilename="_test_export_spritesheet4.png",
|
textureFilename="_test_export_spritesheet4.png",
|
||||||
layer="G1/G2/G3/b",
|
layer="b/b",
|
||||||
trim=true,
|
trim=true,
|
||||||
}
|
}
|
||||||
local i = Image{ fromFile="_test_export_spritesheet4.png" }
|
local i = Image{ fromFile="_test_export_spritesheet4.png" }
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user