Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-18 16:32:32 +02:00
Code Issues Projects Releases Activity

Added mix() for ints, as it doesn't exist in newer versions of GLM.

Browse Source
This commit is contained in:
Timmy Sjöstedt 2013-09-10 22:12:59 +02:00
parent 2f9d8192aa
commit f2f80eb3be
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framework2/WeatherLoader.cpp
View File

@ -68,8 +68,14 @@ GTATypes::RGB mix(GTATypes::RGB x, GTATypes::RGB y, float a)
return n;
}
int32_t mixint(int32_t x, int32_t y, float a)
{
return x * (1.f - a) + y * a;
}
#define MIXPROP(prop) data.prop = mix(x.prop, y.prop, a)
#define MIXPROP2(prop) data.prop = glm::mix(x.prop, y.prop, a)
#define MIXPROP_INT(prop) data.prop = mixint(x.prop, y.prop, a)
WeatherLoader::WeatherData WeatherLoader::getWeatherData(WeatherCondition cond, float tod)
{
@ -87,9 +93,9 @@ WeatherLoader::WeatherData WeatherLoader::getWeatherData(WeatherCondition cond,
MIXPROP2(sunCoreSize);
MIXPROP2(sunCoronaSize);
MIXPROP2(sunBrightness);
MIXPROP2(shadowIntensity);
MIXPROP2(lightShading);
MIXPROP2(poleShading);
MIXPROP_INT(shadowIntensity);
MIXPROP_INT(lightShading);
MIXPROP_INT(poleShading);
MIXPROP2(farClipping);
MIXPROP2(fogStart);
MIXPROP2(amountGroundLight);