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

Move EditorPreRender code to EditorPostRender

Browse Source 
This simplify Editor::drawOneSpriteUnclippedRect() impl to create an
alternative version of the renderer in the future.
This commit is contained in:
David Capello 2018-06-21 12:58:11 -03:00
parent c3e233f34d
commit e06735a4c0
6 changed files with 63 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,42 +77,6 @@ using namespace render;
static base::Chrono renderChrono;
static double renderElapsed = 0.0;
class EditorPreRenderImpl : public EditorPreRender {
public:
EditorPreRenderImpl(Editor* editor, Image* image,
const Point& offset,
const Projection& proj)
: m_editor(editor)
, m_image(image)
, m_offset(offset)
, m_proj(proj) {
}
Editor* getEditor() override {
return m_editor;
}
Image* getImage() override {
return m_image;
}
void fillRect(const gfx::Rect& rect, uint32_t rgbaColor, int opacity) override
{
blend_rect(
m_image,
m_offset.x + m_proj.applyX(rect.x),
m_offset.y + m_proj.applyY(rect.y),
m_offset.x + m_proj.applyX(rect.x+rect.w) - 1,
m_offset.y + m_proj.applyY(rect.y+rect.h) - 1, rgbaColor, opacity);
}
private:
Editor* m_editor;
Image* m_image;
Point m_offset;
Projection m_proj;
};
class EditorPostRenderImpl : public EditorPostRender {
public:
EditorPostRenderImpl(Editor* editor, Graphics* g)
@ -124,7 +88,7 @@ public:
return m_editor;
}
void drawLine(int x1, int y1, int x2, int y2, gfx::Color screenColor) override {
void drawLine(gfx::Color color, int x1, int y1, int x2, int y2) override {
gfx::Point a(x1, y1);
gfx::Point b(x2, y2);
a = m_editor->editorToScreen(a);
@ -134,7 +98,7 @@ public:
a.y -= bounds.y;
b.x -= bounds.x;
b.y -= bounds.y;
m_g->drawLine(screenColor, a, b);
m_g->drawLine(color, a, b);
}
void drawRectXor(const gfx::Rect& rc) override {
@ -148,6 +112,14 @@ public:
m_g->setDrawMode(Graphics::DrawMode::Solid);
}
void fillRect(gfx::Color color, const gfx::Rect& rc) override {
gfx::Rect rc2 = m_editor->editorToScreen(rc);
gfx::Rect bounds = m_editor->bounds();
rc2.x -= bounds.x;
rc2.y -= bounds.y;
m_g->fillRect(color, rc2);
}
private:
Editor* m_editor;
Graphics* m_g;
@ -629,13 +601,6 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& sprite
}
if (rendered) {
// Pre-render decorator.
if ((m_flags & kShowDecorators) && m_decorator) {
EditorPreRenderImpl preRender(this, rendered,
Point(-rc.x, -rc.y), m_proj);
m_decorator->preRenderDecorator(&preRender);
}
// Convert the render to a she::Surface
static she::Surface* tmp;
if (!tmp || tmp->width() < rc.w || tmp->height() < rc.h) {

24
src/app/ui/editor/editor_decorator.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -19,29 +19,26 @@ namespace doc {
class Image;
}
namespace ui {
class Graphics;
}
namespace app {
class Editor;
class EditorDecorator;
using namespace doc;
// EditorPreRender and EditorPostRender are two interfaces used to
// draw elements in the editor's area. They are implemented by the
// editor and used by a EditorDecorator.
class EditorPreRender {
public:
virtual ~EditorPreRender() { }
virtual Editor* getEditor() = 0;
virtual Image* getImage() = 0;
virtual void fillRect(const gfx::Rect& rect, uint32_t rgbaColor, int opacity) = 0;
};
// EditorPostRender is an interface used to draw elements in the
// editor's area. It's implemented by the editor and used by a
// EditorDecorator.
class EditorPostRender {
public:
virtual ~EditorPostRender() { }
virtual Editor* getEditor() = 0;
virtual void drawLine(int x1, int y1, int x2, int y2, gfx::Color screenColor) = 0;
virtual void drawLine(gfx::Color color, int x1, int y1, int x2, int y2) = 0;
virtual void drawRectXor(const gfx::Rect& rc) = 0;
virtual void fillRect(gfx::Color color, const gfx::Rect& rc) = 0;
};
// Used by editor's states to pre- and post-render customized
@ -50,7 +47,6 @@ namespace app {
class EditorDecorator {
public:
virtual ~EditorDecorator() { }
virtual void preRenderDecorator(EditorPreRender* render) = 0;
virtual void postRenderDecorator(EditorPostRender* render) = 0;
virtual void getInvalidDecoratoredRegion(Editor* editor, gfx::Region& region) = 0;
};

95
src/app/ui/editor/select_box_state.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2017 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -223,34 +223,6 @@ tools::Ink* SelectBoxState::getStateInk()
return nullptr;
}
void SelectBoxState::preRenderDecorator(EditorPreRender* render)
{
// Without black shadow?
if (!hasFlag(Flags::DarkOutside))
return;
gfx::Rect rc = getBoxBounds();
Sprite* sprite = render->getEditor()->sprite();
int sprite_w = sprite->width();
int sprite_h = sprite->height();
// Top band
if (rc.y > 0)
render->fillRect(gfx::Rect(0, 0, sprite_w, rc.y), doc::rgba(0, 0, 0, 255), 128);
// Bottom band
if (rc.y+rc.h < sprite_h)
render->fillRect(gfx::Rect(0, rc.y+rc.h, sprite_w, sprite_h-(rc.y+rc.h)), doc::rgba(0, 0, 0, 255), 128);
// Left band
if (rc.x > 0)
render->fillRect(gfx::Rect(0, rc.y, rc.x, rc.h), doc::rgba(0, 0, 0, 255), 128);
// Right band
if (rc.x+rc.w < sprite_w)
render->fillRect(gfx::Rect(rc.x+rc.w, rc.y, sprite_w-(rc.x+rc.w), rc.h), doc::rgba(0, 0, 0, 255), 128);
}
void SelectBoxState::postRenderDecorator(EditorPostRender* render)
{
Editor* editor = render->getEditor();
@ -262,51 +234,68 @@ void SelectBoxState::postRenderDecorator(EditorPostRender* render)
vp = editor->screenToEditor(vp);
// Paint a grid generated by the box
gfx::Color rulerColor = skin::SkinTheme::instance()->colors.selectBoxRuler();
gfx::Color gridColor = skin::SkinTheme::instance()->colors.selectBoxGrid();
gfx::Point mainOffset = editor->mainTilePosition();
gfx::Rect boxBounds = getBoxBounds();
boxBounds.offset(mainOffset);
const gfx::Color rulerColor = skin::SkinTheme::instance()->colors.selectBoxRuler();
const gfx::Color gridColor = skin::SkinTheme::instance()->colors.selectBoxGrid();
const gfx::Point mainOffset = editor->mainTilePosition();
gfx::Rect rc = getBoxBounds();
rc.offset(mainOffset);
sp.offset(mainOffset);
// With black shadow?
if (hasFlag(Flags::DarkOutside)) {
const gfx::Color dark = doc::rgba(0, 0, 0, 128);
// Top band
if (rc.y > vp.y)
render->fillRect(dark, gfx::Rect(vp.x, vp.y, vp.w, rc.y-vp.y));
// Bottom band
if (rc.y2() < vp.y2())
render->fillRect(dark, gfx::Rect(vp.x, rc.y2(), vp.w, vp.y2()-rc.y2()));
// Left band
if (rc.x > vp.x)
render->fillRect(dark, gfx::Rect(vp.x, rc.y, rc.x-vp.x, rc.h));
// Right band
if (rc.x2() < vp.x2())
render->fillRect(dark, gfx::Rect(rc.x2(), rc.y, vp.x2()-rc.x2(), rc.h));
}
if (hasFlag(Flags::Grid)) {
if (boxBounds.w > 0) {
for (int x=boxBounds.x+boxBounds.w*2; x<=sp.x+sp.w; x+=boxBounds.w)
render->drawLine(x, boxBounds.y, x, sp.y+sp.h, gridColor);
if (rc.w > 0) {
for (int x=rc.x+rc.w*2; x<=sp.x+sp.w; x+=rc.w)
render->drawLine(gridColor, x, rc.y, x, sp.y+sp.h);
}
if (boxBounds.h > 0) {
for (int y=boxBounds.y+boxBounds.h*2; y<=sp.y+sp.h; y+=boxBounds.h)
render->drawLine(boxBounds.x, y, sp.x+sp.w, y, gridColor);
if (rc.h > 0) {
for (int y=rc.y+rc.h*2; y<=sp.y+sp.h; y+=rc.h)
render->drawLine(gridColor, rc.x, y, sp.x+sp.w, y);
}
}
else if (hasFlag(Flags::HGrid)) {
if (boxBounds.w > 0) {
for (int x=boxBounds.x+boxBounds.w*2; x<=sp.x+sp.w; x+=boxBounds.w)
render->drawLine(x, boxBounds.y, x, boxBounds.y+boxBounds.h, gridColor);
if (rc.w > 0) {
for (int x=rc.x+rc.w*2; x<=sp.x+sp.w; x+=rc.w)
render->drawLine(gridColor, x, rc.y, x, rc.y+rc.h);
}
}
else if (hasFlag(Flags::VGrid)) {
if (boxBounds.h > 0) {
for (int y=boxBounds.y+boxBounds.h*2; y<=sp.y+sp.h; y+=boxBounds.h)
render->drawLine(boxBounds.x, y, boxBounds.x+boxBounds.w, y, gridColor);
if (rc.h > 0) {
for (int y=rc.y+rc.h*2; y<=sp.y+sp.h; y+=rc.h)
render->drawLine(gridColor, rc.x, y, rc.x+rc.w, y);
}
}
// Draw the rulers enclosing the box
if (hasFlag(Flags::Rulers)) {
for (Rulers::iterator it = m_rulers.begin(), end = m_rulers.end(); it != end; ++it) {
switch (it->orientation()) {
for (const Ruler& ruler : m_rulers) {
switch (ruler.orientation()) {
case Ruler::Horizontal: {
const int y = it->position()+mainOffset.y;
render->drawLine(vp.x, y, vp.x+vp.w-1, y, rulerColor);
const int y = ruler.position()+mainOffset.y;
render->drawLine(rulerColor, vp.x, y, vp.x+vp.w-1, y);
break;
}
case Ruler::Vertical: {
const int x = it->position()+mainOffset.x;
render->drawLine(x, vp.y, x, vp.y+vp.h-1, rulerColor);
const int x = ruler.position()+mainOffset.x;
render->drawLine(rulerColor, x, vp.y, x, vp.y+vp.h-1);
break;
}
}
@ -314,7 +303,7 @@ void SelectBoxState::postRenderDecorator(EditorPostRender* render)
}
if (hasFlag(Flags::QuickBox)) {
render->drawRectXor(boxBounds);
render->drawRectXor(rc);
}
}

3
src/app/ui/editor/select_box_state.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2017 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -84,7 +84,6 @@ namespace app {
virtual tools::Ink* getStateInk() override;
// EditorDecorator overrides
virtual void preRenderDecorator(EditorPreRender* render) override;
virtual void postRenderDecorator(EditorPostRender* render) override;
virtual void getInvalidDecoratoredRegion(Editor* editor, gfx::Region& region) override;

5
src/app/ui/editor/standby_state.cpp
View File

@ -935,11 +935,6 @@ bool StandbyState::Decorator::onSetCursor(tools::Ink* ink, Editor* editor, const
return false;
}
void StandbyState::Decorator::preRenderDecorator(EditorPreRender* render)
{
// Do nothing
}
void StandbyState::Decorator::postRenderDecorator(EditorPostRender* render)
{
Editor* editor = render->getEditor();

1
src/app/ui/editor/standby_state.h
View File

@ -71,7 +71,6 @@ namespace app {
bool onSetCursor(tools::Ink* ink, Editor* editor, const gfx::Point& mouseScreenPos);
// EditorDecorator overrides
void preRenderDecorator(EditorPreRender* render) override;
void postRenderDecorator(EditorPostRender* render) override;
void getInvalidDecoratoredRegion(Editor* editor, gfx::Region& region) override;