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

feat(track): the blades of the switches laid in the editor shaped from their templates with the frogs still whole: the blades alone are on (track_features::blades), the rails cut at the frogs, the wing and the check rails stay off. A switch with the key frogs draws its blades from the tip where their planed nose ends to the heel, bent as they're thrown, the rail behind them from the heel on, where they were laid from the start of the switch before; on a switch of the catalogue they start at the cut tip of the tables, 1.248 m from the joint at R 190, 1.5 m at R 300. The plain track a blade of a double switch runs on into starts its rail behind the heel. The switches without the key, laid by other tools, and the ones of a double slip, whose blades end short of crossings found only with the rails cut, keep the blades they had. The paths the vehicles run on don't change

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

17
world/RailCrossings.cpp
View File

@@ -96,6 +96,19 @@ bool cut_rails( TTrack const &Track ) {
Track.eType == tt_Switch && Track.SwitchExtension && Track.SwitchExtension->m_frogs && Track.SwitchExtension->Segments[ 0 ] && Track.SwitchExtension->Segments[ 1 ] );
}
bool shaped_blades( TTrack const &Track ) {
if( cut_rails( Track ) ) {
return true;
}
return track_features::blades
&& ( Track.iCategoryFlag & 15 ) == 1
&& Track.m_material1 != null_handle
&& false == Track.m_editorremoved
&& Track.eType == tt_Switch && Track.SwitchExtension && Track.SwitchExtension->m_frogs && Track.SwitchExtension->Segments[ 0 ] && Track.SwitchExtension->Segments[ 1 ]
&& false == Track.DoubleSlip();
}
int blade_steps( TTrack const &Track, int const Path ) {
return static_cast<int>( std::ceil( Track.SwitchExtension->Segments[ Path ]->RaSegCount() * 0.65 ) );
@@ -131,7 +144,7 @@ TTrack const *runon_track( TTrack const &Switch, int const Path ) {
double blade_runon( TTrack const &Track, int const Side ) {
auto const *owner { Track.trPrev };
if( Track.eType != tt_Normal || Track.Segment == nullptr || owner == nullptr || owner->eType != tt_Switch || false == cut_rails( *owner ) ) {
if( Track.eType != tt_Normal || Track.Segment == nullptr || owner == nullptr || owner->eType != tt_Switch || false == shaped_blades( *owner ) ) {
return 0.0;
}
for( int path = 0; path < 2; ++path ) {
@@ -831,7 +844,7 @@ track_rails::switch_blade const &TTrack::blade( int const Path ) const {
}
cached = switch_blade {};
auto &result { *cached };
if( eType != tt_Switch || false == cut_rails( *this ) || m_profiles.empty() ) {
if( eType != tt_Switch || false == shaped_blades( *this ) || m_profiles.empty() ) {
return result;
}
auto const side { blade_side( Path ) };