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

build 180928. heater sound, minor precipitation tweaks, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-09-28 19:18:24 +02:00
parent 7c60829f54
commit 226ddb6291
8 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DynObj.cpp
View File

@@ -2157,7 +2157,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424"
btShutters1.Init( "shutters1", mdModel, false );
}
if( MoverParameters->dizel_heat.water_aux.config.shutters ) {
btShutters1.Init( "shutters2", mdModel, false );
btShutters2.Init( "shutters2", mdModel, false );
}
TurnOff(); // resetowanie zmiennych submodeli
@@ -3971,6 +3971,13 @@ void TDynamicObject::RenderSounds() {
sSmallCompressor.stop();
}
// heating sound
if( MoverParameters->Heating ) {
sHeater.play( sound_flags::exclusive | sound_flags::looping );
}
else {
sHeater.stop();
}
// brake system and braking sounds:
@@ -5393,6 +5400,12 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co
sConverter.owner( this );
}
else if( token == "heater:" ) {
// train heating device
sHeater.deserialize( parser, sound_type::single );
sHeater.owner( this );
}
else if( token == "turbo:" ) {
// pliki z turbogeneratorem
m_powertrainsounds.engine_turbo.deserialize( parser, sound_type::multipart, sound_parameters::range );
@@ -5827,7 +5840,7 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co
// other engine compartment sounds
auto const nullvector { glm::vec3() };
std::vector<sound_source *> enginesounds = {
&sConverter, &sCompressor, &sSmallCompressor
&sConverter, &sCompressor, &sSmallCompressor, &sHeater
};
for( auto sound : enginesounds ) {
if( sound->offset() == nullvector ) {