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

Draw grids on all tiles

Browse Source
This commit is contained in:
David Capello 2017-11-08 12:58:47 -03:00
parent 7dbff3daa6
commit 7febd638fd
1 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/app/ui/editor/editor.cpp
View File

@ -651,6 +651,51 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& sprite
gfx::Rect(dest_x, dest_y, rc.w, rc.h))); gfx::Rect(dest_x, dest_y, rc.w, rc.h)));
} }
} }
// Draw grids
{
gfx::Rect enclosingRect(
m_padding.x + dx,
m_padding.y + dy,
m_proj.applyX(m_sprite->width()),
m_proj.applyY(m_sprite->height()));
IntersectClip clip(g, gfx::Rect(dest_x, dest_y, rc.w, rc.h));
if (clip) {
// Draw the pixel grid
if ((m_proj.zoom().scale() > 2.0) && m_docPref.show.pixelGrid()) {
int alpha = m_docPref.pixelGrid.opacity();
if (m_docPref.pixelGrid.autoOpacity()) {
alpha = int(alpha * (m_proj.zoom().scale()-2.) / (16.-2.));
alpha = MID(0, alpha, 255);
}
drawGrid(g, enclosingRect, Rect(0, 0, 1, 1),
m_docPref.pixelGrid.color(), alpha);
}
// Draw the grid
if (m_docPref.show.grid()) {
gfx::Rect gridrc = m_docPref.grid.bounds();
if (m_proj.applyX(gridrc.w) > 2 &&
m_proj.applyY(gridrc.h) > 2) {
int alpha = m_docPref.grid.opacity();
if (m_docPref.grid.autoOpacity()) {
double len = (m_proj.applyX(gridrc.w) +
m_proj.applyY(gridrc.h)) / 2.;
alpha = int(alpha * len / 32.);
alpha = MID(0, alpha, 255);
}
if (alpha > 8)
drawGrid(g, enclosingRect, m_docPref.grid.bounds(),
m_docPref.grid.color(), alpha);
}
}
}
}
} }
void Editor::drawBackground(ui::Graphics* g) void Editor::drawBackground(ui::Graphics* g)
@ -722,50 +767,18 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
spriteRect.w*3, spriteRect.h*3); spriteRect.w*3, spriteRect.h*3);
} }
// Grids & slices // Draw slices
{ {
// Clipping // Clipping
gfx::Rect cliprc = editorToScreen(rc).offset(-bounds().origin()); gfx::Rect cliprc = editorToScreen(rc).offset(-bounds().origin());
cliprc = cliprc.createIntersection(spriteRect); cliprc = cliprc.createIntersection(spriteRect);
if (!cliprc.isEmpty()) { if (!cliprc.isEmpty()) {
IntersectClip clip(g, cliprc); IntersectClip clip(g, cliprc);
if (clip) {
// Draw the pixel grid // Draw slices
if ((m_proj.zoom().scale() > 2.0) && m_docPref.show.pixelGrid()) { if (m_docPref.show.slices())
int alpha = m_docPref.pixelGrid.opacity(); drawSlices(g);
if (m_docPref.pixelGrid.autoOpacity()) {
alpha = int(alpha * (m_proj.zoom().scale()-2.) / (16.-2.));
alpha = MID(0, alpha, 255);
}
drawGrid(g, enclosingRect, Rect(0, 0, 1, 1),
m_docPref.pixelGrid.color(), alpha);
} }
// Draw the grid
if (m_docPref.show.grid()) {
gfx::Rect gridrc = m_docPref.grid.bounds();
if (m_proj.applyX(gridrc.w) > 2 &&
m_proj.applyY(gridrc.h) > 2) {
int alpha = m_docPref.grid.opacity();
if (m_docPref.grid.autoOpacity()) {
double len = (m_proj.applyX(gridrc.w) +
m_proj.applyY(gridrc.h)) / 2.;
alpha = int(alpha * len / 32.);
alpha = MID(0, alpha, 255);
}
if (alpha > 8)
drawGrid(g, enclosingRect, m_docPref.grid.bounds(),
m_docPref.grid.color(), alpha);
}
}
// Draw slices
if (m_docPref.show.slices())
drawSlices(g);
} }
} }