]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/hud.cpp
(Re)spawn players within 'mapgen_limit'
[dragonfireclient.git] / src / hud.cpp
index c385211f24ffe60c84dae2debbb6d01084c93f0f..a2f031b4c4a7ca0974f820c674587495c7a05912 100644 (file)
@@ -20,80 +20,127 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "hud.h"
-#include "main.h"
 #include "settings.h"
 #include "util/numeric.h"
 #include "log.h"
-#include "gamedef.h"
-#include "itemdef.h"
+#include "client.h"
 #include "inventory.h"
-#include "tile.h"
+#include "client/tile.h"
 #include "localplayer.h"
 #include "camera.h"
 #include "porting.h"
+#include "fontengine.h"
+#include "guiscalingfilter.h"
+#include "mesh.h"
+#include "wieldmesh.h"
 #include <IGUIStaticText.h>
 
+#ifdef HAVE_TOUCHSCREENGUI
+#include "touchscreengui.h"
+#endif
 
 Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
-               gui::IGUIEnvironment* guienv, gui::IGUIFont *font,
-               u32 text_height, IGameDef *gamedef,
-               LocalPlayer *player, Inventory *inventory) {
+               gui::IGUIEnvironment* guienv, Client *client, LocalPlayer *player,
+               Inventory *inventory)
+{
        this->driver      = driver;
        this->smgr        = smgr;
        this->guienv      = guienv;
-       this->font        = font;
-       this->text_height = text_height;
-       this->gamedef     = gamedef;
+       this->client      = client;
        this->player      = player;
        this->inventory   = inventory;
 
+       m_hud_scaling      = g_settings->getFloat("hud_scaling");
        m_screensize       = v2u32(0, 0);
        m_displaycenter    = v2s32(0, 0);
        m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
+       m_hotbar_imagesize *= m_hud_scaling;
        m_padding = m_hotbar_imagesize / 12;
 
-       const video::SColor hbar_color(255, 255, 255, 255);
-       for (unsigned int i=0; i < 4; i++ ){
-               hbar_colors[i] = hbar_color;
-       }
-       
-       tsrc = gamedef->getTextureSource();
-       
+       for (unsigned int i = 0; i < 4; i++)
+               hbar_colors[i] = video::SColor(255, 255, 255, 255);
+
+       tsrc = client->getTextureSource();
+
        v3f crosshair_color = g_settings->getV3F("crosshair_color");
        u32 cross_r = rangelim(myround(crosshair_color.X), 0, 255);
        u32 cross_g = rangelim(myround(crosshair_color.Y), 0, 255);
        u32 cross_b = rangelim(myround(crosshair_color.Z), 0, 255);
        u32 cross_a = rangelim(g_settings->getS32("crosshair_alpha"), 0, 255);
        crosshair_argb = video::SColor(cross_a, cross_r, cross_g, cross_b);
-       
+
        v3f selectionbox_color = g_settings->getV3F("selectionbox_color");
        u32 sbox_r = rangelim(myround(selectionbox_color.X), 0, 255);
        u32 sbox_g = rangelim(myround(selectionbox_color.Y), 0, 255);
        u32 sbox_b = rangelim(myround(selectionbox_color.Z), 0, 255);
        selectionbox_argb = video::SColor(255, sbox_r, sbox_g, sbox_b);
-       
+
        use_crosshair_image = tsrc->isKnownSourceImage("crosshair.png");
 
        hotbar_image = "";
        use_hotbar_image = false;
        hotbar_selected_image = "";
        use_hotbar_selected_image = false;
+
+       m_selection_mesh = NULL;
+       m_selection_boxes.clear();
+       m_halo_boxes.clear();
+
+       m_selection_pos = v3f(0.0, 0.0, 0.0);
+       std::string mode_setting = g_settings->get("node_highlighting");
+
+       if (mode_setting == "halo") {
+               m_mode = HIGHLIGHT_HALO;
+       } else if (mode_setting == "none") {
+               m_mode = HIGHLIGHT_NONE;
+       } else {
+               m_mode = HIGHLIGHT_BOX;
+       }
+
+       m_selection_material.Lighting = false;
+
+       if (g_settings->getBool("enable_shaders")) {
+               IShaderSource *shdrsrc = client->getShaderSource();
+               u16 shader_id = shdrsrc->getShader(
+                       m_mode == HIGHLIGHT_HALO ? "selection_shader" : "default_shader", 1, 1);
+               m_selection_material.MaterialType = shdrsrc->getShaderInfo(shader_id).material;
+       } else {
+               m_selection_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+       }
+
+       if (m_mode == HIGHLIGHT_BOX) {
+               m_selection_material.Thickness =
+                       rangelim(g_settings->getS16("selectionbox_width"), 1, 5);
+       } else if (m_mode == HIGHLIGHT_HALO) {
+               m_selection_material.setTexture(0, tsrc->getTextureForMesh("halo.png"));
+               m_selection_material.setFlag(video::EMF_BACK_FACE_CULLING, true);
+       } else {
+               m_selection_material.MaterialType = video::EMT_SOLID;
+       }
 }
 
