LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / hud.h

diff --git a/src/hud.h b/src/hud.h
index 0b69c58dacad9c0308bc4cdc379bb25552a55e5a..7b208a26ebb8619c310753efe60de7f9269e8a61 100644 (file)
--- a/src/hud.h
+++ b/src/hud.h
@@ -95,7 +95,7 @@ struct HudElement {
 #include <IGUIFont.h>
 #include "irr_aabb3d.h"
 
-class IGameDef;
+class Client;
 class ITextureSource;
 class Inventory;
 class InventoryList;
@@ -107,21 +107,20 @@ public:
        video::IVideoDriver *driver;
        scene::ISceneManager* smgr;
        gui::IGUIEnvironment *guienv;
-       IGameDef *gamedef;
+       Client *client;
        LocalPlayer *player;
        Inventory *inventory;
        ITextureSource *tsrc;
 
        video::SColor crosshair_argb;
        video::SColor selectionbox_argb;
-       bool use_crosshair_image;
-       std::string hotbar_image;
-       bool use_hotbar_image;
-       std::string hotbar_selected_image;
-       bool use_hotbar_selected_image;
-
-       Hud(video::IVideoDriver *driver,scene::ISceneManager* smgr,
-               gui::IGUIEnvironment* guienv, IGameDef *gamedef, LocalPlayer *player,
+       bool use_crosshair_image = false;
+       std::string hotbar_image = "";
+       bool use_hotbar_image = false;
+       std::string hotbar_selected_image = "";
+       bool use_hotbar_selected_image = false;
+
+       Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,
                Inventory *inventory);
        ~Hud();
 
@@ -139,8 +138,11 @@ public:
        v3f getSelectionPos() const
        { return m_selection_pos; }
 
-       void setSelectionMeshColor(const video::SColor &c)
-       { m_selection_mesh_color = c; }
+       void setSelectionMeshColor(const video::SColor &color)
+       { m_selection_mesh_color = color; }
+
+       void setSelectedFaceNormal(const v3f &face_normal)
+       { m_selected_face_normal = face_normal; }
 
        void drawLuaElements(const v3s16 &camera_offset);
 
@@ -154,12 +156,12 @@ private:
        void drawItem(const ItemStack &item, const core::rect<s32>& rect,
                bool selected);
 
-       float m_hud_scaling;
+       float m_hud_scaling; // cached minetest setting
        v3s16 m_camera_offset;
        v2u32 m_screensize;
        v2s32 m_displaycenter;
-       s32 m_hotbar_imagesize;
-       s32 m_padding;
+       s32 m_hotbar_imagesize; // Takes hud_scaling into account, updated by resizeHotbar()
+       s32 m_padding;  // Takes hud_scaling into account, updated by resizeHotbar()
        video::SColor hbar_colors[4];
 
        std::vector<aabb3f> m_selection_boxes;
@@ -167,10 +169,16 @@ private:
        v3f m_selection_pos;
        v3f m_selection_pos_with_offset;
 
-       scene::IMesh* m_selection_mesh;
+       scene::IMesh *m_selection_mesh = nullptr;
        video::SColor m_selection_mesh_color;
+       v3f m_selected_face_normal;
+
        video::SMaterial m_selection_material;
-       bool m_use_selection_mesh;
+
+       enum {
+               HIGHLIGHT_BOX,
+               HIGHLIGHT_HALO,
+               HIGHLIGHT_NONE } m_mode;
 };
 
 enum ItemRotationKind {
@@ -185,7 +193,7 @@ 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);
 
 #endif