RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normal maps should affect aux normal even without lighting

This commit is contained in:
rdb 2014-03-04 08:29:32 +00:00
parent 984314970f
commit 33f4aa520d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -669,7 +669,7 @@ synthesize_shader(const RenderState *rs) {
}
}
if ((_map_index_normal == i && _lighting && _auto_normal_on) || _map_index_height == i) {
if ((_map_index_normal == i && (_lighting || _out_aux_normal) && _auto_normal_on) || _map_index_height == i) {
const InternalName *texcoord_name = stage->get_texcoord_name();
PT(InternalName) tangent_name = InternalName::get_tangent();
PT(InternalName) binormal_name = InternalName::get_binormal();
@ -684,7 +684,7 @@ synthesize_shader(const RenderState *rs) {
text << "\t in float4 vtx_" << tangent_input << " : " << alloc_vreg() << ",\n";
text << "\t in float4 vtx_" << binormal_input << " : " << alloc_vreg() << ",\n";
if (_map_index_normal == i && _lighting && _auto_normal_on) {
if (_map_index_normal == i && (_lighting || _out_aux_normal) && _auto_normal_on) {
tangent_freg = alloc_freg();
binormal_freg = alloc_freg();
text << "\t out float4 l_tangent : " << tangent_freg << ",\n";
@ -781,7 +781,7 @@ synthesize_shader(const RenderState *rs) {
if (_vertex_colors) {
text << "\t l_color = vtx_color;\n";
}
if (_lighting && (_map_index_normal >= 0 && _auto_normal_on)) {
if ((_lighting || _out_aux_normal) && (_map_index_normal >= 0 && _auto_normal_on)) {
text << "\t l_tangent.xyz = mul((float3x3)tpose_view_to_model, vtx_" << tangent_input << ".xyz);\n";
text << "\t l_tangent.w = 0;\n";
text << "\t l_binormal.xyz = mul((float3x3)tpose_view_to_model, -vtx_" << binormal_input << ".xyz);\n";
@ -842,7 +842,7 @@ synthesize_shader(const RenderState *rs) {
text << "\t uniform float4x4 texmat_" << i << ",\n";
}
}
if (_lighting && (_map_index_normal >= 0 && _auto_normal_on)) {
if ((_lighting || _out_aux_normal) && (_map_index_normal >= 0 && _auto_normal_on)) {
text << "\t in float3 l_tangent : " << tangent_freg << ",\n";
text << "\t in float3 l_binormal : " << binormal_freg << ",\n";
}
@ -1014,7 +1014,7 @@ synthesize_shader(const RenderState *rs) {
text << ");\n";
}
}
if (_lighting) {
if (_lighting || _out_aux_normal) {
if (_map_index_normal >= 0 && _auto_normal_on) {
text << "\t // Translate tangent-space normal in map to view-space.\n";
text << "\t float3 tsnormal = ((float3)tex" << _map_index_normal << " * 2) - 1;\n";