TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ShaderGenerator: fix texture transforms applied to normal map

Browse Source 
Fixes #808
This commit is contained in:
rdb 2020-02-29 16:21:47 +01:00
parent 1c357f32ca
commit 9431d5013f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panda/src/pgraphnodes/shaderGenerator.cxx
View File

@ -1241,12 +1241,23 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
const ShaderKey::TextureInfo &tex = key._textures[i]; const ShaderKey::TextureInfo &tex = key._textures[i];
if (tex._flags & ShaderKey::TF_map_normal) { if (tex._flags & ShaderKey::TF_map_normal) {
if (is_first) { if (is_first) {
text << "\t float3 tsnormal = normalize((tex" << i << ".xyz * 2) - 1);\n"; if (tex._flags & ShaderKey::TF_has_texscale) {
text << "\t float3 tsnormal = normalize(((tex" << i << ".xyz * 2) - 1) * texscale_" << i << ");\n";
} else if (tex._flags & ShaderKey::TF_has_texmat) {
text << "\t float3 tsnormal = normalize(mul(texmat_" << i << ", float4((tex" << i << ".xyz * 2) - 1, 0)).xyz);\n";
} else {
text << "\t float3 tsnormal = normalize((tex" << i << ".xyz * 2) - 1);\n";
}
is_first = false; is_first = false;
continue; continue;
} }
text << "\t tsnormal.z += 1;\n"; text << "\t tsnormal.z += 1;\n";
text << "\t float3 tmp" << i << " = tex" << i << ".xyz * float3(-2, -2, 2) + float3(1, 1, -1);\n"; text << "\t float3 tmp" << i << " = tex" << i << ".xyz * float3(-2, -2, 2) + float3(1, 1, -1);\n";
if (tex._flags & ShaderKey::TF_has_texscale) {
text << "\t tmp" << i << " *= texscale_" << i << ";\n";
} else if (tex._flags & ShaderKey::TF_has_texmat) {
text << "\t tmp" << i << " = mul(texmat_" << i << ", float4(tmp" << i << ", 0)).xyz;\n";
}
text << "\t tsnormal = normalize(tsnormal * dot(tsnormal, tmp" << i << ") - tmp" << i << " * tsnormal.z);\n"; text << "\t tsnormal = normalize(tsnormal * dot(tsnormal, tmp" << i << ") - tmp" << i << " * tsnormal.z);\n";
} }
} }