eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-02 09:19:12 +01:00
Code Issues 157 Wiki Activity

Merge remote-tracking branch 'origin/feat/track-uneven' into feat/renderers-cleanup

Browse Source
This commit is contained in:
Hirek
2026-10-31 19:52:29 +01:00
parent 154c42cb66 56d389e2df
commit 1ad6d8b2bd
15 changed files with 765 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
vehicle/DynObj.cpp
View File

@@ -3676,23 +3676,7 @@ bool TDynamicObject::Update(double dt, double dt1)
1 :
ctOwner->Vehicle()->DirectionGet() == DirectionGet() ? 1 : -1 ) };
for( auto &axle : m_axlesounds ) {
// on a track with dipping joints the clatter comes from them, elsewhere the axle counts a rail off itself
auto const railphase { Axle0.RailPhase( axle.offset - 0.5 * fAxleDist ) };
auto crossed { false };
if( railphase >= 0.0 ) {
// the rails under the axle, which aren't always those under the track the vehicle is on
crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * Axle0.GetTrack()->fSoundDistance;
axle.distance = railphase;
}
else {
axle.distance += dDOMoveLen * directioninconsist;
crossed = axle.distance < 0 || axle.distance > dRailLength;
if( crossed ) {
axle.distance = clamp_circular( axle.distance, dRailLength );
}
}
axle.atjoints = ( railphase >= 0.0 );
if( crossed ) {
if( axle_passed_joint( axle, dDOMoveLen, directioninconsist ) ) {
if( MoverParameters->Vel > 0.1 ) {
// NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range
auto const frequency = true == axle.clatter.is_combined() ? MoverParameters->Vel * 0.01 : 1.0;
@@ -8102,6 +8086,28 @@ TDynamicObject::update_shake( double const Timedelta ) {
}
}
bool
TDynamicObject::axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) {
// by the outer axle on its side of the vehicle: the two can be on different tracks
auto const &outer { Axle.offset >= 0.0 ? Axle0 : Axle1 };
auto const railphase { outer.RailPhase( Axle.offset - std::copysign( 0.5 * fAxleDist, Axle.offset ) ) };
if( railphase >= 0.0 ) {
// the rails under the axle, which aren't always those under the track the vehicle is on
auto const passed { Axle.atjoints && std::abs( railphase - Axle.distance ) > 0.5 * outer.GetTrack()->fSoundDistance };
Axle.distance = railphase;
Axle.atjoints = true;
return passed;
}
Axle.atjoints = false;
Axle.distance += Move * Direction;
if( Axle.distance >= 0 && Axle.distance <= dRailLength ) {
return false;
}
Axle.distance = clamp_circular( Axle.distance, dRailLength );
return true;
}
std::pair<double, double>
TDynamicObject::shake_angles() const {