nichkara/lace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opengl: Add comments and cosmetics to lighting shader.

Browse Source
This commit is contained in:
Rod Kay
2024-02-28 19:42:40 +11:00
parent e27c348247
commit 5d6861143a
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
3-mid/opengl/assets/shader/lighting-frag.snippet
View File

@@ -25,12 +25,13 @@ vec3
apply_Light (light Light, apply_Light (light Light,
vec3 surface_Color, vec3 surface_Color,
vec3 Normal, vec3 Normal,
vec3 surface_Site, vec3 surface_Site,
vec3 Surface_to_Camera) vec3 Surface_to_Camera)
{ {
vec3 Surface_to_Light; vec3 Surface_to_Light;
float Attenuation = 1.0; float Attenuation = 1.0;
if (Light.Site.w == 0.0) if (Light.Site.w == 0.0)
{ {
// Directional light. // Directional light.
@@ -43,14 +44,15 @@ apply_Light (light Light,
// Point light. // Point light.
// //
vec3 Surface_to_Light_vector = Light.Site.xyz - surface_Site; vec3 Surface_to_Light_vector = Light.Site.xyz - surface_Site;
float Distance_to_Light = length (Surface_to_Light_vector); // TODO: This is buggy causes wrong attenuation. float Distance_to_Light = length (Surface_to_Light_vector);
Surface_to_Light = normalize (Surface_to_Light_vector); Surface_to_Light = normalize (Surface_to_Light_vector);
Attenuation = 1.0 Attenuation = 1.0
/ ( 1.0 / ( 1.0
+ Light.Attenuation + Light.Attenuation
* pow (Distance_to_Light, 2)); * pow (Distance_to_Light, 2));
// Cone restrictions which affects attenuation. // Cone restrictions which affects attenuation.
// //
float Light_to_Surface_Angle = degrees (acos (dot (-Surface_to_Light, float Light_to_Surface_Angle = degrees (acos (dot (-Surface_to_Light,
@@ -62,28 +64,40 @@ apply_Light (light Light,
} }
} }
// Abmbient.
//
vec3 lit_surface_Color = surface_Color * Light.Color; vec3 lit_surface_Color = surface_Color * Light.Color;
vec3 Ambient = Light.ambient_Coefficient * lit_surface_Color; vec3 Ambient = Light.ambient_Coefficient * lit_surface_Color;
// Diffuse.
//
float diffuse_Coefficient = max (0.0, float diffuse_Coefficient = max (0.0,
dot (Normal, dot (Normal,
Surface_to_Light)); Surface_to_Light));
vec3 Diffuse = diffuse_Coefficient * lit_surface_Color; vec3 Diffuse = diffuse_Coefficient * lit_surface_Color;
float specular_Coefficient = 0.0;
// Specular.
//
float specular_Coefficient = 0.0;
if (diffuse_Coefficient > 0.0) if (diffuse_Coefficient > 0.0)
{ {
specular_Coefficient = pow (max (0.01, // Using '0.0' produces wierd results when specular_Coefficient = pow (max (0.0, // Using '0.0' can produce wierd results when
dot (Surface_to_Camera, // light shines directly on a flat surface. dot (Surface_to_Camera, // light shines directly on a flat surface.
reflect (-Surface_to_Light, reflect (-Surface_to_Light, // Use '0.01' to avoid this.
Normal))), Normal))),
frag_Shine); frag_Shine);
} }
vec3 Specular = specular_Coefficient * specular_Color * Light.Color; vec3 Specular = specular_Coefficient * specular_Color * Light.Color;
return Ambient + Attenuation * (Diffuse + Specular); // Linear color (before gamma correction).
// Linear color (before gamma correction).
//
return Ambient + Attenuation * (Diffuse + Specular);
} }

12
3-mid/opengl/assets/shader/lit_textured.frag
View File

@@ -38,13 +38,19 @@ main()
surface_Site, surface_Site,
Surface_to_Camera); Surface_to_Camera);
} }
// Final color (after gamma correction).
//
vec3 Gamma = vec3 (1.0 / 2.2); vec3 Gamma = vec3 (1.0 / 2.2);
final_Color = vec4 (pow (linear_Color, // Final color (after gamma correction). final_Color = vec4 (pow (linear_Color,
Gamma), Gamma),
surface_Color.a); surface_Color.a);
final_Color = min (final_Color, // Prevent light saturation. // Prevent light saturation.
surface_Color); //
// final_Color = min (final_Color,
// surface_Color);
} }