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

feat(editor): the parallel track is a tool of its own (N) in the toolbar, its green preview only shows there, Shift+click on a straight in L opens it with that track; the norms are two buttons at the top of the Lay panel and of the Curve tool, shared by both, free hides the recommendations of the curve and its norm warnings, the duplicate transitions checkbox is gone; the Lay panel starts with the radius, the speed and the shape; the Tracks toolbar shows the tools that lay track, the ones that correct a line are under More (remembered); First steps ends with driving the track laid; self-test command tracktab

Browse Source
This commit is contained in:
maj00r
2026-10-12 01:52:28 +02:00
parent 7fea51ad06
commit c9f381a9c9
14 changed files with 187 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/editormode.h
View File

@@ -252,7 +252,7 @@ class editor_mode : public application_mode, private editor_track::observer
void render_help_menu();
void render_shortcuts_window();
bool m_shortcuts_open{false};
enum class first_step { tracks, lay, laid, wheel, join, turnout, undo, save, count };
enum class first_step { tracks, lay, laid, wheel, join, turnout, undo, save, drive, count };
void render_first_steps();
void first_step_done(first_step const Step);
bool m_first_steps_open{false};
@@ -837,7 +837,11 @@ class editor_mode : public application_mode, private editor_track::observer
bool digitize_drawn(std::vector<TTrack *> const &Created, bool const Alone = true);
bool digitize_chain(editor_track::chain const &Chain);
void render_route_stored();
void route_update() { m_route.result = alignment::compute(m_route.design); }
void route_update()
{
m_route.design.norms.checked = false == m_norms_free;
m_route.result = alignment::compute(m_route.design);
}
void route_apply();
bool route_relay_through_switches(editor_track::chain const &Chain, std::vector<std::pair<TTrack *, editor_track::state>> &States, std::vector<TTrack *> &Created, TTrack *&Last);
void route_recommend(alignment::vertex &Vertex) const;
@@ -1108,6 +1112,7 @@ class editor_mode : public application_mode, private editor_track::observer
lay_tool m_lay;
bool m_norms_free{true};
alignment::limits laying_norms() const;
bool render_norms_choice();
glm::dvec3 lay_angle_snap(glm::dvec3 const &Mouse) const;
void lay_after_history(bool const Undo);
void lay_back();
@@ -1193,7 +1198,7 @@ class editor_mode : public application_mode, private editor_track::observer
void update_build_tools();
void draw_build_overlay() const;
// modes of the track editor, one at a time: path is the plain selection
enum class track_tab { straights, route, path, turnout, profile, speed, joints, infra, lay, lineside, turntable, signals };
enum class track_tab { straights, route, path, turnout, profile, speed, joints, infra, lay, lineside, turntable, signals, parallel };
struct track_mode
{
char const *label;
@@ -1201,7 +1206,7 @@ class editor_mode : public application_mode, private editor_track::observer
track_tab tab;
char const *tooltip;
};
static std::array<track_mode, 12> const &track_modes();
static std::array<track_mode, 13> const &track_modes();
// the objects along the track: a tab for each tool
int m_lineside_tab{0};
void render_lineside_ui();