mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-29 01:07:28 +01:00
feat(editor): laid to the norms, a track laid on from an end gets its transition curves, into the arc, between the arcs of a compound curve and out to the straight
A track laid on from a free end in the PKP PLK laying, by a drag out of the end, by clicks from it or laid back onto it, starts from the curvature and the cant the end has. An arc turning the same way as the end is a compound curve: a transition of the norms ramps the curvature and the cant from the one arc into the other. From a straight the arc gets its entry transition, the arc then straight its exit one. Where the way is too short the transitions are cut and the cant lowered to what they ramp, and the readout says so; with no room at all the track is laid as before and the note says why. The curves traced on the orthophoto and the recommended values of a compound curve get the transitions between their arcs too. The free laying stays as it was.
This commit is contained in:
@@ -1482,6 +1482,10 @@ class editor_mode : public application_mode, private editor_track::observer, pri
|
||||
TTrack const *m_join_track{nullptr};
|
||||
editor_track::point_ref m_join_point;
|
||||
mutable alignment::join_result m_join_last;
|
||||
// the layout laid on from the end of From with the transition curves of the norms; none in the free laying, or where it doesn't fit
|
||||
std::optional<alignment::lay_result> eased_layout(TTrack const *From, glm::dvec3 const &Point, glm::dvec2 const &Direction, glm::dvec3 const &Target, double const Radius) const;
|
||||
mutable std::optional<alignment::lay_result> m_eased_last;
|
||||
mutable std::optional<std::pair<alignment::lay_request, std::optional<alignment::lay_result>>> m_eased_cache;
|
||||
bool track_wheel(double const Offset);
|
||||
// a touchpad sends fractions of a notch: a choice moves a step for each whole notch gathered, and only one in a gesture when
|
||||
// Gesture; a pause, another key or the other way starts over
|
||||
|
||||
Reference in New Issue
Block a user