Skip to content

Commit

Permalink
coat lighting model
Browse files Browse the repository at this point in the history
  • Loading branch information
@jk20012001
jk20012001 committed Jul 18, 2023
1 parent 9415d1b commit 96be289
Show file tree
Hide file tree
Showing 18 changed files with 913 additions and 96 deletions.
35 changes: 34 additions & 1 deletion editor/assets/chunks/common/lighting/brdf.chunk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,36 @@ float V_Kelemen(float LoH)
{
return 0.25 / (LoH * LoH);
}

float square(float a) { return a * a;}
vec2 square(vec2 a) { return a * a;}
vec3 square(vec3 a) { return a * a;}
float G_Schlick( float roughness, float NoV, float NoL )
{
float k = square( 0.5 + 0.5*roughness );
float G_SchlickV = NoV * (1.0 - k) + k;
float G_SchlickL = NoL * (1.0 - k) + k;
return 0.25 / ( G_SchlickV * G_SchlickL );
}
vec3 F_Schlick( vec3 specularColor, float VoH )
{
float Fc = exp2( (-5.55473 * VoH - 6.98316) * VoH );
float selfShadowTerm = saturate(50.0 * specularColor.g);
return specularColor * (1.0 - Fc) + vec3(selfShadowTerm * Fc);
}
vec3 F_SchlickMultiplier( vec3 specularColor, float VoH )
{
float Fc = exp2( (-5.55473 * VoH - 6.98316) * VoH );
float selfShadowTerm = saturate(50.0 * specularColor.g);
return vec3(1.0 - Fc) + vec3(selfShadowTerm * Fc) / (specularColor + vec3(EPSILON));
}

vec3 F_Fresnel( vec3 SpecularColor, float VoH )
{
vec3 specularColorSqrt = sqrt( clamp( vec3(0.0), vec3(0.99), SpecularColor ) );
vec3 n = ( 1.0 + specularColorSqrt ) / ( 1.0 - specularColorSqrt );
vec3 g = sqrt( n*n + VoH*VoH - 1.0 );
return 0.5 * square( (g - VoH) / (g + VoH) ) * ( 1.0 + square( ((g+VoH)*VoH - 1.0) / ((g-VoH)*VoH + 1.0) ) );
}

float D_GGX(float roughness, float NoH)
{
Expand Down Expand Up @@ -92,6 +115,16 @@ vec3 IntegratedGFApprox (vec3 specular, float roughness, float NoV) {
AB.y *= clamp(50.0 * specular.g, 0.0, 1.0);
return max(vec3(0.0), specular * AB.x + AB.y);
}
void IntegratedGFMultiplier (out vec3 integratedGF, out vec3 integratedF, vec3 specular, float roughness, float NoV) {
const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022);
const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04);
vec4 r = roughness * c0 + c1;
float a004 = min(r.x * r.x, exp2(-9.28 * NoV)) * r.x + r.y;
vec2 AB = vec2(-1.04, 1.04) * a004 + r.zw;
AB.y *= clamp(50.0 * specular.g, 0.0, 1.0);
integratedF = vec3(max(0.0, AB.x));
integratedGF = max(vec3(0.0), vec3(AB.x) + vec3(AB.y) / (specular + EPSILON_LOWP));
}

//Diffuse_Lambert
#define DiffuseCoefficient_EnergyConservation INV_PI
1 change: 1 addition & 0 deletions editor/assets/chunks/common/lighting/bxdf.chunk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

