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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2019-05-23 22:26:31 +02:00
parent c90b679f2d 39596c76ba
commit 480a9e6446
28 changed files with 775 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Globals.h
View File

@@ -74,7 +74,6 @@ struct global_settings {
bool bLiveTraction{ true };
float Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere
glm::vec3 FogColor = { 0.6f, 0.7f, 0.8f };
double fFogStart{ 1700 };
double fFogEnd{ 2000 };
std::string Season{}; // season of the year, based on simulation date
std::string Weather{ "cloudy:" }; // current weather
@@ -136,7 +135,8 @@ struct global_settings {
double fFpsMax{ 65.0 }; // górna granica FPS, przy której promień scenerii będzie zwiększany
// audio
bool bSoundEnabled{ true };
float AudioVolume{ 1.25f };
float AudioVolume{ 1.f };
float RadioVolume{ 0.75f };
int audio_max_sources = 30;
std::string AudioRenderer;
// input