eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-06 03:28:37 +01:00
Code Issues 150 Wiki Activity

fix(editor): a track laid keeps in the scenery the design it was laid by, as it is, not its curves read from the paths again: read again a compound curve with transitions between its arcs came out another one, the plan showing it so. A track dragged from a free end, or laid on from one by the buttons, is no longer read either, nor the run of the tracks it joins with it, which put a design read so in the place of the one laid; the plan reads such curves when it's opened

Browse Source
This commit is contained in:
maj00r
2026-10-24 23:15:36 +02:00
parent 0577073926
commit 00f066ac33
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/editormodelay.cpp
View File

@@ -669,7 +669,6 @@ void editor_mode::finish_extend()
created.push_back(editor_track::create_path(*style, piece)); created.push_back(editor_track::create_path(*style, piece));
give_own_speed(created); give_own_speed(created);
editor_track::commit(created); editor_track::commit(created);
digitize_drawn(created);
auto const from{m_history.size()}; auto const from{m_history.size()};
push_track_snapshot({}, created); push_track_snapshot({}, created);
first_step_done(first_step::laid); first_step_done(first_step::laid);
@@ -705,7 +704,6 @@ void editor_mode::extend_add(int const Side)
for (auto const &piece : pieces) for (auto const &piece : pieces)
created.push_back(editor_track::create_path(*tool.track, piece)); created.push_back(editor_track::create_path(*tool.track, piece));
editor_track::commit(created); editor_track::commit(created);
digitize_drawn(created);
push_track_snapshot({}, created); push_track_snapshot({}, created);
m_node = created.back(); m_node = created.back();
ui()->set_node(m_node); ui()->set_node(m_node);
@@ -1404,7 +1402,8 @@ void editor_mode::lay_finish(editor_track::snap_target const &End)
lay_trim(); lay_trim();
double length; double length;
std::string error; std::string error;
auto const pieces{lay_pieces(tool.points, tool.modes, End, length, error)}; lay_line_plan plan;
auto const pieces{lay_pieces(tool.points, tool.modes, End, length, error, &plan)};
auto const eased{m_eased_last}; auto const eased{m_eased_last};
tool.status_time = ImGui::GetTime(); tool.status_time = ImGui::GetTime();
if (pieces.empty()) if (pieces.empty())
@@ -1427,7 +1426,11 @@ void editor_mode::lay_finish(editor_track::snap_target const &End)
created.push_back(style != nullptr ? editor_track::create_path(*style, piece) : editor_track::create_path(tool.style, piece)); created.push_back(style != nullptr ? editor_track::create_path(*style, piece) : editor_track::create_path(tool.style, piece));
give_own_speed(created); give_own_speed(created);
editor_track::commit(created); editor_track::commit(created);
digitize_drawn(created); // the scenery keeps the design the tracks were laid by, as it is, for the plan to edit; read from the paths again it wouldn't be
// the same, a compound curve with transitions between its arcs least of all. A track laid with no design of the line, between two
// free ends or back from one, keeps none: the plan reads its curves when it's opened
if (plan.shape.valid && false == created.empty() && false == scene::Layers.empty())
alignment_store::store(plan.design, plan.shape, 0.0, alignment_store::layer_of(*created.front()), "drawn");
if (tool.chain.empty()) if (tool.chain.empty())
tool.history = m_history.size(); tool.history = m_history.size();
push_track_snapshot({}, created); push_track_snapshot({}, created);