root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Minor changes

This commit is contained in:
David Capello 2020-08-06 16:18:53 -03:00
parent a195487fc0
commit 8b8b062f59
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/cmd/patch_cel.cpp
View File

@ -40,17 +40,17 @@ void PatchCel::onExecute()
gfx::Rect newBounds;
gfx::Region copyRegion = m_region;
Tileset* tileset = nullptr;
doc::Grid grid;
if (cel->image()->pixelFormat() == IMAGE_TILEMAP ) {
if (cel->image()->pixelFormat() == IMAGE_TILEMAP) {
newBounds = cel->bounds() | m_region.bounds();
tileset = static_cast<LayerTilemap*>(cel->layer())->tileset();
auto tileset = static_cast<LayerTilemap*>(cel->layer())->tileset();
grid = tileset->grid();
grid.origin(m_pos);
copyRegion = grid.canvasToTile(m_region);
}
else
newBounds = cel->bounds() | gfx::Rect(m_region.bounds()).offset(m_pos);
if (cel->bounds() != newBounds) {
executeAndAdd(new CropCel(cel, newBounds));
}

16
src/app/util/expand_cel_canvas.cpp
View File

@ -140,7 +140,7 @@ ExpandCelCanvas::ExpandCelCanvas(
// grid.origin()
// example = (-1, -1)
// O---------|---------|----- <--- grid (example: tile size = 2x2)
// | ____________________
// | ____________________
// | | <-- sprite canvas
// - | .---------.
// | | | |
@ -262,8 +262,7 @@ void ExpandCelCanvas::commit()
m_cel->setPosition(m_origCelPos);
#ifdef _DEBUG
if (m_layer->isTilemap() &&
m_tilemapMode == TilemapMode::Pixels) {
if (m_layer->isTilemap()) {
ASSERT(m_cel->image() != m_celImage.get());
}
else {
@ -320,9 +319,9 @@ void ExpandCelCanvas::commit()
// Check that the region to copy or patch is not empty before we
// create the new cmd
else if (!regionToPatch->isEmpty()) {
ASSERT(m_celImage.get() == m_cel->image());
if (m_layer->isBackground()) {
ASSERT(m_celImage.get() == m_cel->image());
m_cmds->executeAndAdd(
new cmd::CopyRegion(
m_cel->image(),
@ -332,6 +331,8 @@ void ExpandCelCanvas::commit()
}
else {
if (m_tilemapMode == TilemapMode::Tiles) {
ASSERT(m_celImage.get() != m_cel->image());
m_cel->data()->setImage(m_celImage, m_layer);
gfx::Region regionInCanvas = m_grid.tileToCanvas(regionToPatch);
regionToPatch = &regionInCanvas;
@ -343,6 +344,8 @@ void ExpandCelCanvas::commit()
m_grid.origin()));
}
else {
ASSERT(m_celImage.get() == m_cel->image());
m_cmds->executeAndAdd(
new cmd::PatchCel(
m_cel,
@ -447,9 +450,6 @@ void ExpandCelCanvas::validateSourceCanvas(const gfx::Region& rgn)
rgnToValidate.createSubtraction(rgnToValidate, m_validSrcRegion);
rgnToValidate.createIntersection(rgnToValidate, gfx::Region(m_srcImage->bounds()));
if (m_validSrcRegion.bounds() == gfx::Rect(1, 1, 6, 6))
int aaa = 0;
if (m_celImage) {
gfx::Region rgnToClear;
rgnToClear.createSubtraction(