Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 07:12:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10014 from samcake/blue

Browse source 
Fixing the roughness/reflection quantization bug
This commit is contained in:
samcake 2017-03-28 14:50:24 -07:00 committed by GitHub
commit a1bf1beab4
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/render-utils/src/DebugDeferredBuffer.cpp
View file

@ -76,6 +76,7 @@ static const std::string DEFAULT_ROUGHNESS_SHADER {
"vec4 getFragmentColor() {"
" DeferredFragment frag = unpackDeferredFragmentNoPosition(uv);"
" return vec4(vec3(pow(frag.roughness, 1.0 / 2.2)), 1.0);"
// " return vec4(vec3(pow(colorRamp(frag.roughness), vec3(1.0 / 2.2))), 1.0);"
" }"
};
static const std::string DEFAULT_NORMAL_SHADER {

2
libraries/render-utils/src/LightAmbient.slh
View file

@ -39,7 +39,7 @@ vec3 evalAmbientSpecularIrradiance(LightAmbient ambient, vec3 fragEyeDir, vec3 f
<@if supportAmbientMap@>
{
float levels = getLightAmbientMapNumMips(ambient);
float lod = min(floor((roughness)* levels), levels);
float lod = min(((roughness)* levels), levels);
specularLight = evalSkyboxLight(direction, lod).xyz;
}
<@endif@>

2
libraries/render-utils/src/debug_deferred_buffer.slf
View file

@ -13,6 +13,8 @@
//
<@include DeferredBufferRead.slh@>
<@include gpu/Color.slh@>
<$declareColorWheel()$>
uniform sampler2D linearDepthMap;
uniform sampler2D halfLinearDepthMap;

4
libraries/render-utils/src/surfaceGeometry_downsampleDepthNormal.slf
View file

@ -24,8 +24,8 @@ void main(void) {
// Gather 2 by 2 quads from texture
// Try different filters for Z
// vec4 Zeyes = textureGather(linearDepthMap, varTexCoord0, 0);
// float Zeye = min(min(Zeyes.x, Zeyes.y), min(Zeyes.z, Zeyes.w));
//vec4 Zeyes = textureGather(linearDepthMap, varTexCoord0, 0);
//float Zeye = min(min(Zeyes.x, Zeyes.y), min(Zeyes.z, Zeyes.w));
float Zeye = texture(linearDepthMap, varTexCoord0).x;
vec4 rawNormalsX = textureGather(normalMap, varTexCoord0, 0);