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

GUI2/Canvas: merge draw() and render() and remove commented-out blur code

Browse source
This commit is contained in:
Charles Dang 2018-05-22 22:40:10 +11:00
parent 6e4327f313
commit b011faa244
2 changed files with 10 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1380,8 +1380,15 @@ canvas::~canvas()
{
}
void canvas::draw()
void canvas::render()
{
/**
* @note Both the clip rect and viewport should be set before this function is called.
* The clip rect ensures the canvas texture is cropped appropriately, and the viewport sets the
* origin for all the drawing operations, as well as specifying the area of the screen to which
* this canvas applies.
*/
log_scope2(log_gui_draw, "Canvas: drawing.");
if(size_changed_) {
@ -1393,6 +1400,7 @@ void canvas::draw()
}
// Draw shapes.
// TODO: reenable blur handling. Need a shader.
for(auto& shape : shapes_) {
lg::scope_logger inner_scope_logging_object__(log_gui_draw, "Canvas: draw shape.");
@ -1400,39 +1408,6 @@ void canvas::draw()
}
}
void canvas::render()
{
/**
* @note Both the clip rect and viewport should be set before this function is called.
* The clip rect ensures the canvas texture is cropped appropriately, and the viewport sets the
* origin for all the drawing operations, as well as specifying the area of the screen to which
* this canvas applies.
*/
// Update the canvas texture, if necessary.
draw();
// TODO: reenable. Need a shader.
#if 0
if(blur_depth_) {
/*
* If the surf is the video surface the blurring seems to stack, this
* can be seen in the title screen. So also use the not 32 bpp method
* for this situation.
*/
if(surf != CVideo::get_singleton().getSurface() && is_neutral(surf)) {
blur_surface(surf, rect, blur_depth_);
} else {
// Can't directly blur the surface if not 32 bpp.
SDL_Rect r = rect;
surface s = get_surface_portion(surf, r);
s = blur_surface(s, blur_depth_);
sdl_blit(s, nullptr, surf, &r);
}
}
#endif
}
void canvas::parse_cfg(const config& cfg)
{
log_scope2(log_gui_parse, "Canvas: parsing config.");

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

@ -94,15 +94,7 @@ public:
~canvas();
/**
* Draws the canvas.
*/
void draw();
/**
* Copies the canvas texture to the screen renderer.
*
* This will re-render the canvas texture if necessary (ie, if marked dirty).
* It also executes the pre-commit functions such as blurring (@todo: reenable).
* Renders the canvas contents to screen.
*/
void render();