eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 20:39:18 +02:00
Code Issues 123 Wiki Activity

Added sound of working retarder

Browse Source
This commit is contained in:
Królik Uszasty
2021-02-13 23:52:53 +01:00
parent 3d15cf3672
commit 6bceaa536e
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
DynObj.cpp
View File

@@ -6064,7 +6064,11 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co
m_powertrainsounds.rsEngageSlippery.m_frequencyfactor /= ( 1 + MoverParameters->nmax ); m_powertrainsounds.rsEngageSlippery.m_frequencyfactor /= ( 1 + MoverParameters->nmax );
} }
else if( token == "linebreakerclose:" ) { else if (token == "retarder:") {
m_powertrainsounds.retarder.deserialize(parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency);
m_powertrainsounds.retarder.owner(this);
}
else if( token == "linebreakerclose:" ) {
m_powertrainsounds.linebreaker_close.deserialize( parser, sound_type::single ); m_powertrainsounds.linebreaker_close.deserialize( parser, sound_type::single );
m_powertrainsounds.linebreaker_close.owner( this ); m_powertrainsounds.linebreaker_close.owner( this );
} }
@@ -7297,7 +7301,7 @@ TDynamicObject::powertrain_sounds::position( glm::vec3 const Location ) {
&inverter, &inverter,
&motor_relay, &dsbWejscie_na_bezoporow, &motor_parallel, &motor_shuntfield, &rsWentylator, &motor_relay, &dsbWejscie_na_bezoporow, &motor_parallel, &motor_shuntfield, &rsWentylator,
&engine, &engine_ignition, &engine_shutdown, &engine_revving, &engine_turbo, &oil_pump, &fuel_pump, &water_pump, &water_heater, &radiator_fan, &radiator_fan_aux, &engine, &engine_ignition, &engine_shutdown, &engine_revving, &engine_turbo, &oil_pump, &fuel_pump, &water_pump, &water_heater, &radiator_fan, &radiator_fan_aux,
&transmission, &rsEngageSlippery &transmission, &rsEngageSlippery, &retarder
}; };
for( auto sound : enginesounds ) { for( auto sound : enginesounds ) {
if( sound->offset() == nullvector ) { if( sound->offset() == nullvector ) {
@@ -7564,6 +7568,21 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub
rsEngageSlippery.stop(); rsEngageSlippery.stop();
} }
if (Vehicle.hydro_R) {
float speed = std::abs(Vehicle.hydro_R_Fill * Vehicle.hydro_R_n);
retarder
.pitch(retarder.m_frequencyoffset + speed * retarder.m_frequencyfactor)
.gain(retarder.m_amplitudeoffset + Vehicle.hydro_R_Fill * retarder.m_amplitudefactor);
if (retarder.gain() > 0.01) {
retarder.play(sound_flags::exclusive | sound_flags::looping);
}
else {
retarder.stop();
}
}
// motor sounds // motor sounds
volume = 0.0; volume = 0.0;
if( false == motors.empty() ) { if( false == motors.empty() ) {

1
DynObj.h
View File

@@ -404,6 +404,7 @@ private:
sound_source radiator_fan_aux { sound_placement::engine }; sound_source radiator_fan_aux { sound_placement::engine };
sound_source transmission { sound_placement::engine }; sound_source transmission { sound_placement::engine };
sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab
sound_source retarder { sound_placement::engine };
void position( glm::vec3 const Location ); void position( glm::vec3 const Location );
void render( TMoverParameters const &Vehicle, double const Deltatime ); void render( TMoverParameters const &Vehicle, double const Deltatime );