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

feat(editor): the drive of a switch stands by the tips of its blades, not at the joint before them, and goes with the switch deleted. A drive placed, changed or carried along with its switch is set where the blades begin, as they're shaped or where the diverging track is broken at the tip of a planed blade, along the main track there, its heading and its tilt taken there; the drives the earlier versions of the editor set at the joints are moved there once, as the scenery is opened and the templates are known, with no step of the undo history, to be saved with it. Deleting a switch, a double switch or a set of tracks takes the drives of the switches along in the same step, Ctrl+Z brings them back. The joint before the blades and the tips of the blades of the switch being placed or the one selected are marked across the track in the view, so the tips seen on the photo aren't taken for the start of the switch. Selftests bladetips, drivetips; on a copy of test42 the drive of z1 went from the joint to 1.248 m, deleted with z1, back with Ctrl+Z

Browse Source
This commit is contained in:
maj00r
2026-10-26 20:40:37 +01:00
parent 3b43c71dbb
commit ef592e6479
9 changed files with 174 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editorTrack.hpp
View File

@@ -208,7 +208,12 @@ class editor_track
glm::dvec2 tilt{0.0};
bool rightswitch{false};
};
// the drive of the switch by the tips of its blades, where the rods throw them over
static std::optional<drive_spot> drive_spot_of(TTrack const &Switch);
// how far along the main track of the switch the tips of its blades lie, where the pre-blade stretch from the joint ends: as the
// blades are shaped, else where the diverging track is broken at the tip of a blade planed back from the start; 0 at the start
static double blade_tip_of(TTrack const &Switch);
static double blade_tip_of(segment_data const &Diverging);
struct straight_axis
{

30
editor/editorTrackShape.cpp
View File

@@ -299,6 +299,26 @@ glm::dvec3 editor_track::control_vector(TTrack const &Track, point_ref const &Co
return point_position(Track, Control) - point_position(Track, end_of(Control));
}
double editor_track::blade_tip_of(segment_data const &Diverging)
{
// the tip of a planed blade lies some metres from the start at most, a longer first piece is a part of the curve
if (Diverging.pieces.size() < 2)
return 0.0;
auto const length{bezier{Diverging.pieces.front()}.plan_length()};
return length < 5.0 ? length : 0.0;
}
double editor_track::blade_tip_of(TTrack const &Switch)
{
if (Switch.eType != tt_Switch || Switch.m_paths.size() < 2)
return 0.0;
double tip{0.0};
for (int path = 0; path < 2; ++path)
if (auto const &shape{Switch.blade(path)}; shape.valid && shape.tip > 0.0)
tip = tip > 0.0 ? std::min(tip, shape.tip) : shape.tip;
return tip > 0.0 ? tip : blade_tip_of(Switch.m_paths[1]);
}
std::optional<editor_track::drive_spot> editor_track::drive_spot_of(TTrack const &Switch)
{
if (Switch.eType != tt_Switch || Switch.m_paths.size() < 2)
@@ -306,8 +326,10 @@ std::optional<editor_track::drive_spot> editor_track::drive_spot_of(TTrack const
auto const &main{Switch.m_paths[0]};
auto const &diverging{Switch.m_paths[1]};
auto const start{main.points[segment_data::point::start]};
auto const &control{main.points[segment_data::point::control1]};
auto const along{control != glm::dvec3{} ? control : main.points[segment_data::point::end] - start};
// by the tips of the blades, not at the joint before them
bezier const curve{main};
auto const at{curve.parameter(blade_tip_of(Switch))};
auto const along{curve.first(at)};
auto heading{plan_of(along)};
if (glm::length(heading) < 1e-9)
return std::nullopt;
@@ -315,11 +337,11 @@ std::optional<editor_track::drive_spot> editor_track::drive_spot_of(TTrack const
glm::dvec2 const right{-heading.y, heading.x};
drive_spot spot;
spot.rightswitch = glm::dot(plan_of(diverging.points[segment_data::point::end] - start), right) > 0.0;
spot.location = start;
spot.location = curve.point(at);
auto const yaw{glm::degrees(std::atan2(heading.x, heading.y))};
spot.yaw = yaw < 0.0 ? yaw + 360.0 : yaw;
auto const run{glm::length(plan_of(along))};
auto const roll{static_cast<double>(main.rolls[0])};
auto const roll{glm::mix(static_cast<double>(main.rolls[0]), static_cast<double>(main.rolls[1]), at)};
spot.tilt = {-glm::degrees(std::atan(along.y / run)), roll};
if (Global.bRollFix)
spot.location.y += 0.75 * std::abs(std::sin(glm::radians(roll)));