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

fix(editor): the route design keeps its whole fragment after Apply: the last path of the line is the one holding the last piece, not the original end path holding the first piece of its group, so a second Apply (e.g. after changing the share of a compound curve) no longer re-lays only the front part and leaves the old tail lying next to the new paths; the same for the curve laid with the straight tool

Browse Source
This commit is contained in:
maj00r
2026-10-11 17:46:38 +02:00
parent 11aa67378d
commit 3b503ede0c
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editorTrack.cpp
View File

@@ -2912,7 +2912,7 @@ void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start,
}
}
std::vector<TTrack *> editor_track::relay(chain const &Chain, std::vector<segment_data> const &Pieces)
std::vector<TTrack *> editor_track::relay(chain const &Chain, std::vector<segment_data> const &Pieces, TTrack **Last)
{
std::vector<TTrack *> created;
auto const count{Chain.tracks.size()};
@@ -2943,6 +2943,8 @@ std::vector<TTrack *> editor_track::relay(chain const &Chain, std::vector<segmen
tracks.push_back(track);
}
commit(tracks);
if (Last != nullptr)
*Last = tracks.back();
return created;
}

2
editor/editorTrack.hpp
View File

@@ -326,7 +326,7 @@ class editor_track
static TTrack *create_switch(switch_template const &Template, std::vector<segment_data> const &Paths, TTrack const &Style, std::string const &Name = {});
static TTrack *create_turntable(segment_data const &Path, TTrack const *Style, std::string const &Name);
static void move_straights(std::vector<straight> const &Lines, std::vector<std::pair<glm::dvec3, glm::dvec3>> const &Ends);
static std::vector<TTrack *> relay(chain const &Chain, std::vector<segment_data> const &Pieces);
static std::vector<TTrack *> relay(chain const &Chain, std::vector<segment_data> const &Pieces, TTrack **Last = nullptr);
static void retire(TTrack &Track);
static std::string material_name(material_handle const Material);