Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Complete rework of curve/tee rail direction functions

This commit is contained in:
teknomunk 2024-04-28 06:58:42 +00:00
parent 2891807a0f
commit 1370cf7863
1 changed files with 17 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
mods/ENTITIES/mcl_minecarts/rails.lua
View File

@ -45,77 +45,36 @@ local function rail_dir_sloped(pos, dir, node)
return downhill return downhill
end end
end end
-- Fourdir -- Fourdir to cardinal direction
-- 0 = north -- 0 = north
-- 1 = east -- 1 = east
-- 2 = south -- 2 = south
-- 3 = west -- 3 = west
local CURVE_RAIL_DIRS = { [0] = 1, 1, 2, 2, }
local function rail_dir_curve(pos, dir, node) -- This takes a table `dirs` that has one element for each cardinal direction
-- and which specifies the direction for a cart to continue in when entering
-- a rail node in the direction of the cardinal. This function takes node
-- rotations into account.
local function rail_dir_from_table(pos, dir, node, dirs)
dir = vector.new(dir.x, 0, dir.z) dir = vector.new(dir.x, 0, dir.z)
local dir_fourdir = (minetest.dir_to_fourdir(dir) - node.param2 + 4) % 4 local dir_fourdir = (minetest.dir_to_fourdir(dir) - node.param2 + 4) % 4
local new_fourdir = (CURVE_RAIL_DIRS[dir_fourdir] + node.param2) % 4 local new_fourdir = (dirs[dir_fourdir] + node.param2) % 4
return minetest.fourdir_to_dir(new_fourdir) return minetest.fourdir_to_dir(new_fourdir)
end end
local CURVE_RAIL_DIRS = { [0] = 1, 1, 2, 2, }
local function rail_dir_curve(pos, dir, node)
return rail_dir_from_table(pos, dir, node, CURVE_RAIL_DIRS)
end
local function rail_dir_tee_off(pos, dir, node) local function rail_dir_tee_off(pos, dir, node)
dir = vector.new(dir.x, 0, dir.z) return rail_dir_from_table(pos, dir, node, CURVE_RAIL_DIRS)
if node.param2 == 0 then -- north
-- South and East
if vector.equals(dir, south) then return south end
if vector.equals(dir, north) then return east end
if vector.equals(dir, west) then return south end
if vector.equals(dir, east) then return east end
elseif node.param2 == 1 then -- east
-- South and West
if vector.equals(dir, south) then return south end
if vector.equals(dir, north) then return west end
if vector.equals(dir, west) then return west end
if vector.equals(dir, east) then return south end
elseif node.param2 == 2 then
-- North and West
if vector.equals(dir, south) then return west end
if vector.equals(dir, north) then return north end
if vector.equals(dir, west) then return west end
if vector.equals(dir, east) then return north end
elseif node.param2 == 3 then
-- North and East
if vector.equals(dir, south) then return east end
if vector.equals(dir, north) then return north end
if vector.equals(dir, west) then return north end
if vector.equals(dir, east) then return east end
end
end end
local TEE_RAIL_ON_DIRS = { [0] = 0, 1, 1, 0 }
local function rail_dir_tee_on(pos, dir, node) local function rail_dir_tee_on(pos, dir, node)
dir = vector.new(dir.x, 0, dir.z) return rail_dir_from_table(pos, dir, node, TEE_RAIL_ON_DIRS)
if node.param2 == 0 then -- north
-- South and East
if vector.equals(dir, south) then return east end
if vector.equals(dir, north) then return north end
if vector.equals(dir, west) then return north end
if vector.equals(dir, east) then return east end
elseif node.param2 == 1 then -- east
-- South and West
if vector.equals(dir, south) then return south end
if vector.equals(dir, north) then return east end
if vector.equals(dir, west) then return south end
if vector.equals(dir, east) then return east end
elseif node.param2 == 2 then
-- North and West
if vector.equals(dir, south) then return south end
if vector.equals(dir, north) then return west end
if vector.equals(dir, west) then return west end
if vector.equals(dir, east) then return south end
elseif node.param2 == 3 then
-- North and East
if vector.equals(dir, south) then return west end
if vector.equals(dir, north) then return north end
if vector.equals(dir, west) then return west end
if vector.equals(dir, east) then return north end
end
end end
local function rail_dir_cross(pos, dir, node) local function rail_dir_cross(pos, dir, node)
dir = vector.new(dir.x, 0, dir.z) dir = vector.new(dir.x, 0, dir.z)