Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding normal mapping

Browse Source
This commit is contained in:
Dynamitos
2024-07-15 17:55:22 +02:00
parent 38986f4bfc
commit 064ba22391
15 changed files with 151 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/shaders/lib/BRDF.slang
+17 -20
View File
@@ -2,7 +2,7 @@ import Common;
interface IBRDF
{
float3 evaluate(float3x3 tbn, float3 viewDir_WS, float3 lightDir_WS, float3 normal_WS, float3 lightColor);
float3 evaluate(float3 viewDir_TS, float3 lightDir_TS, float3 lightColor);
float3 evaluateAmbient();
};
@@ -19,13 +19,12 @@ struct Phong : IBRDF
normal = float3(0, 0, 1);
}
float3 evaluate(float3x3 tbn, float3 viewDir_WS, float3 lightDir_WS, float3 n, float3 lightColor)
float3 evaluate(float3 viewDir_TS, float3 lightDir_TS, float3 lightColor)
{
float3 normal_TS = normal;
float3 normal_WS = n;//normalize(mul(tbn, normal_TS));
float3 nDotL = dot(normal_WS, lightDir_WS);
float3 r = 2 * (nDotL) * normal_WS - lightDir_WS;
float rDotV = dot(r, viewDir_WS);
float3 nDotL = dot(normal_TS, lightDir_TS);
float3 r = 2 * (nDotL) * normal_TS - lightDir_TS;
float rDotV = dot(r, viewDir_TS);
return lightColor * (baseColor * max(nDotL, 0.0));// + specular * pow(max(rDotV, 0.0), max(shininess, 1)));
}
@@ -49,12 +48,11 @@ struct BlinnPhong : IBRDF
normal = float3(0, 0, 1);
}
float3 evaluate(float3x3 tbn, float3 viewDir_WS, float3 lightDir_WS, float3 normal_WS, float3 lightColor)
float3 evaluate(float3 viewDir_TS, float3 lightDir_TS, float3 lightColor)
{
float3 normal_TS = normalize(normal);
//float3 normal_WS = normalize(mul(tbn, normal_TS));
float diffuse = max(dot(normal_WS, lightDir_WS), 0);
float3 h = normalize(lightDir_WS + viewDir_WS);
float diffuse = max(dot(normal_TS, lightDir_TS), 0);
float3 h = normalize(lightDir_TS + viewDir_TS);
float specular = pow(saturate(dot(normal_TS, h)), shininess);
return (baseColor * diffuse * lightColor) + (specularColor * specular);
@@ -76,11 +74,10 @@ struct CelShading : IBRDF
normal = float3(0, 0, 1);
}
float3 evaluate(float3x3 tbn, float3 viewDir_WS, float3 lightDir_WS, float3 n, float3 lightColor)
float3 evaluate(float3 viewDir_TS, float3 lightDir_TS, float3 lightColor)
{
float3 normal_TS = normalize(normal);
float3 normal_WS = normalize(mul(tbn, normal_TS));
float nDotL = dot(normal_WS, lightDir_WS);
float nDotL = dot(normal_TS, lightDir_TS);
float diffuse = max(nDotL, 0);
float3 darkenedBase = baseColor * 0.8;
@@ -148,21 +145,21 @@ struct CookTorrance : IBRDF
return F0 + (1.0 - F0) * pow(clamp(1.0 - cosTheta, 0.0, 1.0), 5.0);
}
float3 evaluate(float3x3 tbn, float3 viewDir_WS, float3 lightDir_WS, float3 normal_WS, float3 lightColor)
float3 evaluate(float3 viewDir_TS, float3 lightDir_TS, float3 lightColor)
{
float3 n = normal_WS;//normalize(mul(tbn, normal));
float3 h = normalize(lightDir_WS + viewDir_WS);
float3 n = normal;//normalize(mul(tbn, normal));
float3 h = normalize(lightDir_TS + viewDir_TS);
float3 F0 = float3(0.04);
F0 = lerp(F0, baseColor, metallic);
float3 F = FresnelSchlick(max(dot(h, viewDir_WS), 0.0), F0);
float3 F = FresnelSchlick(max(dot(h, viewDir_TS), 0.0), F0);
float NDF = TrowbridgeReitzGGX(n, h);
float G = Smith(n, viewDir_WS, lightDir_WS);
float G = Smith(n, viewDir_TS, lightDir_TS);
float3 num = NDF * G * F;
float denom = 4.0 * max(dot(n, viewDir_WS), 0.0) * max(dot(n, lightDir_WS), 0.0) + 0.000001;
float denom = 4.0 * max(dot(n, viewDir_TS), 0.0) * max(dot(n, lightDir_TS), 0.0) + 0.000001;
float3 specular = num / denom;
float3 k_s = F;
@@ -170,7 +167,7 @@ struct CookTorrance : IBRDF
k_d *= 1.0 - metallic;
float nDotL = max(dot(n, lightDir_WS), 0.0);
float nDotL = max(dot(n, lightDir_TS), 0.0);
float3 result = (k_d * baseColor / PI + specular) * nDotL * lightColor;
return result * ambientOcclusion;
res/shaders/lib/LightEnv.slang
+6 -4
View File
@@ -14,7 +14,8 @@ struct DirectionalLight : ILightEnv
float3 illuminate<B:IBRDF>(LightingParameter params, B brdf)
{
return brdf.evaluate(params.tbn, params.viewDir_WS, -normalize(direction.xyz), params.normal_WS, color.xyz);
float3 dir_TS = mul(params.tbn, -normalize(direction.xyz));
return brdf.evaluate(params.viewDir_TS, dir_TS, color.xyz);
}
};
@@ -25,10 +26,11 @@ struct PointLight : ILightEnv
float3 illuminate<B:IBRDF>(LightingParameter params, B brdf)
{
float3 lightDir_WS = position_WS.xyz - params.position_WS;
float d = length(lightDir_WS);
float3 pos_TS = mul(params.tbn, position_WS.xyz);
float3 lightDir_TS = pos_TS.xyz - params.position_TS;
float d = length(lightDir_TS);
float illuminance = max(1 - d / colorRange.w, 0);
return illuminance * brdf.evaluate(params.tbn, params.viewDir_WS, normalize(lightDir_WS), normalize(params.normal_WS), colorRange.xyz);
return illuminance * brdf.evaluate(params.viewDir_TS, normalize(lightDir_TS), colorRange.xyz);
}
bool insidePlane(Plane plane, float3 position)
res/shaders/lib/MaterialParameter.slang
+8 -7
View File
@@ -11,9 +11,9 @@ struct MaterialParameter
struct LightingParameter
{
float3x3 tbn;
float3 normal_WS;
float3 position_WS;
float3 viewDir_WS;
float3 normal_TS;
float3 position_TS;
float3 viewDir_TS;
};
// data passed to fragment shader
@@ -42,10 +42,11 @@ struct FragmentParameter
LightingParameter getLightingParameter()
{
LightingParameter result;
result.tbn = float3x3(normalize(tangent_WS), normalize(biTangent_WS), normalize(normal_WS));
result.position_WS = position_WS;
result.viewDir_WS = normalize(cameraPos_WS - position_WS);
result.normal_WS = normal_WS;
float3x3 tbn = float3x3(normalize(tangent_WS), normalize(biTangent_WS), normalize(normal_WS));
result.tbn = tbn;
result.position_TS = mul(tbn, position_WS);
result.viewDir_TS = mul(tbn, normalize(cameraPos_WS - position_WS));
result.normal_TS = mul(tbn, normal_WS);
return result;
}
#endif