// saturated N dot V
// for env reflection with non-metal and smooth surface
float CalculateFresnelCoefficient(float ior, float NoVSat)
{
float g, c, n, prev, next;
Expand Down
10 changes: 6 additions & 4 deletions editor/assets/chunks/lighting-models/data-structures/lighting-intermediate-data.chunk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ struct LightingIntermediateData
float distToCamera, distToCameraSqr; // pos->camera
float angleAttenuation, distAttenuation;

float NoL, NoV, NoH;//, VoH;
float NoL, NoV, NoH, VoH;
float NoLSat, NoVSat, NoHSat;//, VoHSat; // clamped to 0-1
float NoVAbsSat; // abs and clamped to 1
float NoVAbsSat, VoHAbsSat; // abs and clamped to 1

HIGHP_VALUE_STRUCT_DEFINE(vec3, worldPosition);

Expand All @@ -16,7 +16,7 @@ struct LightingIntermediateData

// material data
float specularParam; // roughness or specular power
float ior;
float ior, layerOpacity;

#if CC_SURFACES_LIGHTING_ANISOTROPIC
float anisotropyShape;
Expand Down Expand Up @@ -92,9 +92,11 @@ void CCSurfacesLightingGetIntermediateData_PerLight(inout LightingIntermediateDa
// dot
data.NoL = dot(data.N, data.L);
data.NoH = dot(data.N, data.H);
// data.VoH = dot(data.V, data.H);
data.VoH = dot(data.V, data.H);

data.NoLSat = max(data.NoL, 0.0);
data.NoHSat = max(data.NoH, 0.0);
// data.VoHSat = max(data.VoH, 0.0);

data.VoHAbsSat = max(abs(data.VoH), 0.0);
}
29 changes: 22 additions & 7 deletions editor/assets/chunks/lighting-models/data-structures/lighting-result.chunk
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,48 @@
struct LightingResult
{
// material-dependent lighting data
vec3 diffuseColorWithLighting, specularColorWithLighting, specularColorWithEnvLighting;
vec3 diffuseColorWithLighting, specularColorWithLighting;

// pure lighting
vec3 directDiffuse, directSpecular;
vec3 environmentDiffuse, environmentSpecular;
vec3 directDiffuse, directSpecular, directGF;
vec3 environmentDiffuse, environmentSpecular, environmentGF;
float shadow, ao;
vec3 lightmapColor;
vec3 emissive;

// advanced
#if CC_SURFACES_LIGHTING_USE_FRESNEL
float fresnel;
vec3 fresnel; // for transmit materials , rim or special effects

#if CC_SURFACES_LIGHTING_USE_MULTIPLE_LAYER_BLEND
vec3 directDiffuseSubLayers, directSpecularSubLayers;
vec3 environmentDiffuseSubLayers, environmentSpecularSubLayers;
#endif

#if CC_SURFACES_LIGHTING_TRANSMIT_SPECULAR
vec3 directTransmitSpecular, environmentTransmitSpecular;
#endif
#if CC_SURFACES_LIGHTING_TRANSMIT_DIFFUSE
vec3 directTransmitDiffuse, environmentTransmitDiffuse;
#endif
#endif
#if CC_SURFACES_LIGHTING_2ND_LAYER_SPECULAR
vec3 direct2ndSpecular, environment2ndSpecular;
vec3 specularColorWithLighting2ndSpecular, specularColorWithEnvLighting2ndSpecular;
vec3 specularColorWithLighting2ndSpecular;
vec3 directGF2ndSpecular, environmentGF2ndSpecular;
vec3 directSubLayerF, environmentSubLayerF;
#endif
#if CC_SURFACES_LIGHTING_TT
vec3 directTT;
vec3 diffuseColorWithLightingTT;
#endif
//vec3 scattered;
};


/* for multi-layer materials, should define:
struct LightingResultLayer
{
vec3 diffuseColorWithLighting, specularColorWithLighting;
vec3 directDiffuse, directSpecular, directGF;
vec3 environmentDiffuse, environmentSpecular, environmentGF;
}
*/
87 changes: 69 additions & 18 deletions editor/assets/chunks/lighting-models/lighting-flow/common-flow.chunk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@
CCSurfacesInitializeLightingIntermediateData(lightingData, surfaceData);

LightingResult lightingResult;
CCSurfacesLightingInitializeColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, lightingResult.specularColorWithEnvLighting, surfaceData, lightingData);
CCSurfacesLightingInitializeColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, surfaceData, lightingData);
lightingResultAccumulated.diffuseColorWithLighting = lightingResult.diffuseColorWithLighting;
lightingResultAccumulated.specularColorWithLighting = lightingResult.specularColorWithLighting;
lightingResultAccumulated.specularColorWithEnvLighting = lightingResult.specularColorWithEnvLighting;

#if CC_SURFACES_LIGHTING_2ND_LAYER_SPECULAR
vec3 diff;
SurfacesMaterialData surfaceData2ndSpecular;
CCSurfacesGetSurfacesMaterialData2ndSpecular(surfaceData2ndSpecular, surfaceData);
CCSurfacesLightingInitializeColorWithLighting(diff, lightingResultAccumulated.specularColorWithLighting2ndSpecular, lightingResultAccumulated.specularColorWithEnvLighting2ndSpecular, surfaceData2ndSpecular, lightingData);
CCSurfacesLightingInitializeColorWithLighting(diff, lightingResultAccumulated.specularColorWithLighting2ndSpecular, surfaceData2ndSpecular, lightingData);
#endif

int numLights = CC_PIPELINE_TYPE == CC_PIPELINE_TYPE_FORWARD ? LIGHTS_PER_PASS : int(cc_lightDir[0].w);
Expand All @@ -29,15 +28,18 @@

vec3 lightDirWithLength = IS_RANGED_DIRECTIONAL_LIGHT(cc_lightPos[i].w) ? -normalize(cc_lightDir[i].xyz) : cc_lightPos[i].xyz - worldPos;
CCSurfacesLightingCalculateIntermediateData_PerLight(lightingData, surfaceData, lightDirWithLength);
CCSurfacesLightingCalculateColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, lightingResult.specularColorWithEnvLighting, surfaceData, lightingData);
CCSurfacesLightingCalculateColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, surfaceData, lightingData);

