From 01f0d2c44559fd30c81d69707324bd0e9e4742c0 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 31 Jan 2017 20:36:38 +0100 Subject: Join itrainmap mod into the modpack --- advtrains/advtrains_itrainmap/init.lua | 151 +++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 advtrains/advtrains_itrainmap/init.lua (limited to 'advtrains/advtrains_itrainmap/init.lua') diff --git a/advtrains/advtrains_itrainmap/init.lua b/advtrains/advtrains_itrainmap/init.lua new file mode 100644 index 0000000..60ee944 --- /dev/null +++ b/advtrains/advtrains_itrainmap/init.lua @@ -0,0 +1,151 @@ + + +local map_def={ + example = { + p1x=168, + p1z=530, + p2x=780, + p2z=1016, + background="itm_example.png", + }, +} + +local itm_cache={} +local itm_pdata={} +local itm_conf_mindia=0.1 + +minetest.register_privilege("itm", { description = "Allows to display train map", give_to_singleplayer = true, default = false }) + +local function create_map_form_with_bg(d) + local minx, minz, maxx, maxz = math.min(d.p1x, d.p2x), math.min(d.p1z, d.p2z), math.max(d.p1x, d.p2x), math.max(d.p1z, d.p2z) + local form_x, form_z=10,10 + local edge_x, edge_z = form_x/(maxx-minx), form_z/(maxz-minz) + local len_x, len_z=math.max(edge_x, itm_conf_mindia), math.max(edge_z, itm_conf_mindia) + local form="size["..(form_x+edge_x)..","..(form_z+edge_z).."] background[0,0;0,0;"..d.background..";true] " + local lbl={} + + for pts, tid in pairs(advtrains.detector.on_node) do + local pos=minetest.string_to_pos(pts) + form=form.."box["..(edge_x*(pos.x-minx))..","..(form_z-(edge_z*(pos.z-minz)))..";"..len_x..","..len_z..";red]" + lbl[sid(tid)]=pos + end + + for t_id, xz in pairs(lbl) do + form=form.."label["..(edge_x*(xz.x-minx))..","..(form_x-(edge_z*(xz.z-minz)))..";"..t_id.."]" + end + return form +end + +local function create_map_form(d) + if d.background then + return create_map_form_with_bg(d) + end + + local minx, minz, maxx, maxz = math.min(d.p1x, d.p2x), math.min(d.p1z, d.p2z), math.max(d.p1x, d.p2x), math.max(d.p1z, d.p2z) + local form_x, form_z=10,10 + local edge_x, edge_z = form_x/(maxx-minx), form_z/(maxz-minz) + local len_x, len_z=math.max(edge_x, itm_conf_mindia), math.max(edge_z, itm_conf_mindia) + local form="size["..(form_x+edge_x)..","..(form_z+edge_z).."]" + local lbl={} + + for x,itx in pairs(itm_cache) do + if x>=minx and x<=maxx then + for z,y in pairs(itx) do + if z>=minz and z<=maxz then + local adn=advtrains.detector.on_node[minetest.pos_to_string({x=x, y=y, z=z})] + local color="gray" + if adn then + color="red" + lbl[sid(adn)]={x=x, z=z} + end + form=form.."box["..(edge_x*(x-minx))..","..(form_z-(edge_z*(z-minz)))..";"..len_x..","..len_z..";"..color.."]" + end + end + end + end + for t_id, xz in pairs(lbl) do + form=form.."label["..(edge_x*(xz.x-minx))..","..(form_x-(edge_z*(xz.z-minz)))..";"..t_id.."]" + end + return form +end + +local function cache_ndb() + itm_cache={} + local ndb_nodes=advtrains.ndb.get_nodes() + for phs,_ in pairs(ndb_nodes) do + local pos=minetest.get_position_from_hash(phs) + if not itm_cache[pos.x] then + itm_cache[pos.x]={} + end + itm_cache[pos.x][pos.z]=pos.y + end +end + +minetest.register_chatcommand("itm", { + params="[x1 z1 x2 z2] or [mdef]", + description="Display advtrains train map of given area.\nFirst form:[x1 z1 x2 z2] - specify area directly.\nSecond form:[mdef] - Use a predefined map background(see init.lua)\nThird form: No parameters - use WorldEdit position markers.", + privs={itm=true}, + func = function(name, param) + local mdef=string.match(param, "^(%S+)$") + if mdef then + local d=map_def[mdef] + if not d then + return false, "Map definiton not found: "..mdef + end + itm_pdata[name]=map_def[mdef] + minetest.show_formspec(name, "itrainmap", create_map_form(d)) + return true, "Showing train map: "..mdef + end + local x1, z1, x2, z2=string.match(param, "^(%S+) (%S+) (%S+) (%S+)$") + if not (x1 and z1 and x2 and z2) then + if worldedit then + local wep1, wep2=worldedit.pos1[name], worldedit.pos2[name] + if wep1 and wep2 then + x1, z1, x2, z2=wep1.x, wep1.z, wep2.x, wep2.z + end + end + end + if not (x1 and z1 and x2 and z2) then + return false, "Invalid parameters and no WE positions set" + end + local d={p1x=x1, p1z=z1, p2x=x2, p2z=z2} + itm_pdata[name]=d + minetest.show_formspec(name, "itrainmap", create_map_form(d)) + return true, "Showing ("..x1..","..z1..")-("..x2..","..z2..")" + end, +}) +minetest.register_chatcommand("itm_cache_ndb", { + params="", + description="Cache advtrains node database again. Run when tracks changed.", + privs={itm=true}, + func = function(name, param) + cache_ndb() + return true, "Done caching node database." + end, +}) + +local timer=0 +minetest.register_globalstep(function(dtime) + timer=timer-math.min(dtime, 0.1) + if timer<=0 then + local t1=os.clock() + local any=false + for pname,d in pairs(itm_pdata) do + minetest.show_formspec(pname, "itrainmap", create_map_form(d)) + any=true + end + if any then + minetest.log("action", "itm "..math.floor((os.clock()-t1)*1000).."ms") + end + timer=2 + end +end) +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname=="itrainmap" and fields.quit then + minetest.log("action", "itm form quit") + itm_pdata[player:get_player_name()]=nil + end +end) + +--automatically run itm_cache_ndb +minetest.after(2, cache_ndb) -- cgit v1.2.3 From f6d1157ba1b3bc8519b7c01f6b5974b0f9f5cae1 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Thu, 2 Feb 2017 00:02:11 +0100 Subject: Lua automation - initial incomplete coding --- advtrains/advtrains_itrainmap/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'advtrains/advtrains_itrainmap/init.lua') diff --git a/advtrains/advtrains_itrainmap/init.lua b/advtrains/advtrains_itrainmap/init.lua index 60ee944..db1c40b 100644 --- a/advtrains/advtrains_itrainmap/init.lua +++ b/advtrains/advtrains_itrainmap/init.lua @@ -25,7 +25,7 @@ local function create_map_form_with_bg(d) local lbl={} for pts, tid in pairs(advtrains.detector.on_node) do - local pos=minetest.string_to_pos(pts) + local pos=minetest.get_pos_from_hash(pts) form=form.."box["..(edge_x*(pos.x-minx))..","..(form_z-(edge_z*(pos.z-minz)))..";"..len_x..","..len_z..";red]" lbl[sid(tid)]=pos end @@ -52,7 +52,7 @@ local function create_map_form(d) if x>=minx and x<=maxx then for z,y in pairs(itx) do if z>=minz and z<=maxz then - local adn=advtrains.detector.on_node[minetest.pos_to_string({x=x, y=y, z=z})] + local adn=advtrains.detector.on_node[minetest.hash_node_position({x=x, y=y, z=z})] local color="gray" if adn then color="red" -- cgit v1.2.3 From 82efe2e773e5c8d18e948811ef3d9d1df1c95157 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 3 Feb 2017 10:27:34 +0100 Subject: Fix itrainmap not working --- advtrains/advtrains_itrainmap/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'advtrains/advtrains_itrainmap/init.lua') diff --git a/advtrains/advtrains_itrainmap/init.lua b/advtrains/advtrains_itrainmap/init.lua index db1c40b..b1168f1 100644 --- a/advtrains/advtrains_itrainmap/init.lua +++ b/advtrains/advtrains_itrainmap/init.lua @@ -25,7 +25,7 @@ local function create_map_form_with_bg(d) local lbl={} for pts, tid in pairs(advtrains.detector.on_node) do - local pos=minetest.get_pos_from_hash(pts) + local pos=minetest.get_position_from_hash(pts) form=form.."box["..(edge_x*(pos.x-minx))..","..(form_z-(edge_z*(pos.z-minz)))..";"..len_x..","..len_z..";red]" lbl[sid(tid)]=pos end -- cgit v1.2.3 From b3ce833df80e679e55175fe324a9c6137a6c5cc3 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 3 Feb 2017 20:43:46 +0100 Subject: fix up stuff in itrainmap --- advtrains/advtrains_itrainmap/init.lua | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'advtrains/advtrains_itrainmap/init.lua') diff --git a/advtrains/advtrains_itrainmap/init.lua b/advtrains/advtrains_itrainmap/init.lua index b1168f1..02dbc9e 100644 --- a/advtrains/advtrains_itrainmap/init.lua +++ b/advtrains/advtrains_itrainmap/init.lua @@ -25,7 +25,7 @@ local function create_map_form_with_bg(d) local lbl={} for pts, tid in pairs(advtrains.detector.on_node) do - local pos=minetest.get_position_from_hash(pts) + local pos=minetest.string_to_pos(pts) form=form.."box["..(edge_x*(pos.x-minx))..","..(form_z-(edge_z*(pos.z-minz)))..";"..len_x..","..len_z..";red]" lbl[sid(tid)]=pos end @@ -52,7 +52,7 @@ local function create_map_form(d) if x>=minx and x<=maxx then for z,y in pairs(itx) do if z>=minz and z<=maxz then - local adn=advtrains.detector.on_node[minetest.hash_node_position({x=x, y=y, z=z})] + local adn=advtrains.detector.on_node[minetest.pos_to_string({x=x, y=y, z=z})] local color="gray" if adn then color="red" @@ -128,21 +128,14 @@ local timer=0 minetest.register_globalstep(function(dtime) timer=timer-math.min(dtime, 0.1) if timer<=0 then - local t1=os.clock() - local any=false for pname,d in pairs(itm_pdata) do minetest.show_formspec(pname, "itrainmap", create_map_form(d)) - any=true - end - if any then - minetest.log("action", "itm "..math.floor((os.clock()-t1)*1000).."ms") end timer=2 end end) minetest.register_on_player_receive_fields(function(player, formname, fields) if formname=="itrainmap" and fields.quit then - minetest.log("action", "itm form quit") itm_pdata[player:get_player_name()]=nil end end) -- cgit v1.2.3