eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-02 06:59:13 +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 18:53:48 +01:00
parent 0bc29af650 6aed9ec5bd
commit 24b805b348
15 changed files with 807 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vehicle/DynObj.cpp
View File

@@ -3642,6 +3642,7 @@ bool TDynamicObject::Update(double dt, double dt1)
if( dRailLength > 0.0 ) {
for( auto &axle : m_axlesounds ) {
axle.distance = axle.offset;
axle.atjoints = false;
}
}
dRailLength = MyTrack->fSoundDistance;
@@ -3675,10 +3676,23 @@ bool TDynamicObject::Update(double dt, double dt1)
1 :
ctOwner->Vehicle()->DirectionGet() == DirectionGet() ? 1 : -1 ) };
for( auto &axle : m_axlesounds ) {
axle.distance += dDOMoveLen * directioninconsist;
if( axle.distance < 0
|| axle.distance > dRailLength ) {
axle.distance = clamp_circular( axle.distance, dRailLength );
// 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( 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;
@@ -8050,6 +8064,12 @@ TDynamicObject::update_shake( double const Timedelta ) {
-MoverParameters->AccN * Timedelta * 5.0 * Global.ShakingMultiplierRL, // highlight side sway
-MoverParameters->AccVert * Timedelta * Global.ShakingMultiplierUD,
-MoverParameters->AccSVBased * Timedelta * 1.5 * Global.ShakingMultiplierBF); // accent acceleration/deceleration
// unevenness of the track under the outer axles
auto const ride { 0.5 * ( Axle0.UnevenBend() + Axle1.UnevenBend() ) * ( MoverParameters->V * MoverParameters->V ) };
shakevector += glm::dvec3(
-glm::dot( ride, vLeft ) * Timedelta * 5.0 * Global.ShakingMultiplierRL,
-ride.y * Timedelta * Global.ShakingMultiplierUD,
0.0 );
}
auto shake { 1.25 * ShakeSpring.ComputateForces( shakevector, ShakeState.offset ) };