mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use tilemap grid (instead of sprite grid) w/selection tools in tile mode

Browse Source
This commit is contained in:
David Capello 2020-06-29 19:13:21 -03:00
parent 723eaf10fa
commit d862f9f948
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/ui/editor/tool_loop_impl.cpp
View File

@ -124,7 +124,7 @@ protected:
public: public:
ToolLoopBase(Editor* editor, ToolLoopBase(Editor* editor,
Site& site, Site& site, const doc::Grid& grid,
ToolLoopParams& params) ToolLoopParams& params)
: m_editor(editor) : m_editor(editor)
, m_tool(params.tool) , m_tool(params.tool)
@ -143,8 +143,8 @@ public:
, m_contiguous(params.contiguous) , m_contiguous(params.contiguous)
, m_snapToGrid(m_docPref.grid.snap()) , m_snapToGrid(m_docPref.grid.snap())
, m_isSelectingTiles(false) , m_isSelectingTiles(false)
, m_grid(site.grid()) , m_grid(grid)
, m_gridBounds(site.gridBounds()) , m_gridBounds(grid.origin(), grid.tileSize())
, m_button(params.button) , m_button(params.button)
, m_ink(params.ink->clone()) , m_ink(params.ink->clone())
, m_controller(params.controller) , m_controller(params.controller)
@ -454,10 +454,11 @@ class ToolLoopImpl : public ToolLoopBase {
public: public:
ToolLoopImpl(Editor* editor, ToolLoopImpl(Editor* editor,
Site& site, Site& site,
const doc::Grid& grid,
Context* context, Context* context,
ToolLoopParams& params, ToolLoopParams& params,
const bool saveLastPoint) const bool saveLastPoint)
: ToolLoopBase(editor, site, params) : ToolLoopBase(editor, site, grid, params)
, m_context(context) , m_context(context)
, m_canceled(false) , m_canceled(false)
, m_tx(m_context, , m_tx(m_context,
@ -713,6 +714,7 @@ tools::ToolLoop* create_tool_loop(
const bool selectTiles) const bool selectTiles)
{ {
Site site = editor->getSite(); Site site = editor->getSite();
doc::Grid grid = site.grid();
ToolLoopParams params; ToolLoopParams params;
params.tool = editor->getCurrentEditorTool(); params.tool = editor->getCurrentEditorTool();
@ -744,6 +746,8 @@ tools::ToolLoop* create_tool_loop(
if (params.ink->isSelection() && if (params.ink->isSelection() &&
!params.tool->getPointShape( !params.tool->getPointShape(
button != tools::Pointer::Left ? 1: 0)->isFloodFill()) { button != tools::Pointer::Left ? 1: 0)->isFloodFill()) {
// TODO improve the selection preview without using a preview
// image (e.g. we could use a gfx::Path)
site.layer(nullptr); site.layer(nullptr);
} }
else { else {
@ -816,7 +820,7 @@ tools::ToolLoop* create_tool_loop(
ASSERT(context->activeDocument() == editor->document()); ASSERT(context->activeDocument() == editor->document());
auto toolLoop = new ToolLoopImpl( auto toolLoop = new ToolLoopImpl(
editor, site, context, params, saveLastPoint); editor, site, grid, context, params, saveLastPoint);
if (selectTiles) if (selectTiles)
toolLoop->forceSnapToTiles(); toolLoop->forceSnapToTiles();
@ -855,7 +859,8 @@ tools::ToolLoop* create_tool_loop_for_script(
Site site2(site); Site site2(site);
return new ToolLoopImpl( return new ToolLoopImpl(
nullptr, site2, context, params, false); nullptr, site2, site2.grid(),
context, params, false);
} }
catch (const std::exception& ex) { catch (const std::exception& ex) {
Console::showException(ex); Console::showException(ex);
@ -880,7 +885,7 @@ public:
ToolLoopParams& params, ToolLoopParams& params,
Image* image, Image* image,
const gfx::Point& celOrigin) const gfx::Point& celOrigin)
: ToolLoopBase(editor, site, params) : ToolLoopBase(editor, site, site.grid(), params)
, m_image(image) , m_image(image)
{ {
m_celOrigin = celOrigin; m_celOrigin = celOrigin;