Skip to content
Snippets Groups Projects
Commit 49a88c6f authored by David Parks's avatar David Parks
Browse files

SL-19560 Revert hacky fix for other avatars having low res BoM textures. Fix...

SL-19560 Revert hacky fix for other avatars having low res BoM textures.  Fix for brightening of PBR materials at the shadow horizon.
parent acc66558
No related branches found
No related tags found
No related merge requests found
...@@ -53,8 +53,11 @@ void main() ...@@ -53,8 +53,11 @@ void main()
vec4 pos = getPosition(pos_screen); vec4 pos = getPosition(pos_screen);
vec3 norm = getNorm(pos_screen); vec3 norm = getNorm(pos_screen);
frag_color.r = sampleDirectionalShadow(pos.xyz, norm, pos_screen); vec4 col;
frag_color.g = 1.0f; col.r = sampleDirectionalShadow(pos.xyz, norm, pos_screen);
frag_color.b = sampleSpotShadow(pos.xyz, norm, 0, pos_screen); col.g = 1.0f;
frag_color.a = sampleSpotShadow(pos.xyz, norm, 1, pos_screen); col.b = sampleSpotShadow(pos.xyz, norm, 0, pos_screen);
col.a = sampleSpotShadow(pos.xyz, norm, 1, pos_screen);
frag_color = clamp(col, vec4(0), vec4(1));
} }
...@@ -50,8 +50,11 @@ void main() ...@@ -50,8 +50,11 @@ void main()
vec4 pos = getPosition(pos_screen); vec4 pos = getPosition(pos_screen);
vec3 norm = getNorm(pos_screen); vec3 norm = getNorm(pos_screen);
frag_color.r = sampleDirectionalShadow(pos.xyz, norm, pos_screen); vec4 col;
frag_color.g = calcAmbientOcclusion(pos, norm, pos_screen); col.r = sampleDirectionalShadow(pos.xyz, norm, pos_screen);
frag_color.b = sampleSpotShadow(pos.xyz, norm, 0, pos_screen); col.g = calcAmbientOcclusion(pos, norm, pos_screen);
frag_color.a = sampleSpotShadow(pos.xyz, norm, 1, pos_screen); col.b = sampleSpotShadow(pos.xyz, norm, 0, pos_screen);
col.a = sampleSpotShadow(pos.xyz, norm, 1, pos_screen);
frag_color = clamp(col, vec4(0), vec4(1));
} }
...@@ -623,7 +623,7 @@ class LLVOAvatar : ...@@ -623,7 +623,7 @@ class LLVOAvatar :
//-------------------------------------------------------------------- //--------------------------------------------------------------------
public: public:
virtual LLViewerTexture::EBoostLevel getAvatarBoostLevel() const { return LLGLTexture::BOOST_AVATAR; } virtual LLViewerTexture::EBoostLevel getAvatarBoostLevel() const { return LLGLTexture::BOOST_AVATAR; }
virtual LLViewerTexture::EBoostLevel getAvatarBakedBoostLevel() const { return LLGLTexture::BOOST_AVATAR_BAKED_SELF; } virtual LLViewerTexture::EBoostLevel getAvatarBakedBoostLevel() const { return LLGLTexture::BOOST_AVATAR_BAKED; }
virtual S32 getTexImageSize() const; virtual S32 getTexImageSize() const;
/*virtual*/ S32 getTexImageArea() const { return getTexImageSize()*getTexImageSize(); } /*virtual*/ S32 getTexImageArea() const { return getTexImageSize()*getTexImageSize(); }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment