eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications

Browse Source
This commit is contained in:
tmj-fstate
2018-01-31 16:07:50 +01:00
parent 6696a3536d
commit 23761dc665
20 changed files with 172 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Globals.cpp
View File

@@ -558,14 +558,14 @@ global_settings::ConfigParse(cParser &Parser) {
// color of the ui text. NOTE: will be obsolete once the real ui is in place
Parser.getTokens( 3, false );
Parser
>> UITextColor.x
>> UITextColor.y
>> UITextColor.z;
UITextColor.x = clamp( UITextColor.x, 0.0f, 255.0f );
UITextColor.y = clamp( UITextColor.y, 0.0f, 255.0f );
UITextColor.z = clamp( UITextColor.z, 0.0f, 255.0f );
>> UITextColor.r
>> UITextColor.g
>> UITextColor.b;
UITextColor.r = clamp( UITextColor.r, 0.0f, 255.0f );
UITextColor.g = clamp( UITextColor.g, 0.0f, 255.0f );
UITextColor.b = clamp( UITextColor.b, 0.0f, 255.0f );
UITextColor = UITextColor / 255.0f;
UITextColor.w = 1.0f;
UITextColor.a = 1.0f;
}
else if (token == "pyscreenrendererpriority")
{
@@ -704,7 +704,9 @@ global_settings::ConfigParse(cParser &Parser) {
// TBD: remove, or launch depending on passed flag?
if (qp)
{ // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini*/
#ifdef _WINDOWS
Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej
#endif
/*iFpsRadiusMax = 0.000025 * fFpsRadiusMax *
fFpsRadiusMax; // maksymalny promień renderowania 3000.0 -> 225
if (iFpsRadiusMax > 400)