eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 02:49:19 +02:00
Code Issues 150 Wiki Activity

fix(sweep): local named near renamed, MSVC takes near for the empty macro of windows.h and fails on the syntax

Browse Source
This commit is contained in:
maj00r
2026-10-08 08:51:06 +02:00
parent b02fe0ac2b
commit 35a59c7cf2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
world/Sweep.cpp
View File

@@ -594,12 +594,12 @@ void sweep_node::beside_switches(std::vector<sample> &Samples)
} }
if (best > sample_spacing) if (best > sample_spacing)
continue; continue;
auto const &near{Samples[at]}; auto const &closest_sample{Samples[at]};
auto const along{plan(near.tangent)}; auto const along{plan(closest_sample.tangent)};
glm::dvec3 const toward{points.x - near.position.x, 0.0, points.z - near.position.z}; glm::dvec3 const toward{points.x - closest_sample.position.x, 0.0, points.z - closest_sample.position.z};
if (std::abs(glm::dot(toward, glm::dvec3{-along.z, 0.0, along.x})) > 0.05) if (std::abs(glm::dot(toward, glm::dvec3{-along.z, 0.0, along.x})) > 0.05)
continue; continue;
auto const s0{near.station + glm::dot(toward, along)}; auto const s0{closest_sample.station + glm::dot(toward, along)};
for (auto const &path : track->m_paths) for (auto const &path : track->m_paths)
{ {
auto const heading{glm::dot(plan_heading(path, 0.0), along)}; auto const heading{glm::dot(plan_heading(path, 0.0), along)};