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

Fix linear image scaling again

Browse source
This commit is contained in:
Tommy 2022-06-19 23:02:17 +12:00
parent 253436b9a8
commit fe7081d580
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/picture.cpp
View file

@ -1074,18 +1074,6 @@ save_result save_image(const surface& surf, const std::string& filename)
* scale quality set before creation. All other handling is done by
* get_surface.
*/
namespace
{
/** Sets the texture scale quality hint. Must be called *before* creating textures! */
void set_scale_quality_pre_texture_creation(scale_quality quality)
{
static const std::string n_scale_str = "nearest";
static const std::string l_scale_str = "linear";
set_texture_scale_quality(quality == scale_quality::nearest ? n_scale_str : l_scale_str);
}
} // namespace
texture get_texture(const image::locator& i_locator, TYPE type)
{
@ -1143,10 +1131,10 @@ texture get_texture(const image::locator& i_locator, scale_quality quality, TYPE
// handling with surfaces in order to generate the desired effect. This shouldn't be the case
// once we get OGL and shader support.
//
set_scale_quality_pre_texture_creation(quality);
// Get it from the surface cache.
res = texture(get_surface(i_locator, type));
// Get it from the surface cache, also setting the desired scale quality.
const bool linear_scaling = quality == scale_quality::linear ? true : false;
res = texture(get_surface(i_locator, type), linear_scaling);
// Cache the texture.
i_locator.add_to_cache(*cache, res);