From: SmallJoker <mk939@ymail.com>
Date: Thu, 21 Apr 2016 19:54:30 +0000 (+0200)
Subject: tile.cpp: Automatically upscale lower resolution texture
X-Git-Tag: 0.4.14~82
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31c1fca6fd5e200c4f4b24d7ba62b36a16494ed2;p=oweals%2Fminetest.git

tile.cpp: Automatically upscale lower resolution texture
---

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index fdc736906..47624496b 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -243,6 +243,7 @@ Example:
     default_dirt.png^default_grass_side.png
 
 `default_grass_side.png` is overlayed over `default_dirt.png`.
+The texture with the lower resolution will be automatically upscaled to the higher resolution texture.
 
 ### Texture grouping
 Textures can be grouped together by enclosing them in `(` and `)`.
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index e6668063c..72d626da7 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1175,7 +1175,28 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 					core::rect<s32>(pos_from, dim),
 					video::SColor(255,255,255,255),
 					NULL);*/
-			blit_with_alpha(image, baseimg, pos_from, pos_to, dim);
+
+			core::dimension2d<u32> dim_dst = baseimg->getDimension();
+			if (dim == dim_dst) {
+				blit_with_alpha(image, baseimg, pos_from, pos_to, dim);
+			} else if (dim.Width * dim.Height < dim_dst.Width * dim_dst.Height) {
+				// Upscale overlying image
+				video::IImage* scaled_image = m_device->getVideoDriver()->
+					createImage(video::ECF_A8R8G8B8, dim_dst);
+				image->copyToScaling(scaled_image);
+
+				blit_with_alpha(scaled_image, baseimg, pos_from, pos_to, dim_dst);
+				scaled_image->drop();
+			} else {
+				// Upscale base image
+				video::IImage* scaled_base = m_device->getVideoDriver()->
+					createImage(video::ECF_A8R8G8B8, dim);
+				baseimg->copyToScaling(scaled_base);
+				baseimg->drop();
+				baseimg = scaled_base;
+
+				blit_with_alpha(image, baseimg, pos_from, pos_to, dim);
+			}
 		}
 		//cleanup
 		image->drop();