]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/hud.cpp
core.get_objects_inside_radius: Omit removed objects (#6318)
[dragonfireclient.git] / src / hud.cpp
index 862365652a39ec81c32e64e28d97ad935ec8f16c..7135bc42affb4919ff5e309053643a72fc59020d 100644 (file)
@@ -23,9 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "util/numeric.h"
 #include "log.h"
-#include "gamedef.h"
-#include "itemdef.h"
+#include "client.h"
 #include "inventory.h"
+#include "shader.h"
 #include "client/tile.h"
 #include "localplayer.h"
 #include "camera.h"
@@ -33,34 +33,32 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "fontengine.h"
 #include "guiscalingfilter.h"
 #include "mesh.h"
-#include <IGUIStaticText.h>
+#include "wieldmesh.h"
+#include "client/renderingengine.h"
 
 #ifdef HAVE_TOUCHSCREENGUI
 #include "touchscreengui.h"
 #endif
 
-Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
-               gui::IGUIEnvironment* guienv, IGameDef *gamedef, LocalPlayer *player,
-               Inventory *inventory) {
-       this->driver      = driver;
-       this->smgr        = smgr;
+Hud::Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,
+               Inventory *inventory)
+{
+       driver            = RenderingEngine::get_video_driver();
        this->guienv      = guienv;
-       this->gamedef     = gamedef;
+       this->client      = client;
        this->player      = player;
        this->inventory   = inventory;
 
-       m_screensize       = v2u32(0, 0);
-       m_displaycenter    = v2s32(0, 0);
-       m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
-       m_hotbar_imagesize *= g_settings->getFloat("hud_scaling");
+       m_hud_scaling      = g_settings->getFloat("hud_scaling");
+       m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE *
+               RenderingEngine::getDisplayDensity() + 0.5f);
+       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;
-       }
+       for (auto &hbar_color : hbar_colors)
+               hbar_color = video::SColor(255, 255, 255, 255);
 
-       tsrc = gamedef->getTextureSource();
+       tsrc = client->getTextureSource();
 
        v3f crosshair_color = g_settings->getV3F("crosshair_color");
        u32 cross_r = rangelim(myround(crosshair_color.X), 0, 255);
@@ -77,34 +75,34 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
 
        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 = g_settings->get("node_highlighting");
+       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 = gamedef->getShaderSource();
+               IShaderSource *shdrsrc = client->getShaderSource();
                u16 shader_id = shdrsrc->getShader(
-                       mode == "halo" ? "selection_shader" : "default_shader", 1, 1);
+                       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 (mode == "box") {
-               m_use_selection_mesh = false;
+       if (m_mode == HIGHLIGHT_BOX) {
                m_selection_material.Thickness =
                        rangelim(g_settings->getS16("selectionbox_width"), 1, 5);
-       } else if (mode == "halo") {
-               m_use_selection_mesh = true;
+       } 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 {
@@ -122,82 +120,82 @@ 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*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);
-                               //video::SColor c_inside(255,192,192,192);
-                               s32 x1 = rect.UpperLeftCorner.X;
-                               s32 y1 = rect.UpperLeftCorner.Y;
-                               s32 x2 = rect.LowerRightCorner.X;
-                               s32 y2 = rect.LowerRightCorner.Y;
-                               // Black base borders
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                       v2s32(x1 - m_padding, y1 - m_padding),
-                                       v2s32(x2 + m_padding, y1)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                       v2s32(x1 - m_padding, y2),
-                                       v2s32(x2 + m_padding, y2 + m_padding)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                       v2s32(x1 - m_padding, y1),
-                                               v2s32(x1, y2)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                               v2s32(x2, y1),
-                                       v2s32(x2 + m_padding, y2)
-                                       ), NULL);
-                               /*// Light inside borders
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x1 - padding/2, y1 - padding/2),
-                                               v2s32(x2 + padding/2, y1)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x1 - padding/2, y2),
-                                               v2s32(x2 + padding/2, y2 + padding/2)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x1 - padding/2, y1),
-                                               v2s32(x1, y2)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x2, y1),
-                                               v2s32(x2 + padding/2, y2)
-                                       ), NULL);
-                               */
-                       }
+               /* draw hihlighting around selected item */
+               if (use_hotbar_selected_image) {
+                       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);
+                       //video::SColor c_inside(255,192,192,192);
+                       s32 x1 = rect.UpperLeftCorner.X;
+                       s32 y1 = rect.UpperLeftCorner.Y;
+                       s32 x2 = rect.LowerRightCorner.X;
+                       s32 y2 = rect.LowerRightCorner.Y;
+                       // Black base borders
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                               v2s32(x1 - m_padding, y1 - m_padding),
+                               v2s32(x2 + m_padding, y1)
+                               ), NULL);
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                               v2s32(x1 - m_padding, y2),
+                               v2s32(x2 + m_padding, y2 + m_padding)
+                               ), NULL);
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                               v2s32(x1 - m_padding, y1),
+                                       v2s32(x1, y2)
+                               ), NULL);
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                                       v2s32(x2, y1),
+                               v2s32(x2 + m_padding, y2)
+                               ), NULL);
+                       /*// Light inside borders
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x1 - padding/2, y1 - padding/2),
+                                       v2s32(x2 + padding/2, y1)
+                               ), NULL);
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x1 - padding/2, y2),
+                                       v2s32(x2 + padding/2, y2 + padding/2)
+                               ), NULL);
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x1 - padding/2, y1),
+                                       v2s32(x1, y2)
+                               ), NULL);
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x2, y1),
+                                       v2s32(x2 + padding/2, y2)
+                               ), NULL);
+                       */
                }
