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

Minor changes in calculate_sheet_size()

Browse Source
This commit is contained in:
David Capello 2019-01-25 15:44:33 -03:00
parent 6ba71343dc
commit 3910e20082
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,10 @@ namespace {
Fit calculate_sheet_size(Sprite* sprite, int nframes, Fit calculate_sheet_size(Sprite* sprite, int nframes,
int columns, int rows, int columns, int rows,
int borderPadding, int shapePadding, int innerPadding, bool extrude) { int borderPadding,
int shapePadding,
int innerPadding,
bool extrude) {
if (columns == 0) { if (columns == 0) {
rows = MID(1, rows, nframes); rows = MID(1, rows, nframes);
columns = ((nframes/rows) + ((nframes%rows) > 0 ? 1: 0)); columns = ((nframes/rows) + ((nframes%rows) > 0 ? 1: 0));
@ -128,15 +131,10 @@ namespace {
rows = ((nframes/columns) + ((nframes%columns) > 0 ? 1: 0)); rows = ((nframes/columns) + ((nframes%columns) > 0 ? 1: 0));
} }
int extrudeColumns = 0; int extraPerSample = 2*innerPadding + (extrude ? 2: 0);
int extrudeRows = 0;
if (extrude) {
extrudeColumns = columns*2;
extrudeRows = rows*2;
}
return Fit( return Fit(
2*borderPadding + (sprite->width()+2*innerPadding)*columns + (columns-1)*shapePadding + extrudeColumns, 2*borderPadding + (sprite->width()+extraPerSample)*columns + (columns-1)*shapePadding,
2*borderPadding + (sprite->height()+2*innerPadding)*rows + (rows-1)*shapePadding + extrudeRows, 2*borderPadding + (sprite->height()+extraPerSample)*rows + (rows-1)*shapePadding,
columns, rows, 0); columns, rows, 0);
} }