lua-api: fix get/set_pitch

[dragonfireclient.git] / src / hud.h

diff --git a/src/hud.h b/src/hud.h
index c7289f7c4f79244b963f17cd6ef00266c3c960f0..e015baec125fbf9dfe6334a52944c89937097aa6 100644 (file)
--- a/src/hud.h
+++ b/src/hud.h
@@ -1,6 +1,7 @@
 /*
 Minetest
 Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2017 red-001 <red-001@outlook.ie>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,10 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef HUD_HEADER
-#define HUD_HEADER
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
+#include <string>
+#include "common/c_types.h"
 
 #define HUD_DIR_LEFT_RIGHT 0
 #define HUD_DIR_RIGHT_LEFT 1
@@ -31,24 +33,34 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define HUD_CORNER_LOWER  1
 #define HUD_CORNER_CENTER 2
 
-#define HUD_FLAG_HOTBAR_VISIBLE    (1 << 0)
-#define HUD_FLAG_HEALTHBAR_VISIBLE (1 << 1)
-#define HUD_FLAG_CROSSHAIR_VISIBLE (1 << 2)
-#define HUD_FLAG_WIELDITEM_VISIBLE (1 << 3)
-#define HUD_FLAG_BREATHBAR_VISIBLE (1 << 4)
+// Note that these visibility flags do not determine if the hud items are
+// actually drawn, but rather, whether to draw the item should the rest
+// of the game state permit it.
+#define HUD_FLAG_HOTBAR_VISIBLE        (1 << 0)
+#define HUD_FLAG_HEALTHBAR_VISIBLE     (1 << 1)
+#define HUD_FLAG_CROSSHAIR_VISIBLE     (1 << 2)
+#define HUD_FLAG_WIELDITEM_VISIBLE     (1 << 3)
+#define HUD_FLAG_BREATHBAR_VISIBLE     (1 << 4)
+#define HUD_FLAG_MINIMAP_VISIBLE       (1 << 5)
+#define HUD_FLAG_MINIMAP_RADAR_VISIBLE (1 << 6)
 
 #define HUD_PARAM_HOTBAR_ITEMCOUNT 1
+#define HUD_PARAM_HOTBAR_IMAGE 2
+#define HUD_PARAM_HOTBAR_SELECTED_IMAGE 3
 
 #define HUD_HOTBAR_ITEMCOUNT_DEFAULT 8
-#define HUD_HOTBAR_ITEMCOUNT_MAX     23
+#define HUD_HOTBAR_ITEMCOUNT_MAX     32
 
-class Player;
+
+#define HOTBAR_IMAGE_SIZE 48
 
 enum HudElementType {
        HUD_ELEM_IMAGE     = 0,
        HUD_ELEM_TEXT      = 1,
        HUD_ELEM_STATBAR   = 2,
-       HUD_ELEM_INVENTORY = 3
+       HUD_ELEM_INVENTORY = 3,
+       HUD_ELEM_WAYPOINT  = 4,
+       HUD_ELEM_IMAGE_WAYPOINT = 5
 };
 
 enum HudElementStat {
@@ -60,7 +72,11 @@ enum HudElementStat {
        HUD_STAT_ITEM,
        HUD_STAT_DIR,
        HUD_STAT_ALIGN,
-       HUD_STAT_OFFSET
+       HUD_STAT_OFFSET,
+       HUD_STAT_WORLD_POS,
+       HUD_STAT_SIZE,
+       HUD_STAT_Z_INDEX,
+       HUD_STAT_TEXT2,
 };
 
 struct HudElement {
@@ -74,62 +90,13 @@ struct HudElement {
        u32 dir;
        v2f align;
        v2f offset;
+       v3f world_pos;
+       v2s32 size;
+       s16 z_index = 0;
+       std::string text2;
 };
 
+extern const EnumString es_HudElementType[];
+extern const EnumString es_HudElementStat[];
+extern const EnumString es_HudBuiltinElement[];
 
-inline u32 hud_get_free_id(Player *player) {
-       size_t size = player->hud.size();
-       for (size_t i = 0; i != size; i++) {
-               if (!player->hud[i])
-                       return i;
-       }
-       return size;
-}
-
-#ifndef SERVER
-
-#include <IGUIFont.h>
-
-#include "gamedef.h"
-#include "inventory.h"
-#include "localplayer.h"
-
-class Hud {
-public:
-       video::IVideoDriver *driver;
-       gui::IGUIEnvironment *guienv;
-       gui::IGUIFont *font;
-       u32 text_height;
-       IGameDef *gamedef;
-       LocalPlayer *player;
-       Inventory *inventory;
-       ITextureSource *tsrc;
-
-       v2u32 screensize;
-       v2s32 displaycenter;
-       s32 hotbar_imagesize;
-       
-       video::SColor crosshair_argb;
-       video::SColor selectionbox_argb;
-       bool use_crosshair_image;
-       
-       Hud(video::IVideoDriver *driver, gui::IGUIEnvironment* guienv,
-               gui::IGUIFont *font, u32 text_height, IGameDef *gamedef,
-               LocalPlayer *player, Inventory *inventory);
-       
-       void drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount,
-               InventoryList *mainlist, u16 selectitem, u16 direction);
-       void drawLuaElements();
-       void drawStatbar(v2s32 pos, u16 corner, u16 drawdir,
-                                        std::string texture, s32 count, v2s32 offset);
-       
-       void drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem, s32 breath);
-       void resizeHotbar();
-       
-       void drawCrosshair();
-       void drawSelectionBoxes(std::vector<aabb3f> &hilightboxes);
-};
-
-#endif
-
-#endif