-
-               video::SColor bgcolor2(128, 0, 0, 0);
-               if (!use_hotbar_image)
-                       driver->draw2DRectangle(bgcolor2, rect, NULL);
-               drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL,
-                       gamedef, selected ? IT_ROT_SELECTED : IT_ROT_NONE);
        }
 
+       video::SColor bgcolor2(128, 0, 0, 0);
+       if (!use_hotbar_image)
+               driver->draw2DRectangle(bgcolor2, rect, NULL);
+       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 inv_offset,
-               InventoryList *mainlist, u16 selectitem, u16 direction, const v2s32 &offset)
+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)
@@ -208,34 +206,39 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset,
        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 - inv_offset) * (m_hotbar_imagesize + m_padding * 2);
+               s32 tmp = height;
+               height = width;
+               width = tmp;
        }
 
        // Position of upper left corner of bar
-       v2s32 pos = upperleftpos + offset;
-       pos *= g_settings->getFloat("hud_scaling") * porting::getDisplayDensity();
+       v2s32 pos = screen_offset;
+       pos.X *= m_hud_scaling * RenderingEngine::getDisplayDensity();
+       pos.Y *= m_hud_scaling * RenderingEngine::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 != "")
+               if (!hotbar_image.empty())
                        use_hotbar_image = tsrc->isKnownSourceImage(hotbar_image);
                else
                        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 != "")
+               if (!hotbar_selected_image.empty())
                        use_hotbar_selected_image = tsrc->isKnownSourceImage(hotbar_selected_image);
                else
                        use_hotbar_selected_image = false;
        }
 
-       /* draw customized item background */
+       // 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);
+                       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());
@@ -244,12 +247,12 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset,
                        NULL, hbar_colors, true);
        }
 
+       // 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++) {
-               v2s32 steppos;
                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 - inv_offset) * fullimglen), m_padding);
@@ -265,7 +268,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset,
                        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)
@@ -314,7 +317,7 @@ void Hud::drawLuaElements(const 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 = utf8_to_wide(e->text);
+                               std::wstring text = unescape_translate(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));
@@ -327,14 +330,15 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
                                break; }
                        case HUD_ELEM_INVENTORY: {
                                InventoryList *inv = inventory->getList(e->text);
-                               v2s32 offs(e->offset.X, e->offset.Y);
-                               drawItems(pos, e->number, 0, inv, e->item, e->dir, offs);
+                               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;
                                v3f w_pos = e->world_pos * BS;
                                float distance = floor(10 * p_pos.getDistanceFrom(e->world_pos)) / 10;
-                               scene::ICameraSceneNode* camera = smgr->getActiveCamera();
+                               scene::ICameraSceneNode* camera =
+                                       RenderingEngine::get_scene_manager()->getActiveCamera();
                                w_pos -= intToFloat(camera_offset, BS);
                                core::matrix4 trans = camera->getProjectionMatrix();
                                trans *= camera->getViewMatrix();
@@ -350,11 +354,11 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
                                                                                 (e->number >> 8)  & 0xFF,
                                                                                 (e->number >> 0)  & 0xFF);
                                core::rect<s32> size(0, 0, 200, 2 * text_height);
-                               std::wstring text = utf8_to_wide(e->name);
+                               std::wstring text = unescape_translate(utf8_to_wide(e->name));
                                font->draw(text.c_str(), size + pos, color);
                                std::ostringstream os;
                                os << distance << e->text;
-                               text = utf8_to_wide(os.str());
+                               text = unescape_translate(utf8_to_wide(os.str()));
                                pos.Y += text_height;
                                font->draw(text.c_str(), size + pos, color);
                                break; }
