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

fix(vehicle): wheel clatter on an uneven track doesn't loop into a buzz

Browse Source 
The phase of the rails was wrapped to the rail length of the track the
vehicle is on, while an axle can be on a track with longer rails. From
then on every frame looked like a joint crossed.
This commit is contained in:
maj00r
2026-10-31 18:21:28 +01:00
parent e5266e1e6b
commit b2dcb8a42e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vehicle/DynObj.cpp
View File

@@ -3665,16 +3665,19 @@ bool TDynamicObject::Update(double dt, double dt1)
auto const railphase { Axle0.RailPhase( axle.offset - 0.5 * fAxleDist ) }; auto const railphase { Axle0.RailPhase( axle.offset - 0.5 * fAxleDist ) };
auto crossed { false }; auto crossed { false };
if( railphase >= 0.0 ) { if( railphase >= 0.0 ) {
crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * dRailLength; // 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; axle.distance = railphase;
} }
else { else {
axle.distance += dDOMoveLen * directioninconsist; axle.distance += dDOMoveLen * directioninconsist;
crossed = axle.distance < 0 || axle.distance > dRailLength; crossed = axle.distance < 0 || axle.distance > dRailLength;
if( crossed ) {
axle.distance = clamp_circular( axle.distance, dRailLength );
}
} }
axle.atjoints = ( railphase >= 0.0 ); axle.atjoints = ( railphase >= 0.0 );
if( crossed ) { if( crossed ) {
axle.distance = clamp_circular( axle.distance, dRailLength );
if( MoverParameters->Vel > 0.1 ) { 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 // 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; auto const frequency = true == axle.clatter.is_combined() ? MoverParameters->Vel * 0.01 : 1.0;