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

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-03-06 19:09:52 +01:00
parent 643e70d5cb 55ae503dbb
commit 84d610dc4d
19 changed files with 571 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Globals.h
View File

@@ -118,6 +118,7 @@ struct global_settings {
float SplineFidelity{ 1.f }; // determines segment size during conversion of splines to geometry
bool ResourceSweep{ true }; // gfx resource garbage collection
bool ResourceMove{ false }; // gfx resources are moved between cpu and gpu side instead of sending a copy
bool compress_tex{ true }; // all textures are compressed on gpu side
std::string asSky{ "1" };
bool bGlutFont{ false }; // czy tekst generowany przez GLUT32.DLL
double fFpsAverage{ 20.0 }; // oczekiwana wartosć FPS
@@ -168,7 +169,6 @@ struct global_settings {
std::string screenshot_dir;
bool loading_log = true;
bool dds_upper_origin = false;
bool compress_tex = true;
// methods
void LoadIniFile( std::string asFileName );