aboutsummaryrefslogtreecommitdiff
path: root/flowy/src/motion
diff options
context:
space:
mode:
Diffstat (limited to 'flowy/src/motion')
-rw-r--r--flowy/src/motion/debug.wgsl2
-rw-r--r--flowy/src/motion/enc.rs2
-rw-r--r--flowy/src/motion/enc.wgsl31
3 files changed, 22 insertions, 13 deletions
diff --git a/flowy/src/motion/debug.wgsl b/flowy/src/motion/debug.wgsl
index 3e740f6..7da5c57 100644
--- a/flowy/src/motion/debug.wgsl
+++ b/flowy/src/motion/debug.wgsl
@@ -25,7 +25,7 @@ struct BlockOffset {
for (var x = 0; x < params.block_size.x; x++) {
for (var y = 0; y < params.block_size.y; y++) {
let base = uv + vec2(x, y);
- let col = vec4(colormap_vec(vec2<f32>(bl.offset) * 0.05),1.);
+ let col = vec4(colormap_vec(vec2<f32>(bl.offset) * 0.08),1.);
textureStore(out, base, col);
}
}
diff --git a/flowy/src/motion/enc.rs b/flowy/src/motion/enc.rs
index 56b459b..d3e8a81 100644
--- a/flowy/src/motion/enc.rs
+++ b/flowy/src/motion/enc.rs
@@ -38,7 +38,7 @@ impl MotionEncoder {
block_size: [params.block_width as i32, params.block_height as i32],
output_stride: (params.width / params.block_width) as u32,
search_radius: 16,
- skip_threshold: 0.07,
+ skip_threshold: 0.1,
..Default::default()
};
diff --git a/flowy/src/motion/enc.wgsl b/flowy/src/motion/enc.wgsl
index 6ba3081..80618b7 100644
--- a/flowy/src/motion/enc.wgsl
+++ b/flowy/src/motion/enc.wgsl
@@ -24,19 +24,28 @@ var<private> best_tint: vec3<f32> = vec3(0.);
@compute @workgroup_size(1)fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
let uv = vec2<i32>(global_id.xy) * params.block_size;
- test_offset(uv, vec2(0, 0));
+ loop {
+ test_offset(uv, vec2(0, 0));
+ if best_error < params.skip_threshold { break; }
+ apply_tint(uv);
+ if best_error < params.skip_threshold { break; }
+ best_tint = vec3(0.);
- do_dist(uv, 32);
- do_dist(uv, 16);
- do_dist(uv, 10);
- do_dist(uv, 8);
- do_dist(uv, 6);
- do_dist(uv, 3);
- do_dist(uv, 4);
- do_dist(uv, 2);
- do_dist(uv, 1);
+ do_dist(uv, 32);
+ do_dist(uv, 16);
+ do_dist(uv, 10);
+ do_dist(uv, 8);
+ if best_error < params.skip_threshold { break; }
+ do_dist(uv, 6);
+ do_dist(uv, 3);
+ do_dist(uv, 4);
+ do_dist(uv, 2);
+ do_dist(uv, 1);
+ if best_error < params.skip_threshold { break; }
- apply_tint(uv);
+ apply_tint(uv);
+ break;
+ }
offsets[global_id.x + global_id.y * params.offsets_stride] = BlockOffset(best_error, best_offset, best_tint);
}