]> git.lizzy.rs Git - minetest.git/blobdiff - src/hud.cpp
Fix logic of checkbox formspec element validity checking
[minetest.git] / src / hud.cpp
index bbec4489ead7203043c9ec5d30752a7387ca80d4..a74d926d7353e35f9d9af2ab16274a1d9f53d632 100644 (file)
@@ -31,25 +31,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "localplayer.h"
 #include "camera.h"
 #include "porting.h"
+#include "fontengine.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, IGameDef *gamedef, 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->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_padding = m_hotbar_imagesize / 12;
 
        const video::SColor hbar_color(255, 255, 255, 255);
@@ -83,17 +85,18 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
 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());
+                               driver->draw2DImage(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,13 +154,18 @@ 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, gamedef);
        }
 
 //NOTE: selectitem = 0 -> no selected; selectitem 1-based
 void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
                InventoryList *mainlist, u16 selectitem, u16 direction)
 {
+#ifdef HAVE_TOUCHSCREENGUI
+       if ( (g_touchscreengui) && (offset == 0))
+               g_touchscreengui->resetHud();
+#endif
+
        s32 height  = m_hotbar_imagesize + m_padding * 2;
        s32 width   = (itemcount - offset) * (m_hotbar_imagesize + m_padding * 2);
 
@@ -185,8 +193,10 @@ 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());
@@ -218,17 +228,25 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
                }
 
                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() {
-       for (size_t i = 0; i != player->hud.size(); i++) {
-               HudElement *e = player->hud[i];
+void Hud::drawLuaElements(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);
@@ -266,7 +284,7 @@ void Hud::drawLuaElements() {
                                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);
@@ -277,6 +295,7 @@ void Hud::drawLuaElements() {
                                v3f w_pos = e->world_pos * BS;
                                float distance = floor(10 * p_pos.getDistanceFrom(e->world_pos)) / 10;
                                scene::ICameraSceneNode* camera = smgr->getActiveCamera();
+                               w_pos -= intToFloat(camera_offset, BS);
                                core::matrix4 trans = camera->getProjectionMatrix();
                                trans *= camera->getViewMatrix();
                                f32 transformed_pos[4] = { w_pos.X, w_pos.Y, w_pos.Z, 1.0f };
@@ -307,7 +326,9 @@ void Hud::drawLuaElements() {
 }
 
 
-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};
        
@@ -316,10 +337,25 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s
                return;
                
        core::dimension2di srcd(stat_texture->getOriginalSize());
+       core::dimension2di dstd;
+       if (size == v2s32()) {
+               dstd = srcd;
+       } else {
+               dstd.Height = size.Y * g_settings->getFloat("hud_scaling") *
+                               porting::getDisplayDensity();
+               dstd.Width  = size.X * g_settings->getFloat("hud_scaling") *
+                               porting::getDisplayDensity();
+
+               offset.X *= g_settings->getFloat("hud_scaling") *
+                               porting::getDisplayDensity();
+
+               offset.Y *= g_settings->getFloat("hud_scaling") *
+                               porting::getDisplayDensity();
+       }
 
        v2s32 p = pos;
        if (corner & HUD_CORNER_LOWER)
-               p -= srcd.Height;
+               p -= dstd.Height;
 
        p += offset;
 
@@ -337,13 +373,13 @@ 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);
@@ -353,7 +389,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s
        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);
@@ -361,7 +397,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s
 }
 
 
-void Hud::drawHotbar(s32 halfheartcount, u16 playeritem, s32 breath) {
+void Hud::drawHotbar(u16 playeritem) {
 
        v2s32 centerlowerpos(m_displaycenter.X, m_screensize.Y);
 
@@ -393,20 +429,26 @@ void Hud::drawHotbar(s32 halfheartcount, u16 playeritem, s32 breath) {
                }
        }
 
-       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, "heart.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;
-       }
                
        if (use_crosshair_image) {
                video::ITexture *crosshair = tsrc->getTexture("crosshair.png");
@@ -437,6 +479,7 @@ void Hud::drawSelectionBoxes(std::vector<aabb3f> &hilightboxes) {
 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");
                m_padding = m_hotbar_imagesize / 12;
                m_screensize = porting::getWindowSize();
                m_displaycenter = v2s32(m_screensize.X/2,m_screensize.Y/2);