-void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect, bool selected) {
+Hud::~Hud()
+{
+       if (m_selection_mesh)
+               m_selection_mesh->drop();
+}
 
+void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect,
+               bool selected)
+{
        if (selected) {
+                       /* draw hihlighting around selected item */
                        if (use_hotbar_selected_image) {
-                       core::rect<s32> imgrect2 = rect;
-                       imgrect2.UpperLeftCorner.X  -= m_padding;
-                       imgrect2.UpperLeftCorner.Y  -= m_padding;
-                       imgrect2.LowerRightCorner.X += m_padding;
-                       imgrect2.LowerRightCorner.Y += m_padding;
-                               video::ITexture *texture = tsrc->getTexture(hotbar_selected_image);
-                               core::dimension2di imgsize(texture->getOriginalSize());
-                       driver->draw2DImage(texture, imgrect2,
-                                       core::rect<s32>(core::position2d<s32>(0,0), imgsize),
-                                       NULL, hbar_colors, true);
+                               core::rect<s32> imgrect2 = rect;
+                               imgrect2.UpperLeftCorner.X  -= (m_padding*2);
+                               imgrect2.UpperLeftCorner.Y  -= (m_padding*2);
+                               imgrect2.LowerRightCorner.X += (m_padding*2);
+                               imgrect2.LowerRightCorner.Y += (m_padding*2);
+                                       video::ITexture *texture = tsrc->getTexture(hotbar_selected_image);
+                                       core::dimension2di imgsize(texture->getOriginalSize());
+                               draw2DImageFilterScaled(driver, texture, imgrect2,
+                                               core::rect<s32>(core::position2d<s32>(0,0), imgsize),
+                                               NULL, hbar_colors, true);
                        } else {
                                video::SColor c_outside(255,255,0,0);
                                //video::SColor c_outside(255,0,0,0);
@@ -151,24 +198,35 @@ void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect, bool sele
                video::SColor bgcolor2(128, 0, 0, 0);
                if (!use_hotbar_image)
                        driver->draw2DRectangle(bgcolor2, rect, NULL);
-               drawItemStack(driver, font, item, rect, NULL, gamedef);
+               drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL,
+                       client, selected ? IT_ROT_SELECTED : IT_ROT_NONE);
        }
 
 //NOTE: selectitem = 0 -> no selected; selectitem 1-based
-void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
-               InventoryList *mainlist, u16 selectitem, u16 direction)
+void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
+               s32 inv_offset, InventoryList *mainlist, u16 selectitem, u16 direction)
 {
+#ifdef HAVE_TOUCHSCREENGUI
+       if (g_touchscreengui && inv_offset == 0)
+               g_touchscreengui->resetHud();
+#endif
+
        s32 height  = m_hotbar_imagesize + m_padding * 2;
-       s32 width   = (itemcount - offset) * (m_hotbar_imagesize + m_padding * 2);
+       s32 width   = (itemcount - inv_offset) * (m_hotbar_imagesize + m_padding * 2);
 
        if (direction == HUD_DIR_TOP_BOTTOM || direction == HUD_DIR_BOTTOM_TOP) {
-               width  = m_hotbar_imagesize + m_padding * 2;
-               height = (itemcount - offset) * (m_hotbar_imagesize + m_padding * 2);
+               s32 tmp = height;
+               height = width;
+               width = tmp;
        }
 
        // Position of upper left corner of bar
-       v2s32 pos = upperleftpos;
+       v2s32 pos = screen_offset;
+       pos.X *= m_hud_scaling * porting::getDisplayDensity();
+       pos.Y *= m_hud_scaling * porting::getDisplayDensity();
+       pos += upperleftpos;
 
+       // Store hotbar_image in member variable, used by drawItem()
        if (hotbar_image != player->hotbar_image) {
                hotbar_image = player->hotbar_image;
                if (hotbar_image != "")
@@ -177,6 +235,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
                        use_hotbar_image = false;
        }
 
+       // Store hotbar_selected_image in member variable, used by drawItem()
        if (hotbar_selected_image != player->hotbar_selected_image) {
                hotbar_selected_image = player->hotbar_selected_image;
                if (hotbar_selected_image != "")
@@ -185,50 +244,60 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
                        use_hotbar_selected_image = false;
        }
 
+       // draw customized item background
        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;
                video::ITexture *texture = tsrc->getTexture(hotbar_image);
                core::dimension2di imgsize(texture->getOriginalSize());
-               driver->draw2DImage(texture, rect2,
+               draw2DImageFilterScaled(driver, texture, rect2,
                        core::rect<s32>(core::position2d<s32>(0,0), imgsize),
                        NULL, hbar_colors, true);
        }
 
-       for (s32 i = offset; i < itemcount && (size_t)i < mainlist->getSize(); i++)
-       {
-               v2s32 steppos;
+       // Draw items
+       core::rect<s32> imgrect(0, 0, m_hotbar_imagesize, m_hotbar_imagesize);
+       for (s32 i = inv_offset; i < itemcount && (size_t)i < mainlist->getSize(); i++) {
                s32 fullimglen = m_hotbar_imagesize + m_padding * 2;
 
-               core::rect<s32> imgrect(0, 0, m_hotbar_imagesize, m_hotbar_imagesize);
-
+               v2s32 steppos;
                switch (direction) {
-                       case HUD_DIR_RIGHT_LEFT:
-                               steppos = v2s32(-(m_padding + (i - offset) * fullimglen), m_padding);
-                               break;
-                       case HUD_DIR_TOP_BOTTOM:
-                               steppos = v2s32(m_padding, m_padding + (i - offset) * fullimglen);
-                               break;
-                       case HUD_DIR_BOTTOM_TOP:
-                               steppos = v2s32(m_padding, -(m_padding + (i - offset) * fullimglen));
-                               break;
-                       default:
-                               steppos = v2s32(m_padding + (i - offset) * fullimglen, m_padding);
-                               break;
+               case HUD_DIR_RIGHT_LEFT:
+                       steppos = v2s32(-(m_padding + (i - inv_offset) * fullimglen), m_padding);
+                       break;
+               case HUD_DIR_TOP_BOTTOM:
+                       steppos = v2s32(m_padding, m_padding + (i - inv_offset) * fullimglen);
+                       break;
+               case HUD_DIR_BOTTOM_TOP:
+                       steppos = v2s32(m_padding, -(m_padding + (i - inv_offset) * fullimglen));
+                       break;
+               default:
+                       steppos = v2s32(m_padding + (i - inv_offset) * fullimglen, m_padding);
+                       break;
                }
 
-               drawItem(mainlist->getItem(i), (imgrect + pos + steppos), (i +1) == selectitem );
+               drawItem(mainlist->getItem(i), (imgrect + pos + steppos), (i + 1) == selectitem);
+
+#ifdef HAVE_TOUCHSCREENGUI
+               if (g_touchscreengui)
+                       g_touchscreengui->registerHudItem(i, (imgrect + pos + steppos));
+#endif
        }
 }
 
 
-void Hud::drawLuaElements(v3s16 camera_offset) {
-       for (size_t i = 0; i != player->hud.size(); i++) {
-               HudElement *e = player->hud[i];
+void Hud::drawLuaElements(const v3s16 &camera_offset)
+{
+       u32 text_height = g_fontengine->getTextHeight();
+       irr::gui::IGUIFont* font = g_fontengine->getFont();
+       for (size_t i = 0; i != player->maxHudId(); i++) {
+               HudElement *e = player->getHud(i);
                if (!e)
                        continue;
-               
-               v2s32 pos(e->pos.X * m_screensize.X, e->pos.Y * m_screensize.Y);
+
+               v2s32 pos(floor(e->pos.X * (float) m_screensize.X + 0.5),
+                               floor(e->pos.Y * (float) m_screensize.Y + 0.5));
                switch (e->type) {
                        case HUD_ELEM_IMAGE: {
                                video::ITexture *texture = tsrc->getTexture(e->text);
@@ -248,7 +317,7 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
                                             (e->align.Y - 1.0) * dstsize.Y / 2);
                                core::rect<s32> rect(0, 0, dstsize.X, dstsize.Y);
                                rect += pos + offset + v2s32(e->offset.X, e->offset.Y);
-                               driver->draw2DImage(texture, rect,
+                               draw2DImageFilterScaled(driver, texture, rect,
                                        core::rect<s32>(core::position2d<s32>(0,0), imgsize),
                                        NULL, colors, true);
                                break; }
@@ -257,7 +326,7 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
                                                                                 (e->number >> 8)  & 0xFF,
                                                                                 (e->number >> 0)  & 0xFF);
                                core::rect<s32> size(0, 0, e->scale.X, text_height * e->scale.Y);
-                               std::wstring text = narrow_to_wide(e->text);
+                               std::wstring text = unescape_enriched(utf8_to_wide(e->text));
                                core::dimension2d<u32> textsize = font->getDimension(text.c_str());
                                v2s32 offset((e->align.X - 1.0) * (textsize.Width / 2),
                                             (e->align.Y - 1.0) * (textsize.Height / 2));
@@ -266,11 +335,12 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
                                break; }
                        case HUD_ELEM_STATBAR: {
                                v2s32 offs(e->offset.X, e->offset.Y);
-                               drawStatbar(pos, HUD_CORNER_UPPER, e->dir, e->text, e->number, offs);
+                               drawStatbar(pos, HUD_CORNER_UPPER, e->dir, e->text, e->number, offs, e->size);
                                break; }
                        case HUD_ELEM_INVENTORY: {
                                InventoryList *inv = inventory->getList(e->text);
-                               drawItems(pos, e->number, 0, inv, e->item, e->dir);
+                               drawItems(pos, v2s32(e->offset.X, e->offset.Y), e->number, 0,
+                                       inv, e->item, e->dir);
                                break; }
                        case HUD_ELEM_WAYPOINT: {
                                v3f p_pos = player->getPosition() / BS;
@@ -292,11 +362,11 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
                                                                                 (e->number >> 8)  & 0xFF,
                                                                                 (e->number >> 0)  & 0xFF);
                                core::rect<s32> size(0, 0, 200, 2 * text_height);
-                               std::wstring text = narrow_to_wide(e->name);
+                               std::wstring text = unescape_enriched(utf8_to_wide(e->name));
                                font->draw(text.c_str(), size + pos, color);
                                std::ostringstream os;
-                               os<<distance<<e->text;
-                               text = narrow_to_wide(os.str());
+                               os << distance << e->text;
+                               text = unescape_enriched(utf8_to_wide(os.str()));
                                pos.Y += text_height;
                                font->draw(text.c_str(), size + pos, color);
                                break; }
@@ -308,19 +378,31 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
 }
 
 
-void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s32 count, v2s32 offset) {
+void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture,
+               s32 count, v2s32 offset, v2s32 size)
+{
        const video::SColor color(255, 255, 255, 255);
        const video::SColor colors[] = {color, color, color, color};
-       
+
        video::ITexture *stat_texture = tsrc->getTexture(texture);
        if (!stat_texture)
                return;
-               
+
        core::dimension2di srcd(stat_texture->getOriginalSize());
+       core::dimension2di dstd;
+       if (size == v2s32()) {
+               dstd = srcd;
+       } else {
+               float size_factor = m_hud_scaling * porting::getDisplayDensity();
+               dstd.Height = size.Y * size_factor;
+               dstd.Width  = size.X * size_factor;
+               offset.X *= size_factor;
+               offset.Y *= size_factor;
+       }
 
        v2s32 p = pos;
        if (corner & HUD_CORNER_LOWER)
-               p -= srcd.Height;
+               p -= dstd.Height;
 
        p += offset;
 
@@ -338,31 +420,31 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s
                default:
                        steppos = v2s32(1, 0);
        }
-       steppos.X *= srcd.Width;
-       steppos.Y *= srcd.Height;
-       
+       steppos.X *= dstd.Width;
+       steppos.Y *= dstd.Height;
+
        for (s32 i = 0; i < count / 2; i++)
        {
                core::rect<s32> srcrect(0, 0, srcd.Width, srcd.Height);
-               core::rect<s32> dstrect(srcrect);
+               core::rect<s32> dstrect(0,0, dstd.Width, dstd.Height);
 
                dstrect += p;
-               driver->draw2DImage(stat_texture, dstrect, srcrect, NULL, colors, true);
+               draw2DImageFilterScaled(driver, stat_texture, dstrect, srcrect, NULL, colors, true);
                p += steppos;
        }
-       
+
        if (count % 2 == 1)
        {
                core::rect<s32> srcrect(0, 0, srcd.Width / 2, srcd.Height);
-               core::rect<s32> dstrect(srcrect);
+               core::rect<s32> dstrect(0,0, dstd.Width / 2, dstd.Height);
 
                dstrect += p;
-               driver->draw2DImage(stat_texture, dstrect, srcrect, NULL, colors, true);
+               draw2DImageFilterScaled(driver, stat_texture, dstrect, srcrect, NULL, colors, true);
        }
 }
 
 