@@ -381,8 +385,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture,
        if (size == v2s32()) {
                dstd = srcd;
        } else {
-               double size_factor = g_settings->getFloat("hud_scaling") *
-                               porting::getDisplayDensity();
+               float size_factor = m_hud_scaling * RenderingEngine::getDisplayDensity();
                dstd.Height = size.Y * size_factor;
                dstd.Width  = size.X * size_factor;
                offset.X *= size_factor;
@@ -447,21 +450,23 @@ void Hud::drawHotbar(u16 playeritem) {
        s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2);
        v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 3);
 
-       if ( (float) width / (float) porting::getWindowSize().X <=
+       const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+       if ( (float) width / (float) window_size.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);
                }
        }
 
@@ -486,8 +491,8 @@ void Hud::drawHotbar(u16 playeritem) {
 }
 
 
-void Hud::drawCrosshair() {
-
+void Hud::drawCrosshair()
+{
        if (use_crosshair_image) {
                video::ITexture *crosshair = tsrc->getTexture("crosshair.png");
                v2u32 size  = crosshair->getOriginalSize();
@@ -513,7 +518,7 @@ void Hud::setSelectionPos(const v3f &pos, const v3s16 &camera_offset)
 
 void Hud::drawSelectionMesh()
 {
-       if (!m_use_selection_mesh) {
+       if (m_mode == HIGHLIGHT_BOX) {
                // Draw 3D selection boxes
                video::SMaterial oldmaterial = driver->getMaterial2D();
                driver->setMaterial(m_selection_material);
@@ -533,11 +538,17 @@ void Hud::drawSelectionMesh()
                        driver->draw3DBox(box, video::SColor(255, r, g, b));
                }
                driver->setMaterial(oldmaterial);
-       } else if (m_selection_mesh) {
+       } 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();
@@ -553,7 +564,7 @@ void Hud::drawSelectionMesh()
 void Hud::updateSelectionMesh(const v3s16 &camera_offset)
 {
        m_camera_offset = camera_offset;
-       if (!m_use_selection_mesh)
+       if (m_mode != HIGHLIGHT_HALO)
                return;
 
        if (m_selection_mesh) {
@@ -561,7 +572,7 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset)
                m_selection_mesh = NULL;
        }
 
-       if (!m_selection_boxes.size()) {
+       if (m_selection_boxes.empty()) {
                // No pointed object
                return;
        }
@@ -586,10 +597,8 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset)
        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);
+       for (const auto &selection_box : m_selection_boxes) {
+               halo_box.addInternalBox(selection_box);
        }
 
        m_halo_boxes.push_back(halo_box);
@@ -598,17 +607,20 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset)
 }
 
 void Hud::resizeHotbar() {
-       if (m_screensize != porting::getWindowSize()) {
-               m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
-               m_hotbar_imagesize *= g_settings->getFloat("hud_scaling");
+       const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+
+       if (m_screensize != window_size) {
+               m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE *
+                       RenderingEngine::getDisplayDensity() + 0.5);
+               m_hotbar_imagesize *= m_hud_scaling;
                m_padding = m_hotbar_imagesize / 12;
-               m_screensize = porting::getWindowSize();
+               m_screensize = window_size;
                m_displaycenter = v2s32(m_screensize.X/2,m_screensize.Y/2);
        }
 }
 
 struct MeshTimeInfo {
-       s32 time;
+       u64 time;
        scene::IMesh *mesh;
 };
 
@@ -617,11 +629,11 @@ void drawItemStack(video::IVideoDriver *driver,
                const ItemStack &item,
                const core::rect<s32> &rect,
                const core::rect<s32> *clip,
-               IGameDef *gamedef,
+               Client *client,
                ItemRotationKind rotation_kind)
 {
        static MeshTimeInfo rotation_time_infos[IT_ROT_NONE];
-       static bool enable_animations =
+       static thread_local bool enable_animations =
                g_settings->getBool("inventory_items_animations");
 
        if (item.empty()) {
@@ -631,19 +643,20 @@ void drawItemStack(video::IVideoDriver *driver,
                return;
        }
 
-       const ItemDefinition &def = item.getDefinition(gamedef->idef());
-       scene::IMesh* mesh = gamedef->idef()->getWieldMesh(def.name, gamedef);
+       const ItemDefinition &def = item.getDefinition(client->idef());
+       ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client);
 
-       if (mesh) {
+       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 = getTimeMs();
+                               ti.time = porting::getTimeMs();
                        } else {
-                               delta = porting::getDeltaMs(ti.time, getTimeMs()) % 100000;
+                               delta = porting::getDeltaMs(ti.time, porting::getTimeMs()) % 100000;
                        }
                }
                core::rect<s32> oldViewPort = driver->getViewPort();
@@ -657,16 +670,32 @@ void drawItemStack(video::IVideoDriver *driver,
                matrix.makeIdentity();
 
                if (enable_animations) {
-                       float timer_f = (float)delta / 5000.0;
+                       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;