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

feat(editor): the plain straight a switch branch leads into gets its end moved to where the branch lands instead of a short straight being added: shortened when it reaches past, lengthened when it ends short; straights drawn with handles count (the trimmed end loses them), so a switch slid up to a track that ends close to the crossing now places

Browse Source
This commit is contained in:
maj00r
2026-10-12 00:36:13 +02:00
parent b27d1772a7
commit 704511fe5e
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editorTrack.hpp
View File

@@ -221,13 +221,14 @@ class editor_track
double shortfall{0.0};
bool reverse{false};
double insert{0.0};
glm::dvec3 landing{0.0};
std::vector<segment_data> pieces;
};
static double branch_radius(segment_data const &Diverging);
static double reverse_insert(double const Speed);
static double diverging_speed(double const Radius);
static std::optional<double> branch_shift(branch_end const &From, glm::dvec2 const &Slide, double const Radius, branch_end const &To, double const Kink);
static branch_link link_branch(branch_end const &From, double const Radius, branch_end const &To, double const Kink, double const Insert);
static branch_link link_branch(branch_end const &From, double const Radius, branch_end const &To, double const Kink, double const Insert, bool const Stretch);
struct snap_target
{

7
editor/editorTrackShape.cpp
View File

@@ -497,7 +497,7 @@ std::optional<double> editor_track::branch_shift(branch_end const &From, glm::dv
return cross(tangent, gap) / determinant;
}
editor_track::branch_link editor_track::link_branch(branch_end const &From, double const Radius, branch_end const &To, double const Kink, double const Insert)
editor_track::branch_link editor_track::link_branch(branch_end const &From, double const Radius, branch_end const &To, double const Kink, double const Insert, bool const Stretch)
{
branch_link result;
if (glm::length(From.direction) < 1e-9 || glm::length(To.direction) < 1e-9 || Radius < 1.0)
@@ -555,7 +555,7 @@ editor_track::branch_link editor_track::link_branch(branch_end const &From, doub
return result;
}
}
if (result.after < -0.01)
if (result.after < -0.01 || (Stretch && result.after >= 0.01))
{
result.trim = -result.after;
result.after = 0.0;
@@ -592,7 +592,7 @@ editor_track::branch_link editor_track::link_branch(branch_end const &From, doub
result.pieces.back().points[segment_data::point::end] = {target.x, 0.0, target.y};
if (false == result.pieces.empty())
{
auto const height1{result.trim > 0.0 ? To.position.y + To.grade * result.trim : To.position.y};
auto const height1{To.position.y + To.grade * result.trim};
ground_follow::follow(result.pieces, {From.position.y, From.grade, height1, To.grade}, [](std::vector<glm::dvec3> const &Points, std::vector<glm::dvec2> const &) { return std::vector<double>(Points.size(), std::numeric_limits<double>::quiet_NaN()); });
std::vector<double> lengths;
double total{0.0};
@@ -607,6 +607,7 @@ editor_track::branch_link editor_track::link_branch(branch_end const &From, doub
result.pieces[i].rolls = {static_cast<float>(from), static_cast<float>(to)};
}
}
result.landing = result.pieces.empty() ? From.position : result.pieces.back().points[segment_data::point::end];
result.valid = true;
return result;
}