-void Hud::drawHotbar(s32 halfheartcount, u16 playeritem, s32 breath) {
+void Hud::drawHotbar(u16 playeritem) {
 
        v2s32 centerlowerpos(m_displaycenter.X, m_screensize.Y);
 
@@ -371,7 +453,7 @@ void Hud::drawHotbar(s32 halfheartcount, u16 playeritem, s32 breath) {
                //silently ignore this we may not be initialized completely
                return;
        }
-       
+
        s32 hotbar_itemcount = player->hud_hotbar_itemcount;
        s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2);
        v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 3);
@@ -379,36 +461,45 @@ void Hud::drawHotbar(s32 halfheartcount, u16 playeritem, s32 breath) {
        if ( (float) width / (float) porting::getWindowSize().X <=
                        g_settings->getFloat("hud_hotbar_max_width")) {
                if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE) {
-                       drawItems(pos, hotbar_itemcount, 0, mainlist, playeritem + 1, 0);
+                       drawItems(pos, v2s32(0, 0), hotbar_itemcount, 0, mainlist, playeritem + 1, 0);
                }
-       }
-       else {
+       } else {
                pos.X += width/4;
 
                v2s32 secondpos = pos;
                pos = pos - v2s32(0, m_hotbar_imagesize + m_padding);
 
                if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE) {
-                       drawItems(pos, hotbar_itemcount/2, 0, mainlist, playeritem + 1, 0);
-                       drawItems(secondpos, hotbar_itemcount, hotbar_itemcount/2, mainlist, playeritem + 1, 0);
+                       drawItems(pos, v2s32(0, 0), hotbar_itemcount / 2, 0,
+                               mainlist, playeritem + 1, 0);
+                       drawItems(secondpos, v2s32(0, 0), hotbar_itemcount,
+                               hotbar_itemcount / 2, mainlist, playeritem + 1, 0);
                }
        }
 
