edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Format

Browse Source
This commit is contained in:
luboslenco
2019-10-06 19:03:59 +02:00
parent 1965719507
commit 15a2501906
89 changed files with 346 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shaders/painter/deferred_light.frag.glsl
+7 -7
View File
@@ -175,7 +175,7 @@ out vec4 fragColor;
void main() {
vec4 g0 = textureLod(gbuffer0, texCoord, 0.0); // Normal.xy, roughness, metallic/matid
vec3 n;
n.z = 1.0 - abs(g0.x) - abs(g0.y);
n.xy = n.z >= 0.0 ? g0.xy : octahedronWrap(g0.xy);
@@ -227,7 +227,7 @@ void main() {
#endif
envl.rgb *= albedo;
#ifdef _Rad // Indirect specular
envl.rgb += prefilteredColor * (f0 * envBRDF.x + envBRDF.y) * 1.5 * occspec.y;
#else
@@ -245,7 +245,7 @@ void main() {
#else
vec3 voxpos = p / voxelgiHalfExtents;
#endif
#ifndef _VoxelAONoTrace
#ifdef _VoxelGITemporal
envl.rgb *= 1.0 - (traceAO(voxpos, n, voxels) * voxelBlend +
@@ -254,7 +254,7 @@ void main() {
envl.rgb *= 1.0 - traceAO(voxpos, n, voxels);
#endif
#endif
#endif
fragColor.rgb = envl;
@@ -281,7 +281,7 @@ void main() {
// for(uint step = 0; step < 400 && color.a < 0.99f; ++step) {
// vec3 point = origin + 0.005 * step * direction;
// color += (1.0f - color.a) * textureLod(voxels, point * 0.5 + 0.5, 0);
// }
// }
// fragColor.rgb += color.rgb;
// Show SSAO
@@ -371,12 +371,12 @@ void main() {
, occspec.x
#endif
);
#ifdef _Spot
#ifdef _SSS
if (g0.a == 2.0) fragColor.rgb += fragColor.rgb * SSSSTransmittance(LWVPSpot0, p, n, normalize(pointPos - p), lightPlane.y, shadowMapSpot[0]);
#endif
#endif
#endif
#endif
Shaders/painter/deferred_light_voxel.frag.glsl
+7 -7
View File
@@ -176,7 +176,7 @@ out vec4 fragColor;
void main() {
vec4 g0 = textureLod(gbuffer0, texCoord, 0.0); // Normal.xy, roughness, metallic/matid
vec3 n;
n.z = 1.0 - abs(g0.x) - abs(g0.y);
n.xy = n.z >= 0.0 ? g0.xy : octahedronWrap(g0.xy);
@@ -228,7 +228,7 @@ void main() {
#endif
envl.rgb *= albedo;
#ifdef _Rad // Indirect specular
envl.rgb += prefilteredColor * (f0 * envBRDF.x + envBRDF.y) * 1.5 * occspec.y;
#else
@@ -246,7 +246,7 @@ void main() {
#else
vec3 voxpos = p / voxelgiHalfExtents;
#endif
#ifndef _VoxelAONoTrace
#ifdef _VoxelGITemporal
envl.rgb *= 1.0 - (traceAO(voxpos, n, voxels) * voxelBlend +
@@ -255,7 +255,7 @@ void main() {
envl.rgb *= 1.0 - traceAO(voxpos, n, voxels);
#endif
#endif
#endif
fragColor.rgb = envl;
@@ -282,7 +282,7 @@ void main() {
// for(uint step = 0; step < 400 && color.a < 0.99f; ++step) {
// vec3 point = origin + 0.005 * step * direction;
// color += (1.0f - color.a) * textureLod(voxels, point * 0.5 + 0.5, 0);
// }
// }
// fragColor.rgb += color.rgb;
// Show SSAO
@@ -372,12 +372,12 @@ void main() {
, occspec.x
#endif
);
#ifdef _Spot
#ifdef _SSS
if (g0.a == 2.0) fragColor.rgb += fragColor.rgb * SSSSTransmittance(LWVPSpot0, p, n, normalize(pointPos - p), lightPlane.y, shadowMapSpot[0]);
#endif
#endif
#endif
#endif
Shaders/painter/world_pass.frag.glsl
+1 -1
View File
@@ -154,7 +154,7 @@ void main() {
vec3 n = normalize(normal);
float phi = acos(n.z);
float theta = atan(-n.y, n.x) + PI;
float cos_theta = clamp(n.z, 0.0, 1.0);
float cos_gamma = dot(n, hosekSunDirection);
float gamma_val = acos(cos_gamma);