Skip to content

Metrostroi.ScanTrack - check all the branches #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Metrostroi.ScanTrack - check all the branches #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions lua/metrostroi/sv_railnetwork.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,31 @@ function Metrostroi.ScanTrack(itype,node,func,x,dir,checked)
if node.branches and not ars then
for k,v in pairs(node.branches) do
if (v[1] >= min_x) and (v[1] <= max_x) then
-- FIXME: somehow define direction and X!
local results = {Metrostroi.ScanTrack(itype,v[2],func,v[1],true,checked)}
if results[1] ~= nil then return unpack(results) end
local check_dir_node1 = node
local check_dir_node2 = v[2]
if not check_dir_node1.next and check_dir_node1.id>1 then
check_dir_node1 = check_dir_node1.prev
end
if not check_dir_node2.next and check_dir_node2.id>1 then
check_dir_node2 = check_dir_node2.prev
end
local check_dir_distance = check_dir_node1.dir:Distance(check_dir_node2.dir)
if check_dir_distance <= 0.8 then
-- unidirectional
local results = {Metrostroi.ScanTrack(itype,check_dir_node2,func,check_dir_node2.x,dir,checked)}
if results[1] ~= nil then return unpack(results) end
elseif check_dir_distance >= 1.2 then
-- multidirectional
local results = {Metrostroi.ScanTrack(itype,check_dir_node2,func,check_dir_node2.x,not dir,checked)}
if results[1] ~= nil then return unpack(results) end
else
-- Perpendicular
-- Scanning in all directions of the X-shaped intersection
local results = {Metrostroi.ScanTrack(itype,check_dir_node2,func,check_dir_node2.x,true,checked)}
if results[1] ~= nil then return unpack(results) end
local results = {Metrostroi.ScanTrack(itype,check_dir_node2.prev,func,check_dir_node2.prev.x,false,checked)}
if results[1] ~= nil then return unpack(results) end
end
end
end
end
Expand Down Expand Up @@ -1699,4 +1721,4 @@ function Metrostroi.PrintStatistics()
local maxn,avgn = 0,0
for k,v in pairs(cells) do maxn = math.max(maxn,v) avgn = avgn + v end
print(Format("Metrostroi: Most nodes in cell: %d, average nodes in cell: %.2f",maxn,avgn/#cells))
end
end