-       if (player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE)
-               drawStatbar(pos - v2s32(0, 4), HUD_CORNER_LOWER, HUD_DIR_LEFT_RIGHT,
-                               "heart.png", halfheartcount, v2s32(0, 0));
-       if (player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE && breath <= 10)
-               drawStatbar(pos - v2s32(-180, 4), HUD_CORNER_LOWER, HUD_DIR_LEFT_RIGHT,
-                               "bubble.png", breath*2, v2s32(0, 0));
+       //////////////////////////// compatibility code to be removed //////////////
+       // this is ugly as hell but there's no other way to keep compatibility to
+       // old servers
+       if ((player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE)) {
+               drawStatbar(v2s32(floor(0.5 * (float)m_screensize.X + 0.5),
+                       floor(1 * (float) m_screensize.Y + 0.5)),
+                       HUD_CORNER_UPPER, 0, "heart.png",
+                       player->hp, v2s32((-10*24)-25,-(48+24+10)), v2s32(24,24));
+       }
+
+       if ((player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE) &&
+                       (player->getBreath() < 11)) {
+               drawStatbar(v2s32(floor(0.5 * (float)m_screensize.X + 0.5),
+                       floor(1 * (float) m_screensize.Y + 0.5)),
+                       HUD_CORNER_UPPER, 0, "bubble.png",
+                       player->getBreath(), v2s32(25,-(48+24+10)), v2s32(24,24));
+       }
+       ////////////////////////////////////////////////////////////////////////////
 }
 
 
