moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-17 14:55:13 -05:00
Code Issues Releases Wiki Activity

Fix for sun/moon tonemaps: don't upscale 1px images.

Browse Source
This commit is contained in:
Aaron Suen 2015-03-23 02:23:29 -04:00 committed by Craig Robbins
parent 15d9cd3a6f
commit 6cf7c89236
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/tile.cpp
View File

@ -192,13 +192,18 @@ video::IImage *textureMinSizeUpscale(video::IVideoDriver *driver, video::IImage
if(orig == NULL) if(orig == NULL)
return orig; return orig;
s32 scaleto = g_settings->getS32("texture_min_size"); s32 scaleto = g_settings->getS32("texture_min_size");
if (scaleto > 0) { if (scaleto > 1) {
const core::dimension2d<u32> dim = orig->getDimension();
// Don't upscale 1px images. They don't benefit from it anyway
// (wouldn't have been blurred) and MIGHT be sun/moon tonemaps.
if ((dim.Width <= 1) || (dim.Height <= 1))
return orig;
/* Calculate scaling needed to make the shortest texture dimension /* Calculate scaling needed to make the shortest texture dimension
* equal to the target minimum. If e.g. this is a vertical frames * equal to the target minimum. If e.g. this is a vertical frames
* animation, the short dimension will be the real size. * animation, the short dimension will be the real size.
*/ */
const core::dimension2d<u32> dim = orig->getDimension();
u32 xscale = scaleto / dim.Width; u32 xscale = scaleto / dim.Width;
u32 yscale = scaleto / dim.Height; u32 yscale = scaleto / dim.Height;
u32 scale = (xscale > yscale) ? xscale : yscale; u32 scale = (xscale > yscale) ? xscale : yscale;