TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(did this before the core profile specification update so may be unnecessary): shift surface class method on out to a global with an inout to modify a passed one.

Browse source
This commit is contained in:
Brian Roberts 2019-05-24 19:07:50 -05:00
parent 69e9feb2a1
commit cf64cc4537
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
View file

@ -108,20 +108,19 @@ struct Surface
vec3 albedo; // diffuse light absorbtion value (rgb) vec3 albedo; // diffuse light absorbtion value (rgb)
vec3 R; // reflection vector vec3 R; // reflection vector
vec3 F; // fresnel term computed from f0, N and V vec3 F; // fresnel term computed from f0, N and V
void Update();
}; };
void Surface::Update() void updateSurface(inout Surface surface)
{ {
NdotV = abs(dot(N, V)) + 1e-5f; // avoid artifact surface.NdotV = abs(dot(surface.N, surface.V)) + 1e-5f; // avoid artifact
albedo = baseColor.rgb * (1.0 - metalness); surface.albedo = surface.baseColor.rgb * (1.0 - surface.metalness);
f0 = lerp(vec3(0.04), baseColor.rgb, metalness); surface.f0 = lerp(vec3(0.04), surface.baseColor.rgb, surface.metalness);
R = -reflect(V, N); surface.R = -reflect(surface.V, surface.N);
float f90 = saturate(50.0 * dot(f0, vec3(0.33,0.33,0.33))); float f90 = saturate(50.0 * dot(surface.f0, vec3(0.33,0.33,0.33)));
F = F_Schlick(f0, f90, NdotV); surface.F = F_Schlick(surface.f0, f90, surface.NdotV);
} }
Surface createSurface(vec4 normDepth, sampler2D colorBuffer, sampler2D matInfoBuffer, in vec2 uv, in vec3 wsEyePos, in vec3 wsEyeRay, in mat4 invView) Surface createSurface(vec4 normDepth, sampler2D colorBuffer, sampler2D matInfoBuffer, in vec2 uv, in vec3 wsEyePos, in vec3 wsEyeRay, in mat4 invView)
{ {
Surface surface;// = Surface(); Surface surface;// = Surface();
@ -139,7 +138,7 @@ Surface createSurface(vec4 normDepth, sampler2D colorBuffer, sampler2D matInfoBu
surface.metalness = gbuffer2.a; surface.metalness = gbuffer2.a;
surface.ao = gbuffer2.g; surface.ao = gbuffer2.g;
surface.matFlag = gbuffer2.r; surface.matFlag = gbuffer2.r;
surface.Update(); updateSurface(surface);
return surface; return surface;
} }
@ -159,7 +158,7 @@ Surface createForwardSurface(vec4 baseColor, vec4 normal, vec4 pbrProperties, in
surface.ao = pbrProperties.g; surface.ao = pbrProperties.g;
surface.matFlag = pbrProperties.r; surface.matFlag = pbrProperties.r;
surface.Update(); updateSurface(surface);
return surface; return surface;
} }
@ -439,4 +438,4 @@ vec4 computeForwardProbes(Surface surface,
finalColor = vec4(irradiance.rgb,1); finalColor = vec4(irradiance.rgb,1);
return finalColor; return finalColor;
} }