Merge branch 'tmj-dev'

This commit is contained in:
milek7
2018-02-16 15:25:53 +01:00
113 changed files with 4617 additions and 4057 deletions

View File

@@ -578,9 +578,9 @@ TTraction::wire_color() const {
}
color *= 0.2;
// w zaleźności od koloru swiatła
//color.r *= Global::daylight.ambient.x;
//color.g *= Global::daylight.ambient.y;
//color.b *= Global::daylight.ambient.z;
color.r *= Global.DayLight.ambient[ 0 ];
color.g *= Global.DayLight.ambient[ 1 ];
color.b *= Global.DayLight.ambient[ 2 ];
}
else {
// tymczasowo pokazanie zasilanych odcinków