-void Hud::drawCrosshair() {
-       if (!(player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) ||
-                       (player->camera_mode == CAMERA_MODE_THIRD_FRONT)) {
-               return;
-       }
-               
+void Hud::drawCrosshair()
+{
        if (use_crosshair_image) {
                video::ITexture *crosshair = tsrc->getTexture("crosshair.png");
                v2u32 size  = crosshair->getOriginalSize();
@@ -425,47 +516,202 @@ void Hud::drawCrosshair() {
        }
 }
 
+void Hud::setSelectionPos(const v3f &pos, const v3s16 &camera_offset)
+{
+       m_camera_offset = camera_offset;
+       m_selection_pos = pos;
+       m_selection_pos_with_offset = pos - intToFloat(camera_offset, BS);
+}
 
-void Hud::drawSelectionBoxes(std::vector<aabb3f> &hilightboxes) {
-       for (std::vector<aabb3f>::const_iterator
-                       i = hilightboxes.begin();
-                       i != hilightboxes.end(); i++) {
-               driver->draw3DBox(*i, selectionbox_argb);
+void Hud::drawSelectionMesh()
+{
+       if (m_mode == HIGHLIGHT_BOX) {
+               // Draw 3D selection boxes
+               video::SMaterial oldmaterial = driver->getMaterial2D();
+               driver->setMaterial(m_selection_material);
+               for (std::vector<aabb3f>::const_iterator
+                               i = m_selection_boxes.begin();
+                               i != m_selection_boxes.end(); ++i) {
+                       aabb3f box = aabb3f(
+                               i->MinEdge + m_selection_pos_with_offset,
+                               i->MaxEdge + m_selection_pos_with_offset);
+
+                       u32 r = (selectionbox_argb.getRed() *
+                                       m_selection_mesh_color.getRed() / 255);
+                       u32 g = (selectionbox_argb.getGreen() *
+                                       m_selection_mesh_color.getGreen() / 255);
+                       u32 b = (selectionbox_argb.getBlue() *
+                                       m_selection_mesh_color.getBlue() / 255);
+                       driver->draw3DBox(box, video::SColor(255, r, g, b));
+               }
+               driver->setMaterial(oldmaterial);
+       } else if (m_mode == HIGHLIGHT_HALO && m_selection_mesh) {
+               // Draw selection mesh
+               video::SMaterial oldmaterial = driver->getMaterial2D();
+               driver->setMaterial(m_selection_material);
+               setMeshColor(m_selection_mesh, m_selection_mesh_color);
+               video::SColor face_color(0,
+                       MYMIN(255, m_selection_mesh_color.getRed() * 1.5),
+                       MYMIN(255, m_selection_mesh_color.getGreen() * 1.5),
+                       MYMIN(255, m_selection_mesh_color.getBlue() * 1.5));
+               setMeshColorByNormal(m_selection_mesh, m_selected_face_normal,
+                       face_color);
+               scene::IMesh* mesh = cloneMesh(m_selection_mesh);
+               translateMesh(mesh, m_selection_pos_with_offset);
+               u32 mc = m_selection_mesh->getMeshBufferCount();
+               for (u32 i = 0; i < mc; i++) {
+                       scene::IMeshBuffer *buf = mesh->getMeshBuffer(i);
+                       driver->drawMeshBuffer(buf);
+               }
+               mesh->drop();
+               driver->setMaterial(oldmaterial);
        }
 }
 
+void Hud::updateSelectionMesh(const v3s16 &camera_offset)
+{
+       m_camera_offset = camera_offset;
+       if (m_mode != HIGHLIGHT_HALO)
+               return;
+
+       if (m_selection_mesh) {
+               m_selection_mesh->drop();
+               m_selection_mesh = NULL;
+       }
+
+       if (!m_selection_boxes.size()) {
+               // No pointed object
+               return;
+       }
+
+       // New pointed object, create new mesh.
+
+       // Texture UV coordinates for selection boxes
+       static f32 texture_uv[24] = {
+               0,0,1,1,
+               0,0,1,1,
+               0,0,1,1,
+               0,0,1,1,
+               0,0,1,1,
+               0,0,1,1
+       };
+
+       // Use single halo box instead of multiple overlapping boxes.
+       // Temporary solution - problem can be solved with multiple
+       // rendering targets, or some method to remove inner surfaces.
+       // Thats because of halo transparency.
+
+       aabb3f halo_box(100.0, 100.0, 100.0, -100.0, -100.0, -100.0);
+       m_halo_boxes.clear();
+
+       for (std::vector<aabb3f>::iterator
+                       i = m_selection_boxes.begin();
+                       i != m_selection_boxes.end(); ++i) {
+               halo_box.addInternalBox(*i);
+       }
+
+       m_halo_boxes.push_back(halo_box);
+       m_selection_mesh = convertNodeboxesToMesh(
+               m_halo_boxes, texture_uv, 0.5);
+}
 
 void Hud::resizeHotbar() {
        if (m_screensize != porting::getWindowSize()) {
                m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
+               m_hotbar_imagesize *= m_hud_scaling;
                m_padding = m_hotbar_imagesize / 12;
                m_screensize = porting::getWindowSize();
                m_displaycenter = v2s32(m_screensize.X/2,m_screensize.Y/2);
        }
 }
 
+struct MeshTimeInfo {
+       u64 time;
+       scene::IMesh *mesh;
+};
+
 void drawItemStack(video::IVideoDriver *driver,
                gui::IGUIFont *font,
                const ItemStack &item,
                const core::rect<s32> &rect,
                const core::rect<s32> *clip,
-               IGameDef *gamedef)
+               Client *client,
+               ItemRotationKind rotation_kind)
 {
-       if(item.empty())
+       static MeshTimeInfo rotation_time_infos[IT_ROT_NONE];
+       static bool enable_animations =
+               g_settings->getBool("inventory_items_animations");
+
+       if (item.empty()) {
+               if (rotation_kind < IT_ROT_NONE) {
+                       rotation_time_infos[rotation_kind].mesh = NULL;
+               }
                return;
-       
-       const ItemDefinition &def = item.getDefinition(gamedef->idef());
-       video::ITexture *texture = gamedef->idef()->getInventoryTexture(def.name, gamedef);
+       }
 
-       // Draw the inventory texture
-       if(texture != NULL)
-       {
-               const video::SColor color(255,255,255,255);
-               const video::SColor colors[] = {color,color,color,color};
-               driver->draw2DImage(texture, rect,
-                       core::rect<s32>(core::position2d<s32>(0,0),
-                       core::dimension2di(texture->getOriginalSize())),
-                       clip, colors, true);
+       const ItemDefinition &def = item.getDefinition(client->idef());
+       ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client);
+
+       if (imesh && imesh->mesh) {
+               scene::IMesh *mesh = imesh->mesh;
+               driver->clearZBuffer();
+               s32 delta = 0;
+               if (rotation_kind < IT_ROT_NONE) {
+                       MeshTimeInfo &ti = rotation_time_infos[rotation_kind];
+                       if (mesh != ti.mesh) {
+                               ti.mesh = mesh;
+                               ti.time = porting::getTimeMs();
+                       } else {
+                               delta = porting::getDeltaMs(ti.time, porting::getTimeMs()) % 100000;
+                       }
+               }
+               core::rect<s32> oldViewPort = driver->getViewPort();
+               core::matrix4 oldProjMat = driver->getTransform(video::ETS_PROJECTION);
+               core::matrix4 oldViewMat = driver->getTransform(video::ETS_VIEW);
+               core::matrix4 ProjMatrix;
+               ProjMatrix.buildProjectionMatrixOrthoLH(2, 2, -1, 100);
+               driver->setTransform(video::ETS_PROJECTION, ProjMatrix);
+               driver->setTransform(video::ETS_VIEW, ProjMatrix);
+               core::matrix4 matrix;
+               matrix.makeIdentity();
+
+               if (enable_animations) {
+                       float timer_f = (float) delta / 5000.0;
+                       matrix.setRotationDegrees(core::vector3df(0, 360 * timer_f, 0));
+               }
+
+               driver->setTransform(video::ETS_WORLD, matrix);
+               driver->setViewPort(rect);
+
+               video::SColor basecolor =
+                       client->idef()->getItemstackColor(item, client);
+
+               u32 mc = mesh->getMeshBufferCount();
+               for (u32 j = 0; j < mc; ++j) {
+                       scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
+                       // we can modify vertices relatively fast,
+                       // because these meshes are not buffered.
+                       assert(buf->getHardwareMappingHint_Vertex() == scene::EHM_NEVER);
+                       video::SColor c = basecolor;
+                       if (imesh->buffer_colors.size() > j) {
+                               ItemPartColor *p = &imesh->buffer_colors[j];
+                               if (p->override_base)
+                                       c = p->color;
+                       }
+                       if (imesh->needs_shading)
+                               colorizeMeshBuffer(buf, &c);
+                       else
+                               setMeshBufferColor(buf, c);
+                       video::SMaterial &material = buf->getMaterial();
+                       material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       material.Lighting = false;
+                       driver->setMaterial(material);
+                       driver->drawMeshBuffer(buf);
+               }
+
+               driver->setTransform(video::ETS_VIEW, oldViewMat);
+               driver->setTransform(video::ETS_PROJECTION, oldProjMat);
+               driver->setViewPort(oldViewPort);
        }
 
        if(def.type == ITEM_TOOL && item.wear != 0)
@@ -512,7 +758,7 @@ void drawItemStack(video::IVideoDriver *driver,
        {
                // Get the item count as a string
                std::string text = itos(item.count);
-               v2u32 dim = font->getDimension(narrow_to_wide(text).c_str());
+               v2u32 dim = font->getDimension(utf8_to_wide(text).c_str());
                v2s32 sdim(dim.X,dim.Y);
 
                core::rect<s32> rect2(