mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-08 12:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the handling of the filled case of the Contour tool

Browse Source
This commit is contained in:
David Capello 2019-04-16 11:52:11 -03:00
parent 9e0d732959
commit 74b0a70107
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,10 +195,18 @@ void ToolLoopManager::doLoopStep(bool lastStep)
m_toolLoop->getInk()->prepareForStrokes(m_toolLoop, strokes);
// Invalidate destination image area.
if (m_toolLoop->getTracePolicy() == TracePolicy::Last) {
// Copy source to destination (reset the previous trace). Useful
// for tools like Line and Ellipse (we keep the last trace only).
// True when we have to fill
const bool fillStrokes =
(m_toolLoop->getFilled() &&
(lastStep || m_toolLoop->getPreviewFilled()));
// Invalidate the whole destination image area.
if (m_toolLoop->getTracePolicy() == TracePolicy::Last ||
fillStrokes) {
// Copy source to destination (reset all the previous
// traces). Useful for tools like Line and Ellipse (we keep the
// last trace only) or to draw the final result in contour tool
// (the final result is filled).
m_toolLoop->invalidateDstImage();
}
else if (m_toolLoop->getTracePolicy() == TracePolicy::AccumulateUpdateLast) {
@ -220,20 +228,10 @@ void ToolLoopManager::doLoopStep(bool lastStep)
m_toolLoop->validateDstImage(m_dirtyArea);
// Join or fill user points
if (!m_toolLoop->getFilled() || (!lastStep && !m_toolLoop->getPreviewFilled()))
m_toolLoop->getIntertwine()->joinStroke(m_toolLoop, main_stroke);
else {
// Filled + Freehand Controller = Contour Tool
if (m_toolLoop->getController()->isFreehand()) {
// With this we avoid over-drawing the edge of the contour,
// appreciated when we use the Contour Tool combined with Image
// Brush with alpha content.
m_toolLoop->invalidateDstImage();
m_toolLoop->validateDstImage(gfx::Region(m_toolLoop->getDstImage()->bounds()));
}
if (fillStrokes)
m_toolLoop->getIntertwine()->fillStroke(m_toolLoop, main_stroke);
}
else
m_toolLoop->getIntertwine()->joinStroke(m_toolLoop, main_stroke);
if (m_toolLoop->getTracePolicy() == TracePolicy::Overlap) {
// Copy destination to source (yes, destination to source). In