eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-02 09:19:12 +01:00
Code Issues 157 Wiki Activity

fix(editor): a long arc of a larger radius kept as a part of a compound curve, only short arcs of growing radius taken for the transition curve of an old scenery

Browse Source
This commit is contained in:
maj00r
2026-10-08 00:51:29 +02:00
parent 110c99a155
commit ca208b3ed1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/editorTrack.cpp
View File

@@ -1453,9 +1453,19 @@ bool editor_track::analyse_curve(std::vector<std::pair<TTrack *, bool>> const &R
Curve.cant = std::max(Curve.cant, Gauge * std::sin(std::abs(glm::radians(static_cast<double>(roll))))); Curve.cant = std::max(Curve.cant, Gauge * std::sin(std::abs(glm::radians(static_cast<double>(roll)))));
} }
auto const peak{*std::max_element(curvatures.begin(), curvatures.end())}; auto const peak{*std::max_element(curvatures.begin(), curvatures.end())};
for (std::size_t i = 0; i < run.size(); ++i) // old sceneries make a transition of short arcs of growing radius, a longer arc of a larger radius is a part of a compound curve
if (curvatures[i] < 0.9 * peak) constexpr double kShortestCompoundArc{30.0};
varying[i] = true; for (std::size_t first = 0; first < run.size();)
{
auto last{first + 1};
while (last < run.size() && false == varying[first] && false == varying[last] && std::abs(curvatures[last] - curvatures[first]) <= 0.05 * curvatures[first])
++last;
auto const length{std::accumulate(lengths.begin() + first, lengths.begin() + last, 0.0)};
if (curvatures[first] < 0.9 * peak && (varying[first] || length < kShortestCompoundArc || curvatures[first] < 0.1 * peak))
for (auto i = first; i < last; ++i)
varying[i] = true;
first = last;
}
double smallest{0.0}; double smallest{0.0};
for (std::size_t i = 0; i < run.size(); ++i) for (std::size_t i = 0; i < run.size(); ++i)
if (false == varying[i] && curvatures[i] > 0.0 && (smallest == 0.0 || 1.0 / curvatures[i] < smallest)) if (false == varying[i] && curvatures[i] > 0.0 && (smallest == 0.0 || 1.0 / curvatures[i] < smallest))