maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Whitespace cleanup

Browse source
This commit is contained in:
Moritz Brückner 2021-09-02 17:14:37 +02:00
parent 44d8325001
commit b7024a5854
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Shaders/blur_gaus_pass/blur_gaus_pass.frag.glsl
View file

@ -28,7 +28,7 @@ void main() {
fragColor.rgb += textureLod(tex, texCoord + s, 0.0).rgb * weight[i]; fragColor.rgb += textureLod(tex, texCoord + s, 0.0).rgb * weight[i];
fragColor.rgb += textureLod(tex, texCoord - s, 0.0).rgb * weight[i]; fragColor.rgb += textureLod(tex, texCoord - s, 0.0).rgb * weight[i];
} }
#ifdef _CPostprocess #ifdef _CPostprocess
fragColor.rgb *= PPComp11.x / 5; fragColor.rgb *= PPComp11.x / 5;
#else #else

6
Shaders/ssao_pass/ssao_pass.frag.glsl
View file

@ -25,12 +25,12 @@ void main() {
float depth = textureLod(gbufferD, texCoord, 0.0).r * 2.0 - 1.0; float depth = textureLod(gbufferD, texCoord, 0.0).r * 2.0 - 1.0;
if (depth == 1.0) { fragColor = 1.0; return; } if (depth == 1.0) { fragColor = 1.0; return; }
vec2 enc = textureLod(gbuffer0, texCoord, 0.0).rg; vec2 enc = textureLod(gbuffer0, texCoord, 0.0).rg;
vec3 n; vec3 n;
n.z = 1.0 - abs(enc.x) - abs(enc.y); n.z = 1.0 - abs(enc.x) - abs(enc.y);
n.xy = n.z >= 0.0 ? enc.xy : octahedronWrap(enc.xy); n.xy = n.z >= 0.0 ? enc.xy : octahedronWrap(enc.xy);
n = normalize(n); n = normalize(n);
vec3 vray = normalize(viewRay); vec3 vray = normalize(viewRay);
vec3 currentPos = getPosNoEye(eyeLook, vray, depth, cameraProj); vec3 currentPos = getPosNoEye(eyeLook, vray, depth, cameraProj);
// vec3 currentPos = getPos2NoEye(eye, invVP, depth, texCoord); // vec3 currentPos = getPos2NoEye(eye, invVP, depth, texCoord);
@ -55,7 +55,7 @@ void main() {
vec3 pos = getPos2NoEye(eye, invVP, depth, texCoord + k) - currentPos; vec3 pos = getPos2NoEye(eye, invVP, depth, texCoord + k) - currentPos;
fragColor += max(0, dot(pos, n) - currentDistanceB) / (dot(pos, pos) + 0.015); fragColor += max(0, dot(pos, n) - currentDistanceB) / (dot(pos, pos) + 0.015);
} }
#ifdef _CPostprocess #ifdef _CPostprocess
fragColor *= (PPComp12.x * 0.3) / samples; fragColor *= (PPComp12.x * 0.3) / samples;
#else #else

2
Shaders/ssao_pass/ssao_pass.json
View file

@ -29,7 +29,7 @@
{ {
"name": "PPComp11", "name": "PPComp11",
"link": "_PPComp11", "link": "_PPComp11",
"ifdef":["_CPostprocess"] "ifdef": ["_CPostprocess"]
}, },
{ {
"name": "PPComp12", "name": "PPComp12",