vec3 diffuseLighting, specularLighting;
CCSurfacesLightingCalculateDirect(diffuseLighting, specularLighting, lightingData, cc_lightColor[i]);

float fresnel = 1.0;
#if CC_SURFACES_LIGHTING_USE_FRESNEL
fresnel = lightingResult.fresnel = CCSurfaceLightingCalculateFresnel(lightingData);
vec3 fresnel = CCSurfaceLightingCalculateExtraFresnel(lightingData);
#else
vec3 fresnel = vec3(1.0);
#endif
lightingResult.fresnel = fresnel;


float shadow = 1.0;
#if CC_RECEIVE_SHADOW && CC_SHADOW_TYPE == CC_SHADOW_MAP
Expand Down Expand Up @@ -84,7 +86,8 @@
lightingData.angleAttenuation = angleAtt;
lightingData.distAttenuation = distAtt;
lightingResult.directDiffuse = diffuseLighting * multiplier;
lightingResult.directSpecular = specularLighting * multiplier * fresnel;
lightingResult.directSpecular = specularLighting * multiplier;
CCSurfaceLightingCalculateDirectFresnel(lightingResult.directGF, lightingData, lightingResult.specularColorWithLighting, vec3(1.0));

vec4 attenuatedLightColorAndIntensity = vec4(cc_lightColor[i].xyz, cc_lightColor[i].w * multiplier);

Expand All @@ -106,7 +109,9 @@
CCSurfacesInitializeLightingIntermediateData(lightingData2ndSpecular, surfaceData2ndSpecular);
CCSurfacesLightingCalculateIntermediateData_PerLight(lightingData2ndSpecular, surfaceData, lightDirWithLength);
CCSurfacesLightingCalculateDirect2ndSpecular(lightingResult.direct2ndSpecular, lightingData2ndSpecular, attenuatedLightColorAndIntensity, surfaceData2ndSpecular.intensity2ndSpecular, lightingResult.directSpecular);
lightingResult.direct2ndSpecular *= multiplier * fresnel;
CCSurfaceLightingCalculateDirectFresnel(lightingResult.directGF2ndSpecular, lightingData2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular, vec3(1.0));

lightingResult.direct2ndSpecular *= multiplier;
#endif

#if CC_SURFACES_LIGHTING_TT
Expand Down Expand Up @@ -139,7 +144,7 @@
CCSurfacesInitializeLightingIntermediateData(lightingData, surfaceData);
CCSurfacesInitializeLightingResult(lightingResult, surfaceData);

CCSurfacesLightingInitializeColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, lightingResult.specularColorWithEnvLighting, surfaceData, lightingData);
CCSurfacesLightingInitializeColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, surfaceData, lightingData);

CCSurfacesLightingCalculateIntermediateData_PerLight(lightingData, surfaceData, -cc_mainLitDir.xyz);

Expand Down Expand Up @@ -200,20 +205,24 @@
#endif


// apply SSR, local probe & global probe
vec3 unused;
CCSurfacesLightingCalculateEnvironment(lightingResult.environmentDiffuse, lightingResult.environmentSpecular, lightingData, cc_ambientSky.w);
CCSurfaceLightingCalculateEnvironmentFresnel(lightingResult.environmentGF, unused, lightingData, lightingResult.specularColorWithLighting);

// dynamic & stationary dir light
lightingResult.directDiffuse = lightingResult.directSpecular = vec3(0.0);
#if !CC_DISABLE_DIRECTIONAL_LIGHT && !CC_FORWARD_ADD
CCSurfacesLightingCalculateColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, lightingResult.specularColorWithEnvLighting, surfaceData, lightingData);
CCSurfacesLightingCalculateColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, surfaceData, lightingData);

CCSurfacesLightingCalculateDirect(lightingResult.directDiffuse, lightingResult.directSpecular, lightingData, cc_mainLitColor);
CCSurfaceLightingCalculateDirectFresnel(lightingResult.directGF, lightingData, lightingResult.specularColorWithLighting, lightingResult.environmentGF);
#endif

// apply SSR, local probe & global probe
CCSurfacesLightingCalculateEnvironment(lightingResult.environmentDiffuse, lightingResult.environmentSpecular, lightingData, cc_ambientSky.w);


#if CC_SURFACES_LIGHTING_USE_FRESNEL
lightingResult.fresnel = CCSurfaceLightingCalculateFresnel(lightingData);
lightingResult.fresnel = CCSurfaceLightingCalculateExtraFresnel(lightingData);
#else
lightingResult.fresnel = vec3(1.0);
#endif

