Skip to content

fix: prevent glazing angle flashes, correct tbnTr #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jonahex merged 1 commit into from
Aug 13, 2024
Merged

fix: prevent glazing angle flashes, correct tbnTr #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions package/Shaders/Common/Glints/Glints2023.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,14 @@ void GetGradientEllipse(float2 duvdx, float2 duvdy, out float2 ellipseMajor, out

float T = a + d;
float D = a * d - b * c;
float L1 = T / 2.0 - pow(T * T / 3.99999 - D, 0.5);
float L2 = T / 2.0 + pow(T * T / 3.99999 - D, 0.5);
float SQ = sqrt(abs(T * T / 3.99999 - D));
float L1 = T / 2.0 - SQ;
float L2 = T / 2.0 + SQ;

float2 A0 = float2(L1 - d, c);
float2 A1 = float2(L2 - d, c);
float r0 = 1.0 / sqrt(L1);
float r1 = 1.0 / sqrt(L2);
float r0 = rsqrt(L1);
float r1 = rsqrt(L2);
ellipseMajor = normalize(A0) * r0;
ellipseMinor = normalize(A1) * r1;
}
Expand All @@ -112,7 +113,7 @@ float2 VectorToSlope(float3 v)

float3 SlopeToVector(float2 s)
{
float z = 1 / sqrt(s.x * s.x + s.y * s.y + 1);
float z = rsqrt(s.x * s.x + s.y * s.y + 1);
float x = s.x * z;
float y = s.y * z;
return float3(x, y, z);
Expand Down Expand Up @@ -239,11 +240,11 @@ struct GlintInput

void CustomRand4Texture(GlintInput params, float2 slope, float2 slopeRandOffset, out float4 outUniform, out float4 outGaussian, out float2 slopeLerp)
{
int2 size = 512;
uint2 size = 512;
float2 slope2 = abs(slope) / params.MicrofacetRoughness;
slope2 = slope2 + (slopeRandOffset * size);
slopeLerp = frac(slope2);
int2 slopeCoord = int2(floor(slope2)) % size;
uint2 slopeCoord = uint2(floor(slope2)) % size;

float4 packedRead = _Glint2023NoiseMap[slopeCoord];
UnpackFloatParallel4(packedRead, outUniform, outGaussian);
Expand Down Expand Up @@ -298,7 +299,7 @@ float SampleGlintGridSimplex(GlintInput params, float2 uv, uint gridSeed, float2

// Compute binomial properties
float hitProba = params.MicrofacetRoughness * targetNDF; // probability of hitting desired half vector in NDF distribution
float3 footprintOneHitProba = (1.0 - pow(1.0 - hitProba.rrr, microfacetCountBlended)); // probability of hitting at least one microfacet in footprint
float3 footprintOneHitProba = (1.0 - pow(abs(1.0 - hitProba.rrr), microfacetCountBlended)); // probability of hitting at least one microfacet in footprint
float3 footprintMean = (microfacetCountBlended - 1.0) * hitProba.rrr; // Expected value of number of hits in the footprint given already one hit
float3 footprintSTD = sqrt((microfacetCountBlended - 1.0) * hitProba.rrr * (1.0 - hitProba.rrr)); // Standard deviation of number of hits in the footprint given already one hit
float3 binomialSmoothWidth = 0.1 * clamp(footprintOneHitProba * 10, 0.0, 1.0) * clamp((1.0 - footprintOneHitProba) * 10, 0.0, 1.0);
Expand Down Expand Up @@ -530,5 +531,5 @@ float4 SampleGlints2023NDF(GlintInput params, float targetNDF, float maxNDF)
float sampleB = SampleGlintGridSimplex(params, uvRotB / divLods[tetraB.z] / float2(1.0, ratios[tetraB.y]), gridSeedB, slope, ratios[tetraB.y] * footprintAreas[tetraB.z], rescaledTargetNDF, tetraBarycentricWeights.y);
float sampleC = SampleGlintGridSimplex(params, uvRotC / divLods[tetraC.z] / float2(1.0, ratios[tetraC.y]), gridSeedC, slope, ratios[tetraC.y] * footprintAreas[tetraC.z], rescaledTargetNDF, tetraBarycentricWeights.z);
float sampleD = SampleGlintGridSimplex(params, uvRotD / divLods[tetraD.z] / float2(1.0, ratios[tetraD.y]), gridSeedD, slope, ratios[tetraD.y] * footprintAreas[tetraD.z], rescaledTargetNDF, tetraBarycentricWeights.w);
return (sampleA + sampleB + sampleC + sampleD) * (1.0 / params.MicrofacetRoughness) * maxNDF;
return min((sampleA + sampleB + sampleC + sampleD) * (1.0 / params.MicrofacetRoughness), 40) * maxNDF; // somewhat brute force way of prevent glazing angle extremities
}
21 changes: 12 additions & 9 deletions package/Shaders/Common/PBR.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#if defined(GLINT)
# include "Common/Glints/Glints2023.hlsli"
#endif

#define TruePBR_HasEmissive (1 << 0)
#define TruePBR_HasDisplacement (1 << 1)
#define TruePBR_HasFeatureTexture0 (1 << 2)
Expand Down Expand Up @@ -36,6 +32,10 @@

namespace PBR
{
#if defined(GLINT)
# include "Common/Glints/Glints2023.hlsli"
#endif

struct SurfaceProperties
{
float3 BaseColor;
Expand Down Expand Up @@ -158,8 +158,11 @@ namespace PBR
float3 GetSpecularDirectLightMultiplierMicrofacetWithGlint(float roughness, float3 specularColor, float NdotL, float NdotV, float NdotH, float VdotH, GlintInput glintInput, out float3 F)
{
float D = GetNormalDistributionFunctionGGX(roughness, NdotH);
float D_max = GetNormalDistributionFunctionGGX(roughness, 1);
D = SampleGlints2023NDF(glintInput, D, D_max);
[branch] if (glintInput.LogMicrofacetDensity > 1.1)
{
float D_max = GetNormalDistributionFunctionGGX(roughness, 1);
D = SampleGlints2023NDF(glintInput, D, D_max);
}
float G = GetVisibilityFunctionSmithJointApprox(roughness, NdotV, NdotL);
F = GetFresnelFactorSchlick(specularColor, VdotH);

Expand Down Expand Up @@ -370,7 +373,7 @@ namespace PBR
}

void GetDirectLightInput(out float3 diffuse, out float3 coatDiffuse, out float3 transmission, out float3 specular, float3 N, float3 coatN, float3 V, float3 coatV, float3 L, float3 coatL, float3 lightColor, float3 coatLightColor, SurfaceProperties surfaceProperties,
float3x3 tbn, float2 uv)
float3x3 tbnTr, float2 uv)
{
diffuse = 0;
coatDiffuse = 0;
Expand Down Expand Up @@ -403,12 +406,12 @@ namespace PBR

#if defined(GLINT)
GlintInput glintInput;
glintInput.H = mul(tbn, H);
glintInput.H = mul(tbnTr, H);
glintInput.uv = uv;
glintInput.duvdx = ddx(uv);
glintInput.duvdy = ddy(uv);
glintInput.ScreenSpaceScale = max(1, surfaceProperties.GlintScreenSpaceScale);
glintInput.LogMicrofacetDensity = 40 - clamp(surfaceProperties.GlintLogMicrofacetDensity, 0, 40);
glintInput.LogMicrofacetDensity = clamp(surfaceProperties.GlintLogMicrofacetDensity, 1, 40);
glintInput.MicrofacetRoughness = clamp(surfaceProperties.GlintMicrofacetRoughness, 0.005, 0.3);
glintInput.DensityRandomization = clamp(surfaceProperties.GlintDensityRandomization, 0, 5);
#endif
Expand Down
6 changes: 3 additions & 3 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,7 +1934,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
float3 coatFinalLightColor = coatShadowDirLightColorMultiplier * pbrDirLightColor;

float3 dirDiffuseColor, coatDirDiffuseColor, dirTransmissionColor, dirSpecularColor;
PBR::GetDirectLightInput(dirDiffuseColor, coatDirDiffuseColor, dirTransmissionColor, dirSpecularColor, modelNormal.xyz, coatModelNormal, refractedViewDirection, viewDirection, refractedDirLightDirection, DirLightDirection, mainLayerFinalLightColor, coatFinalLightColor, pbrSurfaceProperties, tbn, uvOriginal);
PBR::GetDirectLightInput(dirDiffuseColor, coatDirDiffuseColor, dirTransmissionColor, dirSpecularColor, modelNormal.xyz, coatModelNormal, refractedViewDirection, viewDirection, refractedDirLightDirection, DirLightDirection, mainLayerFinalLightColor, coatFinalLightColor, pbrSurfaceProperties, tbnTr, uvOriginal);
lightsDiffuseColor += dirDiffuseColor;
coatLightsDiffuseColor += coatDirDiffuseColor;
transmissionColor += dirTransmissionColor;
Expand Down Expand Up @@ -2016,7 +2016,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
refractedLightDirection = -refract(-normalizedLightDirection, coatModelNormal, eta);
}
float3 pbrLightColor = PBR::AdjustPointLightColor(lightColor);
PBR::GetDirectLightInput(pointDiffuseColor, coatPointDiffuseColor, pointTransmissionColor, pointSpecularColor, modelNormal.xyz, coatModelNormal, refractedViewDirection, viewDirection, refractedLightDirection, normalizedLightDirection, pbrLightColor, pbrLightColor, pbrSurfaceProperties, tbn, uvOriginal);
PBR::GetDirectLightInput(pointDiffuseColor, coatPointDiffuseColor, pointTransmissionColor, pointSpecularColor, modelNormal.xyz, coatModelNormal, refractedViewDirection, viewDirection, refractedLightDirection, normalizedLightDirection, pbrLightColor, pbrLightColor, pbrSurfaceProperties, tbnTr, uvOriginal);
lightsDiffuseColor += pointDiffuseColor;
coatLightsDiffuseColor += coatPointDiffuseColor;
transmissionColor += pointTransmissionColor;
Expand Down Expand Up @@ -2155,7 +2155,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
}

float3 pointDiffuseColor, coatPointDiffuseColor, pointTransmissionColor, pointSpecularColor;
PBR::GetDirectLightInput(pointDiffuseColor, coatPointDiffuseColor, pointTransmissionColor, pointSpecularColor, worldSpaceNormal.xyz, coatWorldNormal, refractedViewDirectionWS, worldSpaceViewDirection, refractedLightDirection, normalizedLightDirection, mainLayerFinalLightColor, coatFinalLightColor, pbrSurfaceProperties, tbn, uvOriginal);
PBR::GetDirectLightInput(pointDiffuseColor, coatPointDiffuseColor, pointTransmissionColor, pointSpecularColor, worldSpaceNormal.xyz, coatWorldNormal, refractedViewDirectionWS, worldSpaceViewDirection, refractedLightDirection, normalizedLightDirection, mainLayerFinalLightColor, coatFinalLightColor, pbrSurfaceProperties, tbnTr, uvOriginal);
lightsDiffuseColor += pointDiffuseColor;
coatLightsDiffuseColor += coatPointDiffuseColor;
transmissionColor += pointTransmissionColor;
Expand Down