eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 04:19:19 +02:00
Code Issues 121 Wiki Activity

build 200104. minor bug fixes, gfx renderer diagnostics enhancement

Browse Source
This commit is contained in:
tmj-fstate
2020-01-04 15:33:57 +01:00
parent 14699a96de
commit 93ef01142c
16 changed files with 166 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DynObj.cpp
View File

@@ -3801,12 +3801,14 @@ void TDynamicObject::RenderSounds() {
// NBMX dzwiek przetwornicy
if( MoverParameters->ConverterFlag ) {
frequency = (
MoverParameters->EngineType == TEngineType::ElectricSeriesMotor ?
( MoverParameters->PantographVoltage / MoverParameters->NominalVoltage ) * MoverParameters->RList[ MoverParameters->RlistSize ].Mn :
1.0 );
MoverParameters->EngineType != TEngineType::ElectricSeriesMotor ?
1.0 :
MoverParameters->PantographVoltage > 0.0 ?
MoverParameters->PantographVoltage / ( MoverParameters->NominalVoltage * MoverParameters->RList[ MoverParameters->RlistSize ].Mn ) :
1.0 );
frequency = sConverter.m_frequencyoffset + sConverter.m_frequencyfactor * frequency;
sConverter
.pitch( clamp( frequency, 0.5, 1.25 ) ) // arbitrary limits )
.pitch( clamp( frequency, 0.75, 1.25 ) ) // arbitrary limits )
.play( sound_flags::exclusive | sound_flags::looping );
}
else {
@@ -4208,13 +4210,13 @@ void TDynamicObject::RenderSounds() {
&& ( MoverParameters->Vel > 5.0 ) ) {
// scale volume with curve radius and vehicle speed
volume =
MoverParameters->AccN // * MoverParameters->AccN
std::abs( MoverParameters->AccN ) // * MoverParameters->AccN
* interpolate(
0.5, 1.0,
clamp(
MoverParameters->Vel / 40.0,
0.0, 1.0 ) )
* ( MyTrack->eType == tt_Switch ? 100.0 : 1.0 );
* ( ( ( MyTrack->eType == tt_Switch ) && ( std::abs( ts.R ) < 1500.0 ) ) ? 100.0 : 1.0 );
}
else {
volume = 0;