eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-31 13:29:07 +01:00
Code Issues 155 Wiki Activity

refactor(editor): the layouts laid from a free end (arc then straight, straight then arc, arc, straight) and the transition curve out of a curved neighbour in editor_track; joining and laying through points share the eased ends, the room check and the assembly of the pieces instead of two copies

Browse Source
This commit is contained in:
maj00r
2026-10-11 22:09:53 +02:00
parent c5ac698702
commit 4030797b21
4 changed files with 221 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/editorTrack.hpp
View File

@@ -152,6 +152,29 @@ class editor_track
};
static middle_point middle(TTrack const &Track);
enum class layout
{
arc_straight,
straight_arc,
arc,
straight
};
static std::vector<segment_data> layout_pieces(layout const Kind, glm::dvec3 const &Point, glm::dvec2 const &Direction, double const Grade, glm::dvec3 const &Target, double const Radius);
// the curve a track ends with at Joint, as it goes on beyond the joint, and a transition curve leading out of it to the straight
struct easing
{
double curvature{0.0}; // positive turning from x towards z
double length{0.0};
glm::dvec3 end{0.0};
glm::dvec2 direction{0.0};
std::vector<segment_data> pieces;
};
static easing ease_out_of(TTrack const &Neighbour, glm::dvec3 const &Joint, double const Grade, double const Speed, alignment::limits const &Limits);
static bool eases_room(easing const &In, easing const &Out, glm::dvec3 const &Start, glm::dvec2 const &Startdirection, glm::dvec3 const &End, glm::dvec2 const &Enddirection);
static std::vector<segment_data> eased_pieces(easing const &In, std::vector<segment_data> const &Middle, easing const &Out);
static double eased_length(easing const &In, double const Middle, easing const &Out);
struct edit
{
std::vector<std::pair<TTrack *, state>> states;