Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -612,7 +612,6 @@ void CTimeOfDay::UpdateEnvLighting(bool forceUpdate)

        // Calculating the energy multiplier where mid-day sun is 1.0 and night is 0
        const float noonTime = 12.0f;
-        float   dayTime = p3DEngine->m_duskEnd - p3DEngine->m_dawnStart;

        if (m_fTime <= noonTime)
        {
@@ -911,7 +910,6 @@ void CTimeOfDay::MigrateLegacyData(bool bSunIntensity, const XmlNodeRef& node)
            varHDRPower.pInterpolator->InterpolateFloat(time, hdrPower);

            const float HDRDynamicMultiplier = 2.0f;
-            float hdrMult = powf(HDRDynamicMultiplier, hdrPower);
            float sunColorLum = sunColor[0] * 0.2126f + sunColor[1] * 0.7152f + sunColor[2] * 0.0722f;
            float sunIntensity = sunMult * sunColorLum * 10000.0f * gf_PI;