diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-06-05 17:12:14 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-06-05 17:12:14 +0000 |
| commit | afb9c52a00d91c674d1cc48a7b16dd7e2db8cf8f (patch) | |
| tree | e5801dbc7b5ab6a1b7a354ec8072c70f56357be4 /indra/newview/llsettingsvo.cpp | |
| parent | d1ed4deba0a8d895a78c871b551b47c353d54ab8 (diff) | |
| parent | 25e6f789079e127fda89deb8e4b5debb3fe7d0b7 (diff) | |
Merged in SL-13084 (pull request #137)
SL-13084 [EEP] cloud texture is rendered backwards
Approved-by: Dave Houlton <euclid@lindenlab.com>
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index c72a0706cd..5a4427a7b7 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -678,8 +678,17 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force) { shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, light_direction.mV); + // Legacy? SETTING_CLOUD_SCROLL_RATE("cloud_scroll_rate") LLVector4 vect_c_p_d1(mSettings[SETTING_CLOUD_POS_DENSITY1]); - vect_c_p_d1 += LLVector4(LLEnvironment::instance().getCloudScrollDelta()); + LLVector4 cloud_scroll( LLEnvironment::instance().getCloudScrollDelta() ); + + // SL-13084 EEP added support for custom cloud textures -- flip them horizontally to match the preview of Clouds > Cloud Scroll + // Keep in Sync! + // * indra\newview\llsettingsvo.cpp + // * indra\newview\app_settings\shaders\class2\windlight\cloudsV.glsl + // * indra\newview\app_settings\shaders\class1\deferred\cloudsV.glsl + cloud_scroll[0] = -cloud_scroll[0]; + vect_c_p_d1 += cloud_scroll; shader->uniform4fv(LLShaderMgr::CLOUD_POS_DENSITY1, 1, vect_c_p_d1.mV); LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky(); |