birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing bitangent flip from ConstructTBN. Tangent.w should only be used for flipping the bitangent when recomputing the bitangent using the cross product of the normal and tangent, not when reading bitangents directly from vertex data. (#7221)

Browse Source 
Signed-off-by: Tommy Walton <waltont@amazon.com>
This commit is contained in:
Tommy Walton
2022-02-03 11:55:44 -08:00
committed by GitHub
parent 74a876ae3b
commit dea89a7539
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
+2 -3
View File
@@ -26,13 +26,12 @@ float3 WorldSpaceToTangent(float3 vectorWS, float3 normalWS, float3 tangentWS, f
return float3(a,b,c);
}
//! Utility function for vertex shaders to transform vertex tangent, bitangent, and normal vectors into world space based on MikkT conventions.
//! Utility function for vertex shaders to transform vertex tangent, bitangent, and normal vectors into world space.
void ConstructTBN(float3 vertexNormal, float4 vertexTangent, float3 vertexBitangent, float4x4 localToWorld, float3x3 localToWorldInverseTranspose, out float3 normalWS, out float3 tangentWS, out float3 bitangentWS)
{
normalWS = normalize(mul(localToWorldInverseTranspose, vertexNormal));
tangentWS = normalize(mul(localToWorld, float4(vertexTangent.xyz, 0)).xyz);
float bitangentSign = -vertexTangent.w;
bitangentWS = normalize(mul(localToWorld, float4(vertexBitangent, 0)).xyz) * bitangentSign;
bitangentWS = normalize(mul(localToWorld, float4(vertexBitangent, 0)).xyz);
}
// ---------- Normal Calculation ----------