eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-18 18:29:40 +02:00
Code Issues 151 Wiki Activity

fix(editor): a track lengthened past 90 degrees goes on as new tracks instead of hidden paths

Browse Source 
A regular track draws and saves only its first path; the pieces of a lengthened curve past the first
are now tracks of their own, made and dropped while dragging, taken back by one undo.
This commit is contained in:
maj00r
2026-10-11 13:06:45 +02:00
parent 89678ead3e
commit b486eb33d5
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/editormode.h
View File

@@ -656,6 +656,7 @@ class editor_mode : public application_mode, private editor_track::observer
std::vector<std::pair<TTrack *, editor_track::point_ref>> partners; std::vector<std::pair<TTrack *, editor_track::point_ref>> partners;
glm::dvec3 fixed{0.0}; glm::dvec3 fixed{0.0};
std::vector<std::pair<TTrack *, std::vector<int>>> held; std::vector<std::pair<TTrack *, std::vector<int>>> held;
std::vector<TTrack *> extra;
}; };
track_gizmo_drag m_track_gizmo_drag; track_gizmo_drag m_track_gizmo_drag;
gizmo_operation track_gizmo_operation(TTrack const &Track, bool const Pointmode) const; gizmo_operation track_gizmo_operation(TTrack const &Track, bool const Pointmode) const;

39
application/editormodetrack.cpp
View File

@@ -592,6 +592,39 @@ void editor_mode::track_gizmo_stretch(TTrack &Track, double const Length)
for (auto &joint : joints) for (auto &joint : joints)
joint.own = stretch_remap(joint.own, drag.path, drag.pieces); joint.own = stretch_remap(joint.own, drag.path, drag.pieces);
editor_track::follow(Track, joints); editor_track::follow(Track, joints);
std::vector<segment_data> rest;
if (Track.eType == tt_Normal && pieces.size() > 1)
{
auto const first{Track.m_paths.begin() + drag.path};
auto const keep{drag.atend ? first : first + (pieces.size() - 1)};
for (auto piece = first; piece != first + pieces.size(); ++piece)
if (piece != keep)
rest.push_back(*piece);
auto const kept{*keep};
Track.m_paths.erase(first, first + pieces.size());
Track.m_paths.insert(Track.m_paths.begin() + drag.path, kept);
if (drag.point.valid())
m_track_point = drag.point;
}
while (drag.extra.size() > rest.size())
{
auto *surplus{drag.extra.back()};
drag.extra.pop_back();
m_track_drag.erase(std::remove(m_track_drag.begin(), m_track_drag.end(), surplus), m_track_drag.end());
editor_track::retire(*surplus);
}
for (std::size_t i = 0; i < rest.size(); ++i)
{
if (i < drag.extra.size())
{
drag.extra[i]->m_paths = {rest[i]};
continue;
}
auto *created{editor_track::create_path(Track, rest[i])};
drag.extra.push_back(created);
m_track_drag.push_back(created);
editor_track::commit({created});
}
m_track_dirty = true; m_track_dirty = true;
} }
@@ -728,6 +761,12 @@ void editor_mode::track_gizmo_end(TTrack &Track)
m_track_dirty = true; m_track_dirty = true;
m_track_snap = {}; m_track_snap = {};
commit_track_drag(true); commit_track_drag(true);
if (false == m_track_gizmo_drag.extra.empty() && false == m_history.empty())
{
auto &created{m_history.back().created};
created.insert(created.end(), m_track_gizmo_drag.extra.begin(), m_track_gizmo_drag.extra.end());
m_track_gizmo_drag.extra.clear();
}
m_track_gizmo_using = false; m_track_gizmo_using = false;
m_track_drag.clear(); m_track_drag.clear();
m_track_drag_points.clear(); m_track_drag_points.clear();