From 0f3678f7fd142c3f4340012e7a6618c995955551 Mon Sep 17 00:00:00 2001 From: brimson Date: Sun, 5 Jun 2022 00:47:26 -0700 Subject: [PATCH] Implement standard solver again --- shaders/cMotionBlur.fx | 2 +- shaders/cOpticalFlow.fx | 2 +- shaders/kDatamosh.fx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shaders/cMotionBlur.fx b/shaders/cMotionBlur.fx index 056bc59..506443a 100644 --- a/shaders/cMotionBlur.fx +++ b/shaders/cMotionBlur.fx @@ -585,7 +585,7 @@ namespace Motion_Blur // [IxIy Iy^2+A] [V] = -[IyIt] UVAverage.xy = (AreaGrad.xx * AreaAvg[0]) + (AreaGrad.yy * AreaAvg[1]) + (AreaGrad.zz * AreaAvg[2]) + (AreaGrad.ww * AreaAvg[3]); UVAverage.xy = UVAverage.xy * Alpha; - OpticalFlow.xy = lerp(CenterAverage.xy, Aii.xy * (UVAverage.xy - (Aij * CenterAverage.yx) - Bi.xy), 2.0 / 3.0); + OpticalFlow.xy = Aii.xy * (UVAverage.xy - (Aij * CenterAverage.yx) - Bi.xy); } #define LEVEL_PS(NAME, SAMPLER, LEVEL) \ diff --git a/shaders/cOpticalFlow.fx b/shaders/cOpticalFlow.fx index 32489be..137d5bd 100644 --- a/shaders/cOpticalFlow.fx +++ b/shaders/cOpticalFlow.fx @@ -629,7 +629,7 @@ namespace OpticalFlow // [IxIy Iy^2+A] [V] = -[IyIt] UVAverage.xy = (AreaGrad.xx * AreaAvg[0]) + (AreaGrad.yy * AreaAvg[1]) + (AreaGrad.zz * AreaAvg[2]) + (AreaGrad.ww * AreaAvg[3]); UVAverage.xy = UVAverage.xy * Alpha; - OpticalFlow.xy = lerp(CenterAverage.xy, Aii.xy * (UVAverage.xy - (Aij * CenterAverage.yx) - Bi.xy), 2.0 / 3.0); + OpticalFlow.xy = Aii.xy * (UVAverage.xy - (Aij * CenterAverage.yx) - Bi.xy); } #define LEVEL_PS(NAME, SAMPLER, LEVEL) \ diff --git a/shaders/kDatamosh.fx b/shaders/kDatamosh.fx index ddd2b58..9329af6 100644 --- a/shaders/kDatamosh.fx +++ b/shaders/kDatamosh.fx @@ -592,7 +592,7 @@ namespace Datamosh // [IxIy Iy^2+A] [V] = -[IyIt] UVAverage.xy = (AreaGrad.xx * AreaAvg[0]) + (AreaGrad.yy * AreaAvg[1]) + (AreaGrad.zz * AreaAvg[2]) + (AreaGrad.ww * AreaAvg[3]); UVAverage.xy = UVAverage.xy * Alpha; - OpticalFlow.xy = lerp(CenterAverage.xy, Aii.xy * (UVAverage.xy - (Aij * CenterAverage.yx) - Bi.xy), 2.0 / 3.0); + OpticalFlow.xy = Aii.xy * (UVAverage.xy - (Aij * CenterAverage.yx) - Bi.xy); } #define LEVEL_PS(NAME, SAMPLER, LEVEL) \