OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0031135: Visualization, TKOpenGl - texture sRGB -> linear conversion is applied twice by Path Tracer

Browse Source 
Removed from PathtraceBase.fs redundant gamma correction applied to texture.
This commit is contained in:
kgv 2019-11-06 16:59:27 +03:00 committed by bugmaster
parent f979709590
commit a1a9b24952
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Shaders/PathtraceBase.fs
View File

@ -831,20 +831,13 @@ vec4 PathTrace (in SRay theRay, in vec3 theInverse, in int theNbSamples)
if (aBSDF.Kd.w >= 0.f) if (aBSDF.Kd.w >= 0.f)
{ {
vec4 aTexCoord = vec4 (SmoothUV (aHit.UV, aTriIndex), 0.f, 1.f); vec4 aTexCoord = vec4 (SmoothUV (aHit.UV, aTriIndex), 0.f, 1.f);
vec4 aTrsfRow1 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS1 (aTriIndex.w));
vec4 aTrsfRow1 = texelFetch ( vec4 aTrsfRow2 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS2 (aTriIndex.w));
uRaytraceMaterialTexture, MATERIAL_TRS1 (aTriIndex.w));
vec4 aTrsfRow2 = texelFetch (
uRaytraceMaterialTexture, MATERIAL_TRS2 (aTriIndex.w));
aTexCoord.st = vec2 (dot (aTrsfRow1, aTexCoord), aTexCoord.st = vec2 (dot (aTrsfRow1, aTexCoord),
dot (aTrsfRow2, aTexCoord)); dot (aTrsfRow2, aTexCoord));
vec4 aTexColor = textureLod ( vec4 aTexColor = textureLod (sampler2D (uTextureSamplers[int (aBSDF.Kd.w)]), aTexCoord.st, 0.f);
sampler2D (uTextureSamplers[int (aBSDF.Kd.w)]), aTexCoord.st, 0.f); aBSDF.Kd.rgb *= aTexColor.rgb * aTexColor.w;
aBSDF.Kd.rgb *= (aTexColor.rgb * aTexColor.rgb) * aTexColor.w; // de-gamma correction (for gamma = 2)
if (aTexColor.w != 1.0f) if (aTexColor.w != 1.0f)
{ {
// mix transparency BTDF with texture alpha-channel // mix transparency BTDF with texture alpha-channel

15
src/Shaders/Shaders_PathtraceBase_fs.pxx
View File

@ -834,20 +834,13 @@ static const char Shaders_PathtraceBase_fs[] =
" if (aBSDF.Kd.w >= 0.f)\n" " if (aBSDF.Kd.w >= 0.f)\n"
" {\n" " {\n"
" vec4 aTexCoord = vec4 (SmoothUV (aHit.UV, aTriIndex), 0.f, 1.f);\n" " vec4 aTexCoord = vec4 (SmoothUV (aHit.UV, aTriIndex), 0.f, 1.f);\n"
"\n" " vec4 aTrsfRow1 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS1 (aTriIndex.w));\n"
" vec4 aTrsfRow1 = texelFetch (\n" " vec4 aTrsfRow2 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS2 (aTriIndex.w));\n"
" uRaytraceMaterialTexture, MATERIAL_TRS1 (aTriIndex.w));\n"
" vec4 aTrsfRow2 = texelFetch (\n"
" uRaytraceMaterialTexture, MATERIAL_TRS2 (aTriIndex.w));\n"
"\n"
" aTexCoord.st = vec2 (dot (aTrsfRow1, aTexCoord),\n" " aTexCoord.st = vec2 (dot (aTrsfRow1, aTexCoord),\n"
" dot (aTrsfRow2, aTexCoord));\n" " dot (aTrsfRow2, aTexCoord));\n"
"\n" "\n"
" vec4 aTexColor = textureLod (\n" " vec4 aTexColor = textureLod (sampler2D (uTextureSamplers[int (aBSDF.Kd.w)]), aTexCoord.st, 0.f);\n"
" sampler2D (uTextureSamplers[int (aBSDF.Kd.w)]), aTexCoord.st, 0.f);\n" " aBSDF.Kd.rgb *= aTexColor.rgb * aTexColor.w;\n"
"\n"
" aBSDF.Kd.rgb *= (aTexColor.rgb * aTexColor.rgb) * aTexColor.w; // de-gamma correction (for gamma = 2)\n"
"\n"
" if (aTexColor.w != 1.0f)\n" " if (aTexColor.w != 1.0f)\n"
" {\n" " {\n"
" // mix transparency BTDF with texture alpha-channel\n" " // mix transparency BTDF with texture alpha-channel\n"

13
tests/v3d/raytrace/sample_ball_wood Normal file
View File

@ -0,0 +1,13 @@
puts "============"
puts "0031135: Visualization, TKOpenGl - texture sRGB -> linear conversion is applied twice by Path Tracer"
puts "============"
puts ""
source $env(CSF_OCCTSamplesPath)/tcl/pathtrace_ball.tcl
vtexture ball 11 -scale 0.1 0.1
vsetmaterial ball plaster
vbsdf ball -coatFresnel Constant 0.0
vfps 100
vdump $imagedir/${casename}_zoom.png