Fix T81752 EEVEE: Camera Motion Blur is not blending steps properly
This was due to improper calculation of velocity factor and an error in the camera data swapping between two steps.
This commit is contained in:
parent
15eec7f8b9
commit
aae60f0fec
Notes:
blender-bot
2023-02-14 11:20:29 +01:00
Referenced by issue #81752, Motion Blur in EEVEE is not blending steps properly for camera motion in newer versions
|
@ -490,7 +490,7 @@ void EEVEE_motion_blur_swap_data(EEVEE_Data *vedata)
|
|||
BLI_assert((effects->enabled_effects & EFFECT_MOTION_BLUR) != 0);
|
||||
|
||||
/* Camera Data. */
|
||||
effects->motion_blur.camera[MB_PREV] = effects->motion_blur.camera[MB_CURR];
|
||||
effects->motion_blur.camera[MB_PREV] = effects->motion_blur.camera[MB_NEXT];
|
||||
|
||||
/* Object Data. */
|
||||
for (BLI_ghashIterator_init(&ghi, effects->motion_blur.object);
|
||||
|
|
|
@ -13,16 +13,19 @@ void main()
|
|||
{
|
||||
/* Extract pixel motion vector from camera movement. */
|
||||
ivec2 texel = ivec2(gl_FragCoord.xy);
|
||||
vec2 uv = gl_FragCoord.xy / vec2(textureSize(depthBuffer, 0).xy);
|
||||
vec2 uv_curr = gl_FragCoord.xy / vec2(textureSize(depthBuffer, 0).xy);
|
||||
|
||||
float depth = texelFetch(depthBuffer, texel, 0).r;
|
||||
|
||||
vec3 world_position = project_point(currViewProjMatrixInv, vec3(uv, depth) * 2.0 - 1.0);
|
||||
vec2 uv_prev = project_point(prevViewProjMatrix, world_position).xy * 0.5 + 0.5;
|
||||
vec2 uv_next = project_point(nextViewProjMatrix, world_position).xy * 0.5 + 0.5;
|
||||
uv_curr = uv_curr * 2.0 - 1.0;
|
||||
depth = depth * 2.0 - 1.0;
|
||||
|
||||
outData.xy = uv_prev - uv;
|
||||
outData.zw = uv_next - uv;
|
||||
vec3 world_position = project_point(currViewProjMatrixInv, vec3(uv_curr, depth));
|
||||
vec2 uv_prev = project_point(prevViewProjMatrix, world_position).xy;
|
||||
vec2 uv_next = project_point(nextViewProjMatrix, world_position).xy;
|
||||
|
||||
outData.xy = uv_prev - uv_curr;
|
||||
outData.zw = uv_next - uv_curr;
|
||||
|
||||
/* Encode to unsigned normalized 16bit texture. */
|
||||
outData = outData * 0.5 + 0.5;
|
||||
|
|
Loading…
Reference in New Issue