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 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2019-05-23 23:02:34 +02:00
parent b40505715b 480a9e6446
commit f69d722a23
26 changed files with 726 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Globals.h
View File

@@ -76,7 +76,7 @@ struct global_settings {
float FrictionWeatherFactor { 1.f };
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 };
glm::vec3 FogColor = { 0.6f, 0.7f, 0.8f };
double fFogEnd{ 2000 };
std::string Season{}; // season of the year, based on simulation date
std::string Weather{ "cloudy:" }; // current weather
@@ -136,7 +136,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