X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fhud.h;h=7f0fbe7b38ec5837c4da6f9d193fc64a3933b5a3;hb=de83c29ba0a517630b361ffdbebd1a1f0b5eed4e;hp=65453aec1ae7288cbdd127226bf1f0bc57bfd758;hpb=0903190ba2ed2134c464f2efe694d7281ead1c09;p=dragonfireclient.git

diff --git a/src/hud.h b/src/hud.h
index 65453aec1..7f0fbe7b3 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -119,31 +119,65 @@ class Hud {
 	bool use_hotbar_image;
 	std::string hotbar_selected_image;
 	bool use_hotbar_selected_image;
-	v3s16 camera_offset;
 
 	Hud(video::IVideoDriver *driver,scene::ISceneManager* smgr,
 		gui::IGUIEnvironment* guienv, IGameDef *gamedef, LocalPlayer *player,
 		Inventory *inventory);
+	~Hud();
 
 	void drawHotbar(u16 playeritem);
 	void resizeHotbar();
 	void drawCrosshair();
-	void drawSelectionBoxes(std::vector<aabb3f> &hilightboxes);
-	void drawLuaElements(v3s16 camera_offset);
+	void drawSelectionMesh();
+	void updateSelectionMesh(const v3s16 &camera_offset);
+
+	std::vector<aabb3f> *getSelectionBoxes()
+	{ return &m_selection_boxes; }
+
+	void setSelectionPos(const v3f &pos, const v3s16 &camera_offset);
+
+	v3f getSelectionPos() const
+	{ return m_selection_pos; }
+
+	void setSelectionMeshColor(const video::SColor &c)
+	{ m_selection_mesh_color = c; }
+
+	void drawLuaElements(const v3s16 &camera_offset);
+
 private:
 	void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture,
 			s32 count, v2s32 offset, v2s32 size=v2s32());
 
-	void drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
-		InventoryList *mainlist, u16 selectitem, u16 direction);
+	void drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
+		s32 inv_offset, InventoryList *mainlist, u16 selectitem, u16 direction);
 
-	void drawItem(const ItemStack &item, const core::rect<s32>& rect, bool selected);
+	void drawItem(const ItemStack &item, const core::rect<s32>& rect,
+		bool selected);
 
+	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;
+	std::vector<aabb3f> m_halo_boxes;
+	v3f m_selection_pos;
+	v3f m_selection_pos_with_offset;
+
+	scene::IMesh* m_selection_mesh;
+	video::SColor m_selection_mesh_color;
+	video::SMaterial m_selection_material;
+	bool m_use_selection_mesh;
+};
+
+enum ItemRotationKind {
+	IT_ROT_SELECTED,
+	IT_ROT_HOVERED,
+	IT_ROT_DRAGGED,
+	IT_ROT_NONE, // Must be last, also serves as number
 };
 
 void drawItemStack(video::IVideoDriver *driver,
@@ -151,8 +185,8 @@ void drawItemStack(video::IVideoDriver *driver,
 		const ItemStack &item,
 		const core::rect<s32> &rect,
 		const core::rect<s32> *clip,
-		IGameDef *gamedef);
-
+		IGameDef *gamedef,
+		ItemRotationKind rotation_kind);
 
 #endif