redstrate/prism
Archived
1
Fork 0
Code Activity

Add back support for normal textures in material compiler

Browse source
This commit is contained in:
Joshua Goins 2022-02-15 09:02:42 -05:00
parent a4f852f9c8
commit 840a1e861f
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engine/renderer/src/materialcompiler.cpp
View file

@ -216,6 +216,12 @@ ShaderSource MaterialCompiler::compile_material_fragment(Material& material, boo
src += "layout(binding = " + std::to_string(sampler_index++) + ") uniform sampler2D colorTexture;\n"; src += "layout(binding = " + std::to_string(sampler_index++) + ") uniform sampler2D colorTexture;\n";
} }
if(material.normalProperty.type == DataType::AssetTexture) {
material.bound_textures[sampler_index] = material.normalProperty.value_tex;
src += "layout(binding = " + std::to_string(sampler_index++) + ") uniform sampler2D normalTexture;\n";
}
if(use_ibl) { if(use_ibl) {
src += "vec3 get_reflect(int i, vec3 final_normal) {\n \ src += "vec3 get_reflect(int i, vec3 final_normal) {\n \
const vec3 direction = normalize(in_frag_pos - scene.camPos.xyz);\n \ const vec3 direction = normalize(in_frag_pos - scene.camPos.xyz);\n \
@ -292,7 +298,16 @@ ShaderSource MaterialCompiler::compile_material_fragment(Material& material, boo
src += "vec3 final_diffuse_color = from_srgb_to_linear(Color);\n"; src += "vec3 final_diffuse_color = from_srgb_to_linear(Color);\n";
src += "float final_roughness = scene.materials[inMaterialIndex].info.y;\n"; src += "float final_roughness = scene.materials[inMaterialIndex].info.y;\n";
src += "float final_metallic = scene.materials[inMaterialIndex].info.x;\n"; src += "float final_metallic = scene.materials[inMaterialIndex].info.x;\n";
if(material.normalProperty.type == DataType::AssetTexture) {
prism::log("enabling normal mapping on material..");
src += "vec3 final_normal = texture(normalTexture, in_uv).rgb;\n";
src += "final_normal = final_normal * 2.0 - 1.0;\n";
src += "final_normal = in_tbn * final_normal;\n";
} else {
src += "vec3 final_normal = in_normal;\n"; src += "vec3 final_normal = in_normal;\n";
}
src += src +=
"ComputedSurfaceInfo surface_info = compute_surface(final_diffuse_color.rgb, final_normal, final_metallic, final_roughness);\n \ "ComputedSurfaceInfo surface_info = compute_surface(final_diffuse_color.rgb, final_normal, final_metallic, final_roughness);\n \
@ -313,6 +328,10 @@ ShaderSource MaterialCompiler::compile_material_fragment(Material& material, boo
}\n \ }\n \
SurfaceBRDF surface_brdf = brdf(light_info.direction, surface_info);\n"; SurfaceBRDF surface_brdf = brdf(light_info.direction, surface_info);\n";
if(render_options.enable_normal_mapping && material.normalProperty.type == DataType::AssetTexture && render_options.enable_normal_shadowing) {
src += std::string("light_info.radiance *= calculate_normal_lighting(normalTexture, final_normal, light_info.direction);\n");
}
src += "Lo += ((surface_brdf.specular + surface_brdf.diffuse) * light_info.radiance * surface_brdf.NdotL) * scene.lights[i].colorSize.rgb;\n \ src += "Lo += ((surface_brdf.specular + surface_brdf.diffuse) * light_info.radiance * surface_brdf.NdotL) * scene.lights[i].colorSize.rgb;\n \
}\n"; }\n";