From 292519649c4244adb6672488efe7c2e906726c58 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 8 Mar 2023 21:26:35 +0100 Subject: about to implement huff --- lvc/src/encode.rs | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'lvc/src/encode.rs') diff --git a/lvc/src/encode.rs b/lvc/src/encode.rs index fde4f94..4ec72cf 100644 --- a/lvc/src/encode.rs +++ b/lvc/src/encode.rs @@ -49,14 +49,18 @@ pub fn optimize_ref( frame: &Frame, view: View, r: Ref, - granularity: i32, + g: i32, target_average: Pixel, ) -> (u32, Ref) { [ - Some(r.apply(|r| r.pos_off.x += granularity)), - Some(r.apply(|r| r.pos_off.x -= granularity)), - Some(r.apply(|r| r.pos_off.y += granularity)), - Some(r.apply(|r| r.pos_off.y -= granularity)), + Some(r.apply(|r| r.pos_off += P2 { x: g, y: 0 })), + Some(r.apply(|r| r.pos_off += P2 { x: g, y: g })), + Some(r.apply(|r| r.pos_off += P2 { x: 0, y: g })), + Some(r.apply(|r| r.pos_off += P2 { x: -g, y: g })), + Some(r.apply(|r| r.pos_off += P2 { x: -g, y: 0 })), + Some(r.apply(|r| r.pos_off += P2 { x: -g, y: -g })), + Some(r.apply(|r| r.pos_off += P2 { x: 0, y: -g })), + Some(r.apply(|r| r.pos_off += P2 { x: g, y: -g })), { let mut r = r; let last_avr = average_color(last_frame, view); @@ -68,12 +72,12 @@ pub fn optimize_ref( None } }, - // n(|r, g| r.color_off.r += (g as i16) << 2); - // n(|r, g| r.color_off.r -= (g as i16) << 2); - // n(|r, g| r.color_off.g += (g as i16) << 2); - // n(|r, g| r.color_off.g -= (g as i16) << 2); - // n(|r, g| r.color_off.b += (g as i16) << 2); - // n(|r, g| r.color_off.b -= (g as i16) << 2); + // Some(r.apply(|r| r.color_off.r += (g as i16) << 2)), + // Some(r.apply(|r| r.color_off.r -= (g as i16) << 2)), + // Some(r.apply(|r| r.color_off.g += (g as i16) << 2)), + // Some(r.apply(|r| r.color_off.g -= (g as i16) << 2)), + // Some(r.apply(|r| r.color_off.b += (g as i16) << 2)), + // Some(r.apply(|r| r.color_off.b -= (g as i16) << 2)), ] .into_iter() .flatten() -- cgit v1.2.3-70-g09d2