livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in graham_linden/viewer-eep-graham (pull request #96) 

SL-1176 and SL-9685
meow-7.2.2
Rider Linden 2018-09-18 20:05:35 +00:00
parent c5283f63ab 862b8f72dc
commit 030afe0aaa
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/deferred/sunDiscV.glsl
View File

@ -37,7 +37,7 @@ void calcAtmospherics(vec3 eye_pos);
void main()
{
//transform vertex
vec4 vert = vec4(position.xyz, 1.0);
vec4 vert = vec4(position.xyz - vec3(0, 0, 50), 1.0);
vec4 pos = modelview_projection_matrix*vert;
gl_Position = pos;

2
indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
View File

@ -37,7 +37,7 @@ void calcAtmospherics(vec3 eye_pos);
void main()
{
//transform vertex
vec4 vert = vec4(position.xyz, 1.0);
vec4 vert = vec4(position.xyz - vec3(0, 0, 50), 1.0);
vec4 pos = modelview_projection_matrix*vert;
gl_Position = pos;

4
indra/newview/lldrawpoolwater.cpp
View File

@ -76,10 +76,10 @@ void LLDrawPoolWater::setTransparentTextures(const LLUUID& transparentTextureId,
mWaterImagep[1]->addTextureStats(1024.f*1024.f);
}
void LLDrawPoolWater::setOpaqueTexture()
void LLDrawPoolWater::setOpaqueTexture(const LLUUID& opaqueTextureId)
{
LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(pwater->GetDefaultOpaqueTextureAssetId());
mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(opaqueTextureId);
mOpaqueWaterImagep->addTextureStats(1024.f*1024.f);
}

2
indra/newview/lldrawpoolwater.h
View File

@ -83,7 +83,7 @@ public:
void shade();
void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId);
void setOpaqueTexture();
void setOpaqueTexture(const LLUUID& opaqueTextureId);
void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId);
protected:

1
indra/newview/llsettingsvo.cpp
View File

@ -851,6 +851,7 @@ void LLSettingsVOWater::updateSettings()
if (pwaterpool)
{
pwaterpool->setTransparentTextures(getTransparentTextureID(), getNextTransparentTextureID());
pwaterpool->setOpaqueTexture(GetDefaultOpaqueTextureAssetId());
pwaterpool->setNormalMaps(getNormalMapID(), getNextNormalMapID());
}
}