mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce dirty area when symmetry mode is enabled

Browse Source
This commit is contained in:
David Capello 2015-10-29 16:24:20 -03:00
parent 24306589f0
commit d75ac238e4
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/tools/stroke.h
View File

@ -60,6 +60,8 @@ namespace app {
Points m_points;
};
typedef std::vector<Stroke> Strokes;
} // namespace tools
} // namespace app

2
src/app/tools/symmetry.h
View File

@ -16,8 +16,6 @@
namespace app {
namespace tools {
typedef std::vector<Stroke> Strokes;
// This class controls user input.
class Symmetry {
public:

17
src/app/tools/tool_loop_manager.cpp
View File

@ -170,6 +170,7 @@ void ToolLoopManager::doLoopStep(bool last_step)
m_toolLoop->getController()->getStrokeToInterwine(m_stroke, main_stroke);
else
main_stroke = m_stroke;
main_stroke.offset(m_toolLoop->getOffset());
// Apply symmetry
@ -181,11 +182,7 @@ void ToolLoopManager::doLoopStep(bool last_step)
strokes.push_back(main_stroke);
// Calculate the area to be updated in all document observers.
gfx::Rect strokeBounds;
for (const Stroke& stroke : strokes)
strokeBounds |= stroke.bounds();
calculateDirtyArea(strokeBounds);
calculateDirtyArea(strokes);
// Validate source image area.
if (m_toolLoop->getInk()->needsSpecialSourceArea()) {
@ -214,7 +211,7 @@ void ToolLoopManager::doLoopStep(bool last_step)
m_toolLoop->validateDstImage(m_dirtyArea);
// Get the modified area in the sprite with this intertwined set of points
for (const Stroke& stroke : strokes) {
for (Stroke& stroke : strokes) {
if (!m_toolLoop->getFilled() || (!last_step && !m_toolLoop->getPreviewFilled()))
m_toolLoop->getIntertwine()->joinStroke(m_toolLoop, stroke);
else
@ -241,7 +238,7 @@ void ToolLoopManager::snapToGrid(Point& point)
point = snap_to_grid(m_toolLoop->getGridBounds(), point);
}
void ToolLoopManager::calculateDirtyArea(const gfx::Rect& strokeBounds)
void ToolLoopManager::calculateDirtyArea(const Strokes& strokes)
{
// Save the current dirty area if it's needed
Region prevDirtyArea;
@ -251,7 +248,11 @@ void ToolLoopManager::calculateDirtyArea(const gfx::Rect& strokeBounds)
// Start with a fresh dirty area
m_dirtyArea.clear();
if (!strokeBounds.isEmpty()) {
for (auto& stroke : strokes) {
gfx::Rect strokeBounds = stroke.bounds();
if (strokeBounds.isEmpty())
continue;
// Expand the dirty-area with the pen width
Rect r1, r2;

2
src/app/tools/tool_loop_manager.h
View File

@ -90,7 +90,7 @@ namespace app {
void doLoopStep(bool last_step);
void snapToGrid(gfx::Point& point);
void calculateDirtyArea(const gfx::Rect& strokeBounds);
void calculateDirtyArea(const Strokes& strokes);
ToolLoop* m_toolLoop;
Stroke m_stroke;