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: implement remaining missing TexGenAttrib modes

Browse Source 
Fixes #1437
This commit is contained in:
rdb 2023-01-13 17:04:04 +01:00
parent 10f4c6bb21
commit 6ad50b5cb1
1 changed files with 53 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,23 +781,34 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
} }
} }
bool need_eye_reflection = false;
bool need_fragment_view_to_world = false;
text << "void vshader(\n"; text << "void vshader(\n";
for (size_t i = 0; i < key._textures.size(); ++i) { for (size_t i = 0; i < key._textures.size(); ++i) {
const ShaderKey::TextureInfo &tex = key._textures[i]; const ShaderKey::TextureInfo &tex = key._textures[i];
switch (tex._gen_mode) { switch (tex._gen_mode) {
case TexGenAttrib::M_world_position: case TexGenAttrib::M_world_cube_map:
need_world_position = true; need_fragment_view_to_world = true;
case TexGenAttrib::M_eye_sphere_map:
case TexGenAttrib::M_eye_cube_map:
need_eye_position = true;
need_eye_normal = true;
need_eye_reflection = true;
break; break;
case TexGenAttrib::M_world_normal: case TexGenAttrib::M_world_normal:
need_world_normal = true; need_world_normal = true;
break; break;
case TexGenAttrib::M_eye_position:
need_eye_position = true;
break;
case TexGenAttrib::M_eye_normal: case TexGenAttrib::M_eye_normal:
need_eye_normal = true; need_eye_normal = true;
break; break;
case TexGenAttrib::M_world_position:
need_world_position = true;
break;
case TexGenAttrib::M_eye_position:
need_eye_position = true;
break;
default: default:
break; break;
} }
@ -1049,6 +1060,13 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
if (tex._flags & ShaderKey::TF_uses_color) { if (tex._flags & ShaderKey::TF_uses_color) {
text << "\t uniform float4 texcolor_" << i << ",\n"; text << "\t uniform float4 texcolor_" << i << ",\n";
} }
if (tex._gen_mode == TexGenAttrib::M_constant) {
text << "\t uniform float4 texconst_" << i << ",\n";
}
}
if (need_fragment_view_to_world) {
text << "\t uniform float3x3 trans_view_to_world,\n";
} }
if (need_tangents) { if (need_tangents) {
text << "\t in float4 l_tangent : " << tangent_freg << ",\n"; text << "\t in float4 l_tangent : " << tangent_freg << ",\n";
@ -1119,6 +1137,17 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
if (need_eye_normal && pack_eye_normal) { if (need_eye_normal && pack_eye_normal) {
text << "\t float3 l_eye_normal = float3(l_tangent.w, l_binormal.w, l_eye_position.w);\n"; text << "\t float3 l_eye_normal = float3(l_tangent.w, l_binormal.w, l_eye_position.w);\n";
} }
if (need_eye_normal) {
text << "\t // Correct the surface normal for interpolation effects\n";
text << "\t l_eye_normal = normalize(l_eye_normal);\n";
}
if (need_eye_reflection ||
(need_eye_position && have_specular && (key._material_flags & Material::F_local) != 0 && !key._lights.empty())) {
text << "\t float3 norm_eye_position = normalize(l_eye_position.xyz);\n";
}
if (need_eye_reflection) {
text << "\t float3 eye_reflection = norm_eye_position - l_eye_normal * 2 * dot(l_eye_normal, norm_eye_position);\n";
}
text << "\t float4 result;\n"; text << "\t float4 result;\n";
if (key._outputs & (AuxBitplaneAttrib::ABO_aux_normal | AuxBitplaneAttrib::ABO_aux_glow)) { if (key._outputs & (AuxBitplaneAttrib::ABO_aux_normal | AuxBitplaneAttrib::ABO_aux_glow)) {
@ -1137,17 +1166,29 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
// Cg seems to be able to optimize this temporary away when appropriate. // Cg seems to be able to optimize this temporary away when appropriate.
text << "\t float4 texcoord" << i << " = l_" << tex._texcoord_name->join("_") << ";\n"; text << "\t float4 texcoord" << i << " = l_" << tex._texcoord_name->join("_") << ";\n";
break; break;
case TexGenAttrib::M_world_position: case TexGenAttrib::M_eye_sphere_map:
text << "\t float4 texcoord" << i << " = l_world_position;\n"; text << "\t float4 texcoord" << i << " = float4(eye_reflection.xz * (1.0f / (2.0f * length(eye_reflection + float3(0, -1, 0)))) + float2(0.5f, 0.5f), 0.0f, 1.0f);\n";
break;
case TexGenAttrib::M_world_cube_map:
text << "\t float4 texcoord" << i << " = float4(mul(trans_view_to_world, eye_reflection), 1.0f);\n";
break;
case TexGenAttrib::M_eye_cube_map:
text << "\t float4 texcoord" << i << " = float4(eye_reflection, 1.0f);\n";
break; break;
case TexGenAttrib::M_world_normal: case TexGenAttrib::M_world_normal:
text << "\t float4 texcoord" << i << " = l_world_normal;\n"; text << "\t float4 texcoord" << i << " = l_world_normal;\n";
break; break;
case TexGenAttrib::M_eye_normal:
text << "\t float4 texcoord" << i << " = float4(l_eye_normal, 1.0f);\n";
break;
case TexGenAttrib::M_world_position:
text << "\t float4 texcoord" << i << " = l_world_position;\n";
break;
case TexGenAttrib::M_eye_position: case TexGenAttrib::M_eye_position:
text << "\t float4 texcoord" << i << " = float4(l_eye_position.xyz, 1.0f);\n"; text << "\t float4 texcoord" << i << " = float4(l_eye_position.xyz, 1.0f);\n";
break; break;
case TexGenAttrib::M_eye_normal: case TexGenAttrib::M_constant:
text << "\t float4 texcoord" << i << " = float4(l_eye_normal, 1.0f);\n"; text << "\t float4 texcoord" << i << " = texconst_" << i << ";\n";
break; break;
default: default:
text << "\t float4 texcoord" << i << " = float4(0, 0, 0, 0);\n"; text << "\t float4 texcoord" << i << " = float4(0, 0, 0, 0);\n";
@ -1237,10 +1278,6 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
text << ");\n"; text << ");\n";
} }
} }
if (need_eye_normal) {
text << "\t // Correct the surface normal for interpolation effects\n";
text << "\t l_eye_normal = normalize(l_eye_normal);\n";
}
if (need_tangents) { if (need_tangents) {
text << "\t // Translate tangent-space normal in map to view-space.\n"; text << "\t // Translate tangent-space normal in map to view-space.\n";
@ -1335,7 +1372,7 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
text << "\t tot_diffuse += lcolor;\n"; text << "\t tot_diffuse += lcolor;\n";
if (have_specular) { if (have_specular) {
if (key._material_flags & Material::F_local) { if (key._material_flags & Material::F_local) {
text << "\t lhalf = normalize(lvec - normalize(l_eye_position.xyz));\n"; text << "\t lhalf = normalize(lvec - norm_eye_position);\n";
} else { } else {
text << "\t lhalf = normalize(lvec - float3(0, 1, 0));\n"; text << "\t lhalf = normalize(lvec - float3(0, 1, 0));\n";
} }
@ -1370,7 +1407,7 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
text << "\t tot_diffuse += lcolor;\n"; text << "\t tot_diffuse += lcolor;\n";
if (have_specular) { if (have_specular) {
if (key._material_flags & Material::F_local) { if (key._material_flags & Material::F_local) {
text << "\t lhalf = normalize(lvec - normalize(l_eye_position.xyz));\n"; text << "\t lhalf = normalize(lvec - norm_eye_position);\n";
} else { } else {
text << "\t lhalf = normalize(lvec - float3(0, 1, 0));\n"; text << "\t lhalf = normalize(lvec - float3(0, 1, 0));\n";
} }
@ -1410,7 +1447,7 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
text << "\t tot_diffuse += lcolor;\n"; text << "\t tot_diffuse += lcolor;\n";
if (have_specular) { if (have_specular) {
if (key._material_flags & Material::F_local) { if (key._material_flags & Material::F_local) {
text << "\t lhalf = normalize(lvec - normalize(l_eye_position.xyz));\n"; text << "\t lhalf = normalize(lvec - norm_eye_position);\n";
} else { } else {
text << "\t lhalf = normalize(lvec - float3(0,1,0));\n"; text << "\t lhalf = normalize(lvec - float3(0,1,0));\n";
} }