merged my changes

- Moved rotate() to bokeh.glsl
- Reduced sample array size from 1024 to 64
- Added jitter to particles
This commit is contained in:
WoMspace
2023-01-16 05:12:13 +00:00
parent 539dafc8d2
commit 6b053568b3
6 changed files with 106 additions and 1061 deletions

View File

@ -57,9 +57,6 @@ uniform int framemod8;
vec4 toClipSpace3(vec3 viewSpacePosition) {
return vec4(projMAD(gl_ProjectionMatrix, viewSpacePosition),-viewSpacePosition.z);
}
mat2 rotate(float angle){
return mat2(cos(angle), -sin(angle), sin(angle), cos(angle));
}
//////////////////////////////VOID MAIN//////////////////////////////
//////////////////////////////VOID MAIN//////////////////////////////
//////////////////////////////VOID MAIN//////////////////////////////
@ -113,22 +110,6 @@ void main() {
#ifdef TAA
gl_Position.xy += offsets[framemod8] * gl_Position.w*texelSize;
#endif
#ifdef DOF_JITTER
vec2 jitter = clamp(jitter_offsets[1024 - (frameCounter % 1024)] ,-1.0,1.0) ;
jitter = rotate(frameTimeCounter) * jitter;
jitter.y *= aspectRatio;
float focus = DOF_JITTER_FOCUS;
// vec2 coords = vec2(8.0/viewWidth, 256.0/viewHeight);
// float focus = texture2D(colortex4, coords).r;
// focus = pow(far + 1.0, focus) - 1.0;
float distanceToFocus = gl_Position.z - focus;
gl_Position.xy += (jitter * JITTER_STRENGTH) * distanceToFocus * 1e-2;
#endif
vec3 sc = texelFetch2D(colortex4,ivec2(6,37),0).rgb;
@ -138,4 +119,15 @@ void main() {
WsunVec = lightCol.a*normalize(mat3(gbufferModelViewInverse) *sunPosition);
#ifdef DOF_JITTER
vec2 jitter = clamp(jitter_offsets[frameCounter % 64], -1.0, 1.0);
jitter = rotate(frameCounter) * jitter;
jitter.y *= aspectRatio;
jitter.x *= DOF_ANAMORPHIC_RATIO;
float focus = DOF_JITTER_FOCUS;
float distanceToFocus = gl_Position.z - focus;
gl_Position.xy += (jitter * JITTER_STRENGTH) * distanceToFocus * 1e-2;
#endif
}