#if CC_SURFACES_LIGHTING_TRANSMIT_SPECULAR
Expand All @@ -236,11 +245,53 @@
LightingIntermediateData lightingData2ndSpecular;
CCSurfacesInitializeLightingIntermediateData(lightingData2ndSpecular, surfaceData2ndSpecular);
CCSurfacesLightingCalculateIntermediateData_PerLight(lightingData2ndSpecular, surfaceData2ndSpecular, -cc_mainLitDir.xyz);
CCSurfacesLightingCalculateDirect2ndSpecular(lightingResult.direct2ndSpecular, lightingData2ndSpecular, cc_mainLitColor, surfaceData2ndSpecular.intensity2ndSpecular, lightingResult.directSpecular);
CCSurfacesLightingCalculateEnvironment2ndSpecular(lightingResult.environment2ndSpecular, lightingData2ndSpecular, cc_ambientSky.w, surfaceData2ndSpecular.intensity2ndSpecular, lightingResult.environmentSpecular);

vec3 diff;
CCSurfacesLightingInitializeColorWithLighting(diff, lightingResult.specularColorWithLighting2ndSpecular, lightingResult.specularColorWithEnvLighting2ndSpecular, surfaceData2ndSpecular, lightingData2ndSpecular);
CCSurfacesLightingInitializeColorWithLighting(diff, lightingResult.specularColorWithLighting2ndSpecular, surfaceData2ndSpecular, lightingData2ndSpecular);

CCSurfacesLightingCalculateEnvironment2ndSpecular(lightingResult.environment2ndSpecular, lightingData2ndSpecular, cc_ambientSky.w, surfaceData2ndSpecular.intensity2ndSpecular, lightingResult.environmentSpecular);
CCSurfaceLightingCalculateEnvironmentFresnel(lightingResult.environmentGF2ndSpecular, lightingResult.environmentSubLayerF, lightingData2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular);

CCSurfacesLightingCalculateDirect2ndSpecular(lightingResult.direct2ndSpecular, lightingData2ndSpecular, cc_mainLitColor, surfaceData2ndSpecular.intensity2ndSpecular, lightingResult.directSpecular);
CCSurfaceLightingCalculateDirectFresnel(lightingResult.directGF2ndSpecular, lightingData2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular, lightingResult.environmentGF2ndSpecular);

#if CC_SURFACES_LIGHTING_USE_MULTIPLE_LAYER_BLEND
vec3 lastLayerF, zeroVector = vec3(0.0);
vec3 blendedBaseD = lightingResult.directDiffuse, blendedBaseS = lightingResult.directSpecular;
CCSurfaceLightingCalculateDirectSubLayerFresnel(lightingResult.directSubLayerF, lightingData2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular);
InitializeLayerBlending(blendedBaseD, blendedBaseS,
lightingResult.directDiffuseSubLayers, lightingResult.directSpecularSubLayers,
lastLayerF,
lightingResult.directDiffuse, lightingResult.directSpecular
);
CalculateLayerBlending (blendedBaseD, blendedBaseS,
lightingResult.directDiffuseSubLayers, lightingResult.directSpecularSubLayers,
lastLayerF,
zeroVector, zeroVector,
lightingResult.direct2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular,
lightingData2ndSpecular.layerOpacity, lightingResult.directSubLayerF
);
lightingResult.directDiffuse = blendedBaseD;
lightingResult.directSpecular = blendedBaseS;

zeroVector = vec3(0.0);
blendedBaseD = lightingResult.environmentDiffuse; blendedBaseS = lightingResult.environmentSpecular;
CCSurfaceLightingCalculateEnvironmentSubLayerFresnel(lightingResult.environmentSubLayerF, lightingData2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular);
InitializeLayerBlending(blendedBaseD, blendedBaseS,
lightingResult.environmentDiffuseSubLayers, lightingResult.environmentSpecularSubLayers,
lastLayerF,
lightingResult.environmentDiffuse, lightingResult.environmentSpecular
);
CalculateLayerBlending (blendedBaseD, blendedBaseS,
lightingResult.environmentDiffuseSubLayers, lightingResult.environmentSpecularSubLayers,
lastLayerF,
zeroVector, zeroVector,
lightingResult.environment2ndSpecular, lightingResult.specularColorWithLighting2ndSpecular,
lightingData2ndSpecular.layerOpacity, lightingResult.environmentSubLayerF
);
lightingResult.environmentDiffuse = blendedBaseD;
lightingResult.environmentSpecular = blendedBaseS;
#endif
#endif

#if CC_SURFACES_LIGHTING_TT
Expand Down
Loading

0 comments on commit 96be289

Please sign in to comment.