diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-26 16:46:38 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-26 16:46:38 +0100 |
| commit | 6dc109a8d248540c6674b863e3e4655d079528d8 (patch) | |
| tree | 50b2681907cde3560dadfc874cdc82170f583175 | |
| parent | 6fb68454d5cb5fca175e1f0741fdfc03b08a9185 (diff) | |
Remove unnecessary coord sys transformation to fix moon positioning.
Avoid doing sky texture generation when using atmospherics shaders (which don't need that texture anyway).
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 44bb9fc6f5..646b317325 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -525,12 +525,7 @@ void LLSettingsVOSky::updateSettings() F32 sun_dynamic_range = llmax(gSavedSettings.getF32("RenderSunDynamicRange"), 0.0001f); mSceneLightStrength = 2.0f * (1.0f + sun_dynamic_range * dp); - // Axis swaps convert from "normal" (+x right, +z up, +y at) - // to CFR (+x at, +z up, +y right) coord sys - LLVector3 sun_direction_cfr(sun_direction.mV[1], sun_direction.mV[0], sun_direction.mV[2]); - LLVector3 moon_direction_cfr(moon_direction.mV[1], moon_direction.mV[0], moon_direction.mV[2]); - - gSky.setSunAndMoonDirectionsCFR(sun_direction_cfr, moon_direction_cfr); + gSky.setSunAndMoonDirectionsCFR(sun_direction, moon_direction); gSky.setSunTextures(getSunTextureId(), getNextSunTextureId()); gSky.setMoonTextures(getMoonTextureId(), getNextMoonTextureId()); gSky.setCloudNoiseTextures(getCloudNoiseTextureId(), getNextCloudNoiseTextureId()); diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 4c84e40c73..017ae9dd09 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -647,7 +647,7 @@ bool LLVOSky::updateSky() mForceUpdate = mForceUpdate || color_changed; mForceUpdate = mForceUpdate || !mInitialized; - if (mForceUpdate) + if (mForceUpdate && !gPipeline.canUseWindLightShaders()) { LL_RECORD_BLOCK_TIME(FTM_VOSKY_UPDATEFORCED) |