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

0031302: Visualization, TKOpenGl - wrong tangent space calculation for normal maps

Browse Source 
The normal after tangent space calculation has been reverted in order to be in right orientation.
The tangent space calculation has been modified in order to handle back faces with inverted normal.
This commit is contained in:
iko 2020-01-16 15:55:29 +03:00 committed by bugmaster
parent 389f5b59dd
commit 6558400123
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenGl/OpenGl_ShaderManager.cxx
View File

@ -2731,9 +2731,10 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
EOL" aDeltaUVMatrix = mat2 (aDeltaUVMatrix[1][1], -aDeltaUVMatrix[0][1], -aDeltaUVMatrix[1][0], aDeltaUVMatrix[0][0]);" EOL" aDeltaUVMatrix = mat2 (aDeltaUVMatrix[1][1], -aDeltaUVMatrix[0][1], -aDeltaUVMatrix[1][0], aDeltaUVMatrix[0][0]);"
EOL" mat2x3 aDeltaVectorMatrix = mat2x3 (dFdx (PositionWorld.xyz), dFdy (PositionWorld.xyz));" EOL" mat2x3 aDeltaVectorMatrix = mat2x3 (dFdx (PositionWorld.xyz), dFdy (PositionWorld.xyz));"
EOL" aDeltaVectorMatrix = aDeltaVectorMatrix * aDeltaUVMatrix;" EOL" aDeltaVectorMatrix = aDeltaVectorMatrix * aDeltaUVMatrix;"
EOL" aDeltaVectorMatrix[0] = aDeltaVectorMatrix[0] - dot(Normal, aDeltaVectorMatrix[0]) * Normal;" EOL" aDeltaVectorMatrix[0] = normalize(aDeltaVectorMatrix[0] - dot(Normal, aDeltaVectorMatrix[0]) * Normal);"
EOL" aDeltaVectorMatrix[1] = aDeltaVectorMatrix[1] - dot(Normal, aDeltaVectorMatrix[1]) * Normal;" EOL" aDeltaVectorMatrix[1] = normalize(aDeltaVectorMatrix[1] - dot(Normal, aDeltaVectorMatrix[1]) * Normal);"
EOL" Normal = mat3 (-normalize(aDeltaVectorMatrix[0]), -normalize(aDeltaVectorMatrix[1]), Normal) * aMapNormalValue.xyz;" EOL" float aDirection = gl_FrontFacing ? 1.0 : -1.0;"
EOL" Normal = mat3 (aDirection * aDeltaVectorMatrix[0], aDirection * aDeltaVectorMatrix[1], Normal) * aMapNormalValue.xyz;"
EOL" }" EOL" }"
EOL"#endif"; EOL"#endif";
} }

28
tests/v3d/glsl/pbr_tangent_normal Normal file
View File

@ -0,0 +1,28 @@
puts "========"
puts "0031302: Visualization, TKOpenGl - wrong tangent space calculation for normal maps"
puts "Test for tangent space orientation."
puts "========"
pload XDE OCAF MODELING VISUALIZATION
vclear
vclose ALL
vinit v -w 1024 -h 1024
vcamera -persp
vbackground -cubemap [locate_data_file Circus_CubeMap_V.png]
vrenderparams -shadingModel PBR
vlight -clear
vlight -add ambient
catch { Close D }
ReadGltf D [locate_data_file bug31302_NormalTangentTest.gltf]
XDisplay -dispmode 1 D
vfront
vfit
vdump $imagedir/${casename}_front.png
vback
vdump $imagedir/${casename}_back.png