From 5bb1657bd86cb9938c08a669d7d3b3313e50b631 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 3 May 2021 10:46:59 +0200
Subject: [PATCH] Add moving marker for the player

---
 mods/ITEMS/mcl_maps/init.lua                  |  59 +++++++++++++++---
 .../textures/mcl_maps_player_arrow.png        | Bin 0 -> 1528 bytes
 .../mcl_maps/textures/mcl_maps_player_dot.png | Bin 0 -> 3101 bytes
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 mods/ITEMS/mcl_maps/textures/mcl_maps_player_arrow.png
 create mode 100644 mods/ITEMS/mcl_maps/textures/mcl_maps_player_dot.png

diff --git a/mods/ITEMS/mcl_maps/init.lua b/mods/ITEMS/mcl_maps/init.lua
index d6b972b86..b2c03b354 100644
--- a/mods/ITEMS/mcl_maps/init.lua
+++ b/mods/ITEMS/mcl_maps/init.lua
@@ -27,16 +27,20 @@ local loaded_maps = {}
 local c_air = minetest.get_content_id("air")
 
 function mcl_maps.create_map(pos)
+	local minp = vector.multiply(vector.floor(vector.divide(pos, 128)), 128)
+	local maxp = vector.add(minp, vector.new(127, 127, 127))
+
 	local itemstack = ItemStack("mcl_maps:filled_map")
 	local meta = itemstack:get_meta()
 	local next_id = storage:get_int("next_id")
 	storage:set_int("next_id", next_id + 1)
 	local id = tostring(next_id)
 	meta:set_string("mcl_maps:id", id)
+	meta:set_string("mcl_maps:minp", minetest.pos_to_string(minp))
+	meta:set_string("mcl_maps:maxp", minetest.pos_to_string(maxp))
 	tt.reload_itemstack_description(itemstack)
+
 	creating_maps[id] = true
