minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix invalid usage of texture->getSize() where actually texture->getOriginalSize() was meant

This commit is contained in:
sapier 2013-10-22 19:31:49 +02:00
parent 5fbc39a76c
commit 68bbdf1b2c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/guiEngine.cpp
View File

@ -390,7 +390,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver)
} }
/* Draw background texture */ /* Draw background texture */
v2u32 sourcesize = texture->getSize(); v2u32 sourcesize = texture->getOriginalSize();
driver->draw2DImage(texture, driver->draw2DImage(texture,
core::rect<s32>(0, 0, screensize.X, screensize.Y), core::rect<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y), core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
@ -409,7 +409,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver)
return; return;
/* Draw background texture */ /* Draw background texture */
v2u32 sourcesize = texture->getSize(); v2u32 sourcesize = texture->getOriginalSize();
driver->draw2DImage(texture, driver->draw2DImage(texture,
core::rect<s32>(0, 0, screensize.X, screensize.Y), core::rect<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y), core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
@ -427,7 +427,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
if(!texture) if(!texture)
return; return;
f32 mult = (((f32)screensize.Width / 2)) / f32 mult = (((f32)screensize.Width / 2.0)) /
((f32)texture->getOriginalSize().Width); ((f32)texture->getOriginalSize().Width);
v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult, v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult,
@ -445,7 +445,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
driver->draw2DImage(texture, splashrect, driver->draw2DImage(texture, splashrect,
core::rect<s32>(core::position2d<s32>(0,0), core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(texture->getSize())), core::dimension2di(texture->getOriginalSize())),
NULL, NULL, true); NULL, NULL, true);
} }
} }
@ -477,7 +477,7 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver)
driver->draw2DImage(texture, rect, driver->draw2DImage(texture, rect,
core::rect<s32>(core::position2d<s32>(0,0), core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(texture->getSize())), core::dimension2di(texture->getOriginalSize())),
NULL, NULL, true); NULL, NULL, true);
} }
} }

2
src/mesh.cpp
View File

@ -260,7 +260,7 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture,
video::IVideoDriver *driver, v3f scale) video::IVideoDriver *driver, v3f scale)
{ {
scene::IAnimatedMesh *mesh = NULL; scene::IAnimatedMesh *mesh = NULL;
core::dimension2d<u32> size = texture->getSize(); core::dimension2d<u32> size = texture->getOriginalSize();
video::ECOLOR_FORMAT format = texture->getColorFormat(); video::ECOLOR_FORMAT format = texture->getColorFormat();
if (format == video::ECF_A8R8G8B8) if (format == video::ECF_A8R8G8B8)
{ {