BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix incorrect scaling of customized hud item selection marker

Browse Source
This commit is contained in:
sapier 2014-05-11 13:26:23 +02:00
parent 90f0859128
commit b16cbba21a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hud.cpp
View File

@ -83,17 +83,18 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect, bool selected) { void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect, bool selected) {
if (selected) { if (selected) {
/* draw hihlighting around selected item */
if (use_hotbar_selected_image) { if (use_hotbar_selected_image) {
core::rect<s32> imgrect2 = rect; core::rect<s32> imgrect2 = rect;
imgrect2.UpperLeftCorner.X -= m_padding; imgrect2.UpperLeftCorner.X -= (m_padding*2);
imgrect2.UpperLeftCorner.Y -= m_padding; imgrect2.UpperLeftCorner.Y -= (m_padding*2);
imgrect2.LowerRightCorner.X += m_padding; imgrect2.LowerRightCorner.X += (m_padding*2);
imgrect2.LowerRightCorner.Y += m_padding; imgrect2.LowerRightCorner.Y += (m_padding*2);
video::ITexture *texture = tsrc->getTexture(hotbar_selected_image); video::ITexture *texture = tsrc->getTexture(hotbar_selected_image);
core::dimension2di imgsize(texture->getOriginalSize()); core::dimension2di imgsize(texture->getOriginalSize());
driver->draw2DImage(texture, imgrect2, driver->draw2DImage(texture, imgrect2,
core::rect<s32>(core::position2d<s32>(0,0), imgsize), core::rect<s32>(core::position2d<s32>(0,0), imgsize),
NULL, hbar_colors, true); NULL, hbar_colors, true);
} else { } else {
video::SColor c_outside(255,255,0,0); video::SColor c_outside(255,255,0,0);
//video::SColor c_outside(255,0,0,0); //video::SColor c_outside(255,0,0,0);
@ -185,8 +186,10 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
use_hotbar_selected_image = false; use_hotbar_selected_image = false;
} }
/* draw customized item background */
if (use_hotbar_image) { if (use_hotbar_image) {
core::rect<s32> imgrect2(-m_padding/2, -m_padding/2, width+m_padding/2, height+m_padding/2); core::rect<s32> imgrect2(-m_padding/2, -m_padding/2,
width+m_padding/2, height+m_padding/2);
core::rect<s32> rect2 = imgrect2 + pos; core::rect<s32> rect2 = imgrect2 + pos;
video::ITexture *texture = tsrc->getTexture(hotbar_image); video::ITexture *texture = tsrc->getTexture(hotbar_image);
core::dimension2di imgsize(texture->getOriginalSize()); core::dimension2di imgsize(texture->getOriginalSize());