diff options
| author | sapier <Sapier at GMX dot net> | 2013-10-22 19:31:49 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2013-11-03 23:00:54 +0100 |
| commit | 68bbdf1b2c1bc70f48d52694411cd7859d09c728 (patch) | |
| tree | 18a755ef663b479bffea72faf75803b4821ff5f8 | |
| parent | 5fbc39a76c7a1e985337ab1f35211de6c710e273 (diff) | |
| download | minetest-68bbdf1b2c1bc70f48d52694411cd7859d09c728.tar.gz minetest-68bbdf1b2c1bc70f48d52694411cd7859d09c728.tar.bz2 minetest-68bbdf1b2c1bc70f48d52694411cd7859d09c728.zip | |
Fix invalid usage of texture->getSize() where actually texture->getOriginalSize() was meant
| -rw-r--r-- | src/guiEngine.cpp | 10 | ||||
| -rw-r--r-- | src/mesh.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index ac19274c3..a96a832c4 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -390,7 +390,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver) } /* Draw background texture */ - v2u32 sourcesize = texture->getSize(); + v2u32 sourcesize = texture->getOriginalSize(); driver->draw2DImage(texture, core::rect<s32>(0, 0, screensize.X, screensize.Y), core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y), @@ -409,7 +409,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver) return; /* Draw background texture */ - v2u32 sourcesize = texture->getSize(); + v2u32 sourcesize = texture->getOriginalSize(); driver->draw2DImage(texture, core::rect<s32>(0, 0, screensize.X, screensize.Y), core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y), @@ -427,7 +427,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) if(!texture) return; - f32 mult = (((f32)screensize.Width / 2)) / + f32 mult = (((f32)screensize.Width / 2.0)) / ((f32)texture->getOriginalSize().Width); v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult, @@ -445,7 +445,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver) driver->draw2DImage(texture, splashrect, core::rect<s32>(core::position2d<s32>(0,0), - core::dimension2di(texture->getSize())), + core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); } } @@ -477,7 +477,7 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver) driver->draw2DImage(texture, rect, core::rect<s32>(core::position2d<s32>(0,0), - core::dimension2di(texture->getSize())), + core::dimension2di(texture->getOriginalSize())), NULL, NULL, true); } } diff --git a/src/mesh.cpp b/src/mesh.cpp index 5e5f9f863..3200d5fa6 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -260,7 +260,7 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture, video::IVideoDriver *driver, v3f scale) { scene::IAnimatedMesh *mesh = NULL; - core::dimension2d<u32> size = texture->getSize(); + core::dimension2d<u32> size = texture->getOriginalSize(); video::ECOLOR_FORMAT format = texture->getColorFormat(); if (format == video::ECF_A8R8G8B8) { |