0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify canvas.cpp: the renderer only needs to exist during draw()

Browse source 
The renderer only needs to exist during draw(). The old implementation kept the
old renderer until the next call to draw(), but would then usually destroy the
old one and create a new one.
This commit is contained in:
Steve Cotton 2021-04-08 13:50:37 +02:00
parent 0aded2dcf8
commit 9f8a19e6a7
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/core/canvas.cpp
View file

@ -803,7 +803,6 @@ canvas::canvas()
, w_(0)
, h_(0)
, canvas_()
, renderer_(nullptr)
, variables_()
, functions_()
, is_dirty_(true)
@ -817,19 +816,12 @@ canvas::canvas(canvas&& c) noexcept
, w_(c.w_)
, h_(c.h_)
, canvas_(std::move(c.canvas_))
, renderer_(std::exchange(c.renderer_, nullptr))
, variables_(c.variables_)
, functions_(c.functions_)
, is_dirty_(c.is_dirty_)
{
}
canvas::~canvas()
{
if(renderer_)
SDL_DestroyRenderer(renderer_);
}
void canvas::draw(const bool force)
{
log_scope2(log_gui_draw, "Canvas: drawing.");
@ -844,33 +836,31 @@ void canvas::draw(const bool force)
variables_.add("height", wfl::variant(h_));
}
auto renderer = std::unique_ptr<SDL_Renderer, decltype(&SDL_DestroyRenderer)> {nullptr, &SDL_DestroyRenderer};
if(canvas_) {
DBG_GUI_D << "Canvas: use cached canvas.\n";
renderer.reset(SDL_CreateSoftwareRenderer(canvas_));
SDL_SetRenderDrawColor(renderer.get(), 0, 0, 0, 0);
SDL_RenderClear(renderer.get());
} else {
// create surface
DBG_GUI_D << "Canvas: create new empty canvas.\n";
canvas_ = surface(w_, h_);
renderer.reset(SDL_CreateSoftwareRenderer(canvas_));
}
if(renderer_) {
SDL_DestroyRenderer(renderer_);
}
renderer_ = SDL_CreateSoftwareRenderer(canvas_);
SDL_SetRenderDrawBlendMode(renderer_, SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawBlendMode(renderer.get(), SDL_BLENDMODE_BLEND);
// draw items
for(auto& shape : shapes_) {
lg::scope_logger inner_scope_logging_object__(log_gui_draw, "Canvas: draw shape.");
shape->draw(canvas_, renderer_, variables_);
shape->draw(canvas_, renderer.get(), variables_);
}
// The shapes have been drawn and the draw result has been cached. Clear the list.
std::copy(shapes_.begin(), shapes_.end(), std::back_inserter(drawn_shapes_));
shapes_.clear();
SDL_RenderPresent(renderer_);
SDL_RenderPresent(renderer.get());
is_dirty_ = false;
}

4
src/gui/core/canvas.hpp
View file

@ -91,8 +91,6 @@ public:
canvas(const canvas&) = delete;
canvas(canvas&& c) noexcept;
~canvas();
/**
* Draws the canvas.
*
@ -205,8 +203,6 @@ private:
/** The surface we draw all items on. */
surface canvas_;
SDL_Renderer* renderer_;
/** The variables of the canvas. */
wfl::map_formula_callable variables_;