realmicu/minetest-micupack-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minertools: use minetest.raycast() function for mineral finder.

Browse Source 
Vector calculations for node traversal in mineral finder logic is now
replaced with new function minetest.raycast() introduced in minetest 5.0.

Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
This commit is contained in:
Michal Cieslakiewicz 2019-05-20 17:41:37 +02:00
parent 4fc146cf57
commit a2bc26992f
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
minertools/init.lua
View File

@ -18,11 +18,9 @@ minertools = {}
]]-- ]]--
-- parameters -- parameters
local light_level local light_level = 0
if minetest.settings:get_bool("minertools_flashlight_on") then if minetest.settings:get_bool("minertools_flashlight_on") then
light_level = minetest.LIGHT_MAX light_level = minetest.LIGHT_MAX
else
light_level = 0
end end
-- recognized ores -- recognized ores
@ -562,8 +560,6 @@ end
-- pointed_thing - node object (node) -- pointed_thing - node object (node)
local function mineralfinder_use(item, player, pointed_thing) local function mineralfinder_use(item, player, pointed_thing)
local player_name = player:get_player_name() local player_name = player:get_player_name()
local player_pos = vector.round(player:getpos())
local look_dir = player:get_look_dir() -- norm vec
local tool_def = item:get_definition() local tool_def = item:get_definition()
tool_def._init_metadata(player, item) tool_def._init_metadata(player, item)
local label = tool_def._find_label local label = tool_def._find_label
@ -571,28 +567,24 @@ local function mineralfinder_use(item, player, pointed_thing)
local det_lvl = tool_def._find_detail local det_lvl = tool_def._find_detail
local item_meta = item:get_meta() local item_meta = item:get_meta()
local ore_type = item_meta:get_string("ore_type") local ore_type = item_meta:get_string("ore_type")
local head_pos = vector.add(player_pos, { x = 0, y = 1, z = 0 }) local head_pos = vector.add(vector.round(player:get_pos()), { x = 0, y = 1, z = 0 })
local node = {} local end_pos = vector.add(head_pos, vector.round(vector.multiply(player:get_look_dir(), depth)))
local pos_vec = {}
local last_vec = nil
local orecount = 0 local orecount = 0
local obsblock = false local obsblock = false
local oredepth = 0 local oredepth = 0
for i = 1, depth, 1 do local ray = minetest.raycast(head_pos, end_pos, false, false)
pos_vec = vector.round(vector.add(head_pos, for pt in ray do
vector.multiply(look_dir, i))) local node = minetest.get_node_or_nil(pt.under)
if not last_vec or not vector.equals(pos_vec, last_vec) then if node then
node = minetest.get_node_or_nil(pos_vec) if rev_ore_name[node.name] == ore_type then
if node then orecount = orecount + 1
if rev_ore_name[node.name] == ore_type then if oredepth == 0 then
orecount = orecount + 1 oredepth = vector.distance(head_pos, pt.under)
if oredepth == 0 then oredepth = i end
elseif has_obsidian(node.name) then
obsblock = true
break
end end
elseif has_obsidian(node.name) then
obsblock = true
break
end end
last_vec = pos_vec -- protects against double count
end end
end end
local oremsg = "" local oremsg = ""