-	local minp = vector.multiply(vector.floor(vector.divide(pos, 128)), 128)
-	local maxp = vector.add(minp, vector.new(127, 127, 127))
 	minetest.emerge_area(minp, maxp, function(blockpos, action, calls_remaining)
 		if calls_remaining > 0 then
 			return
@@ -260,14 +264,20 @@ local maps = {}
 local huds = {}
 
 minetest.register_on_joinplayer(function(player)
-	huds[player] = player:hud_add({
+	local map_def = {
 		hud_elem_type = "image",
 		text = "blank.png",
-		position = {x = 0.875, y = 0.8},
-		alignment = {x = -1, y = -1},
+		position = {x = 0.75, y = 0.8},
+		alignment = {x = 0, y = -1},
 		offset = {x = 0, y = 0},
 		scale = {x = 2, y = 2},
-	})
+	}
+	local marker_def = table.copy(map_def)
+	marker_def.alignment = {x = 0, y = 0}
+	huds[player] = {
+		map = player:hud_add(map_def),
+		marker = player:hud_add(marker_def),
+	}
 end)
 
 minetest.register_on_leaveplayer(function(player)
@@ -279,6 +289,7 @@ minetest.register_globalstep(function(dtime)
 	for _, player in pairs(minetest.get_connected_players()) do
 		local wield = player:get_wielded_item()
 		local texture = mcl_maps.load_map_item(wield)
+		local hud = huds[player]
 		if texture then
 			local wield_def = wield:get_definition()
 			local hand_def = player:get_inventory():get_stack("hand", 1):get_definition()
@@ -289,11 +300,43 @@ minetest.register_globalstep(function(dtime)
 			end
 
 			if texture ~= maps[player] then
-				player:hud_change(huds[player], "text", "[combine:140x140:0,0=mcl_maps_map_background.png:6,6=" .. texture)
+				player:hud_change(hud.map, "text", "[combine:140x140:0,0=mcl_maps_map_background.png:6,6=" .. texture)
 				maps[player] = texture
 			end
+
+			local pos = vector.round(player:get_pos())
+			local meta = wield:get_meta()
+			local minp = minetest.string_to_pos(meta:get_string("mcl_maps:minp"))
+			local maxp = minetest.string_to_pos(meta:get_string("mcl_maps:maxp"))
+
+			local marker = "mcl_maps_player_arrow.png"
+
+			if pos.x < minp.x then
+				marker = "mcl_maps_player_dot.png"
+				pos.x = minp.x
+			elseif pos.x > maxp.x then
+				marker = "mcl_maps_player_dot.png"
+				pos.x = maxp.x
+			end
+
+			if pos.z < minp.z then
+				marker = "mcl_maps_player_dot.png"
+				pos.z = minp.z
+			elseif pos.z > maxp.z then
+				marker = "mcl_maps_player_dot.png"
+				pos.z = maxp.z
+			end
+
+			if marker == "mcl_maps_player_arrow.png" then
+				local yaw = (math.floor(player:get_look_horizontal() * 180 / math.pi / 90 + 0.5) % 4) * 90
+				marker = marker .. "^[transformR" .. yaw
+			end
+
+			player:hud_change(hud.marker, "text", marker)
+			player:hud_change(hud.marker, "offset", {x = (6 - 140 / 2 + pos.x - minp.x) * 2, y = (6 - 140 + maxp.z - pos.z) * 2})
 		elseif maps[player] then
-			player:hud_change(huds[player], "text", "blank.png")
+			player:hud_change(hud.map, "text", "blank.png")
+			player:hud_change(hud.marker, "text", "blank.png")
 			maps[player] = nil
 		end
 	end
diff --git a/mods/ITEMS/mcl_maps/textures/mcl_maps_player_arrow.png b/mods/ITEMS/mcl_maps/textures/mcl_maps_player_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f58f676501e514ddee898f7a19ad409590a5249
GIT binary patch
literal 1528
zcmV<U1qb?xP)<h;3K|Lk000e1NJLTq000L7000OG1^@s6H3a1b000AzdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvlH@83{MRYw2uNZ*4q%9QH+aXN1mjv<-CawM
z30ssbv}6h#MeYCpI{m@L$yl;3M4!AjxNNdXGA7aNSDH^Yc0TtjEXntJx-1f?6jGOc
zUiKM!cU^FpbGg@3TyG>UM@Qu4P)B6JWV=lgdfD}Cm!s77iBB=yrdni|bs5f7)}4;>
z*1PeWZWT5FrOhFbiZo?4^BMOHblj{N(#<E58a9}VI)boz)CxfE$~&Ynw*cLNyb3}_
zC-g6~6Zn#sUQby1!;$~`1-q}opAg>!)-@xj?_Z?D)g#EgZ?X5bSC_2^qJDMM1e*^x
zFf4#v=Q58Ga68Py90?<uY$_<<Of?0ga$*7Eo!IimnLD>BD_5jwrAdGksUT|Tq6SG)
zb?{`z;4VRvZW_T^l}4&i%Ow|{anp=fIU@4LFcpR~#*%Lb{q*vkLA}=j5u3Q<)F#0)
z`Wk5r=Ef6NAcXtk%}s!hvFJB9{exBogKokcQD8P@cTpT)drK$J3Ofh6?+T`{EeC)I
zu^p0O1p~&jI`(XWNMHtz5d>vqE^4KK0d`I{Bq>(a3k8WXVq;C<X)8{=3^mTCv3=BQ
z05?f9$g<X<e}awZq3qOI=bU%JMRLhyuikp+y$^mIaye+Q!37^eh#`d>HQMN+k0HjG
zVos72XP`?yg%ndtISXY3%J7w8pP?yIwAkW`FQLSeO0H<1YOAZhh8k<Cd6P{y921-0
z!WOr*<;K)-QZ(CK^DVU4Qp+8^*0tO2y6>UKo_fBp#%tT2#~ZBiVofGf!!BG{gO)-#
zT<|zf+~5q1iDfVz1_Nkl8JwBO*2-XRaAuNVQ#e7AZg4{z55_>DZ7i<yg}W<rFY!h$
zzQmh6V~z%O|AILJb&tG#!P+*yb9FMd@4|tpQS3gvZ!wd^JU(jqCE02_Yjn-%WhYN0
zy%Y5(XY{LVZi3P~QQs@=!&3iwX&rmwWYuvzybe2k+(D<%^nUEm`{<>z>G#C%q3QkD
zpV0qOnY*N$RdNp9rQ|s`W=W0pq&XyAOp2ZtwV1wHb@iJM4IQeQpYMd9Dy1JPYuf|z
z@{l%;=Q*RR>M<vIj`SrweHQ;QJbm7W_xaIxUH7gec^{WA!_pHs<>^lB@p_E>@&j^T
zS}(o57W?ba^zlhH{&3*$B>e>pgOXObK^?>Z00D$)LqkwWLqi~Na&Km7Y-Iodc$|Ha
zJxIeq9K~PLmKLcv*g?f1Lv^wsD&nYBC_;r$E41oha{YuR4M~cNqu^R_@ME#+;Nq;S
zgR3A2et@{SIVrkGiT_IqEn+-4?#H`(kGpq((5y1m42%P+W*O;ZLd@n?#n3B)@FR>t
z1Y~CFbCQ&T=lHsZkFR%ep5=Y+&(WJNm<;fV#IsB{EaDB~=}k-LyiXiuWjRlLPCRDN
z1&JTIuDJZhx#Y0GGowZ(Jx?4Z7E4{MbTKO%D)AI?EU#*mFJxWLbKc^tR_m;NPyWJ4
zL0ehoI?Z7uv4|x|5TT%s3aYRWr&S}xM4I*!9{wT6FOf?jR|Sk53#dVb?D)a|;CHuX
zadN^<iX?#Gi*0|50HIx=)v)dFW7}?>0RCs-O6&M*O<?Ae^hQUE9RYpYz{Pb(Q}%$%
z9bn)|mkrsG{4|AP5qLkNZ^{Avw?NOD+gp1drw>4ex=P&u2Zz9DiL%!{-W~4l?cX!)
z{(b=69CB;*2v67m000JJOGiWi{{a60|De66lK=n!32;bRa{vGizW@LZzX3P}QzQTY
z00(qQO+^Rg1p^2fE*Z`BU;qFBT1iAfR0!9NkFgEFAPfXgC>vScgk6|{o!EfVm8ba>
z5r`s+a^1^+whRYmrZX4*U}hR)=(Io0vaH@a0JYYAyR5;S6M)Rzg$tmy27tR05k$nZ
eR}zw5U%3H%YbOfTMa)D10000<MNUMnLSTYuE6aoc

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_maps/textures/mcl_maps_player_dot.png b/mods/ITEMS/mcl_maps/textures/mcl_maps_player_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..391197c40606ea6d1505698057fd5bb7fe5d1dda
GIT binary patch
literal 3101
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

literal 0
HcmV?d00001