From 83bc23206ad0982fcf2bf6c8e7256190dbe148f0 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 21 Nov 2022 22:09:42 +0100 Subject: works --- vgcodec/src/approximate.rs | 78 ++++++++++++++++++++++++++++------------------ vgcodec/src/helper.rs | 14 +++++++-- vgcodec/src/main.rs | 20 +++++++++--- vgcodec/src/paint.rs | 3 +- vgcodec/src/paint.wgsl | 7 +++-- 5 files changed, 81 insertions(+), 41 deletions(-) (limited to 'vgcodec/src') diff --git a/vgcodec/src/approximate.rs b/vgcodec/src/approximate.rs index fc2b4ba..c4dc629 100644 --- a/vgcodec/src/approximate.rs +++ b/vgcodec/src/approximate.rs @@ -1,17 +1,13 @@ -use std::sync::Arc; - -use image::EncodableLayout; -use log::info; -use rand::Rng; -use wgpu::{Extent3d, Texture, TextureUsages}; - use crate::{ app::App, diff::Differ, export::Exporter, - helper::write_texture, paint::{PaintUniforms, Painter}, }; +use log::{debug, info}; +use rand::Rng; +use std::sync::Arc; +use wgpu::{Extent3d, Texture, TextureUsages}; #[allow(unused)] pub struct Approximator { @@ -28,7 +24,7 @@ pub struct Approximator { impl Approximator { pub fn new(app: &Arc, tex_target: Texture, size: Extent3d) -> Self { - let App { device, queue, .. } = app.as_ref(); + let App { device, .. } = app.as_ref(); let tex_approx = device.create_texture(&wgpu::TextureDescriptor { size, mip_level_count: 1, @@ -51,8 +47,8 @@ impl Approximator { label: None, }); - let img_initial = image::open("a/initial.png").unwrap().into_rgba8(); - write_texture(queue, &tex_approx, img_initial.as_bytes(), size); + // let initial_init = (0..) + // write_texture(queue, &tex_approx, initial_init, size); let differ = Differ::new(&app, size, &tex_approx, &tex_target); let painter = Painter::new(&app, size, &tex_approx); @@ -79,44 +75,62 @@ impl Approximator { .copy_texture(&self.tex_savestate, &self.tex_approx, self.size); } - pub async fn run(&mut self) { - for _ in 0..10 { + pub async fn run(&mut self, iters: usize) { + let rscale = self.size.width as f32 * 0.1; + for i in 0..iters { let mut p = PaintUniforms { - x: rand::thread_rng().gen_range(0.0..256.0), - y: rand::thread_rng().gen_range(0.0..256.0), + x: rand::thread_rng().gen_range(0.0..self.size.width as f32), + y: rand::thread_rng().gen_range(0.0..self.size.height as f32), + rx: rscale, + ry: rscale, r: rand::thread_rng().gen_range(0.0..1.0), g: rand::thread_rng().gen_range(0.0..1.0), b: rand::thread_rng().gen_range(0.0..1.0), - radius: rand::thread_rng().gen_range(5.0..10.0), }; // Find initial diff self.save(); self.painter.run(p); - let mut cd = pollster::block_on(self.differ.run()); - info!("initial diff={cd}"); + let initial_diff = pollster::block_on(self.differ.run()); + debug!("initial diff={initial_diff}"); self.restore(); + let mut cd = initial_diff; self.save(); loop { let mut q = 0; - q += self.optimize_param(&mut cd, &mut p, "more red", |p| p.r += 0.1); - q += self.optimize_param(&mut cd, &mut p, "less red", |p| p.r -= 0.1); - q += self.optimize_param(&mut cd, &mut p, "more green", |p| p.g += 0.1); - q += self.optimize_param(&mut cd, &mut p, "less green", |p| p.g -= 0.1); - q += self.optimize_param(&mut cd, &mut p, "more blue", |p| p.b += 0.1); - q += self.optimize_param(&mut cd, &mut p, "less blue", |p| p.b -= 0.1); - q += self.optimize_param(&mut cd, &mut p, "increase radius", |p| p.radius *= 1.5); - q += self.optimize_param(&mut cd, &mut p, "decrease radius", |p| p.radius *= 1.5); - q += self.optimize_param(&mut cd, &mut p, "move right", |p| p.x += 5.0); - q += self.optimize_param(&mut cd, &mut p, "move left", |p| p.x -= 5.0); - q += self.optimize_param(&mut cd, &mut p, "move down", |p| p.y += 5.0); - q += self.optimize_param(&mut cd, &mut p, "move up", |p| p.y -= 5.0); + let mut k = |k: usize| { + q += k; + q == 0 + }; + if k(self.optimize_param(&mut cd, &mut p, "more red", |p| p.r += 0.1)) { + k(self.optimize_param(&mut cd, &mut p, "less red", |p| p.r -= 0.1)); + } + if k(self.optimize_param(&mut cd, &mut p, "more green", |p| p.g += 0.1)) { + k(self.optimize_param(&mut cd, &mut p, "less green", |p| p.g -= 0.1)); + } + if k(self.optimize_param(&mut cd, &mut p, "more blue", |p| p.b += 0.1)) { + k(self.optimize_param(&mut cd, &mut p, "less blue", |p| p.b -= 0.1)); + } + if k(self.optimize_param(&mut cd, &mut p, "increase rx", |p| p.rx *= 1.5)) { + k(self.optimize_param(&mut cd, &mut p, "decrease rx", |p| p.rx /= 1.5)); + } + if k(self.optimize_param(&mut cd, &mut p, "increase ry", |p| p.ry *= 1.5)) { + k(self.optimize_param(&mut cd, &mut p, "decrease ry", |p| p.ry /= 1.5)); + } + if k(self.optimize_param(&mut cd, &mut p, "move right", |p| p.x += 5.0)) { + k(self.optimize_param(&mut cd, &mut p, "move left", |p| p.x -= 5.0)); + } + if k(self.optimize_param(&mut cd, &mut p, "move down", |p| p.y += 5.0)) { + k(self.optimize_param(&mut cd, &mut p, "move up", |p| p.y -= 5.0)); + } if q == 0 { break; } } self.painter.run(p); + + info!("{i} (improvement={})", initial_diff - cd); } self.exporter.run(&self.tex_approx, "a/approx.png").await; @@ -139,13 +153,15 @@ impl Approximator { self.painter.run(p); let diff = pollster::block_on(self.differ.run()); // pollster::block_on(self.exporter.run(&self.tex_approx, &format!("a/snap.png"))); + debug!("try {label:?} ({})", diff as i64 - *current_diff as i64); self.restore(); if diff >= *current_diff { break i; } - info!("applied {label:?} (before={current_diff} after={diff})"); + debug!("applied {label:?}"); i += 1; *current_diff = diff; + *params = p } } } diff --git a/vgcodec/src/helper.rs b/vgcodec/src/helper.rs index 3aca81d..1d029b8 100644 --- a/vgcodec/src/helper.rs +++ b/vgcodec/src/helper.rs @@ -1,7 +1,15 @@ -use wgpu::{Queue, Texture, Extent3d}; - +use log::info; +use wgpu::{Extent3d, Queue, Texture}; pub fn write_texture(queue: &Queue, target: &Texture, data: &[u8], size: Extent3d) { + info!("uploading texture {size:?} ({} bytes)", data.len()); + + let bytes_per_pixel = std::mem::size_of::() as u32; + let unpadded_bytes_per_row = size.width * bytes_per_pixel; + let align = wgpu::COPY_BYTES_PER_ROW_ALIGNMENT; + let padded_bytes_per_row_padding = (align - unpadded_bytes_per_row % align) % align; + let padded_bytes_per_row = unpadded_bytes_per_row + padded_bytes_per_row_padding; + queue.write_texture( wgpu::ImageCopyTexture { texture: &target, @@ -12,7 +20,7 @@ pub fn write_texture(queue: &Queue, target: &Texture, data: &[u8], size: Extent3 &data, wgpu::ImageDataLayout { offset: 0, - bytes_per_row: Some(std::num::NonZeroU32::try_from((size.width * 4) as u32).unwrap()), + bytes_per_row: Some(std::num::NonZeroU32::try_from(padded_bytes_per_row).unwrap()), rows_per_image: None, }, size, diff --git a/vgcodec/src/main.rs b/vgcodec/src/main.rs index 7fb0750..2be0793 100644 --- a/vgcodec/src/main.rs +++ b/vgcodec/src/main.rs @@ -7,8 +7,9 @@ pub mod paint; use app::App; use approximate::Approximator; +use clap::Parser; use helper::write_texture; -use image::EncodableLayout; +use log::info; use wgpu::TextureUsages; fn main() { @@ -16,12 +17,21 @@ fn main() { pollster::block_on(run()); } +#[derive(Parser)] +#[clap(about)] +struct Args { + #[clap(short = 'I', long)] + iterations: usize, + infile: String, +} + async fn run() { + let args = Args::parse(); let app = app::App::new().await; let App { device, queue, .. } = app.as_ref(); - let img_target = image::open("a/a.png").unwrap().into_rgba8(); + let img_target = image::open(&args.infile).unwrap().into_rgba8(); let size = wgpu::Extent3d { width: img_target.width(), @@ -39,8 +49,10 @@ async fn run() { label: None, }); - write_texture(queue, &tex_target, img_target.as_bytes(), size); + let img_raw = img_target.into_raw(); + info!("{}", img_raw.len()); + write_texture(queue, &tex_target, &img_raw, size); let mut a = Approximator::new(&app, tex_target, size); - a.run().await; + a.run(args.iterations).await; } diff --git a/vgcodec/src/paint.rs b/vgcodec/src/paint.rs index f25b749..33ab572 100644 --- a/vgcodec/src/paint.rs +++ b/vgcodec/src/paint.rs @@ -19,7 +19,8 @@ pub struct Painter { pub struct PaintUniforms { pub x: f32, pub y: f32, - pub radius: f32, + pub rx: f32, + pub ry: f32, pub r: f32, pub g: f32, pub b: f32, diff --git a/vgcodec/src/paint.wgsl b/vgcodec/src/paint.wgsl index f23e903..7006310 100644 --- a/vgcodec/src/paint.wgsl +++ b/vgcodec/src/paint.wgsl @@ -1,7 +1,8 @@ struct Uniforms { x: f32, y: f32, - radius: f32, + rx: f32, + ry: f32, r: f32, g: f32, b: f32 @@ -13,7 +14,9 @@ struct Uniforms { @compute @workgroup_size(1) fn main(@builtin(global_invocation_id) global_id: vec3) { let coords = global_id.xy; - if distance(vec2(coords), vec2(uniforms.x, uniforms.y)) < uniforms.radius { + let kc = vec2(coords) - vec2(uniforms.x, uniforms.y); + let d = length(kc / vec2(uniforms.rx, uniforms.ry)); + if d < 1.0 { textureStore(tex, vec2(coords), vec4(vec3(uniforms.r, uniforms.g, uniforms.b), 1.0)); } } -- cgit v1.2.3-70-g09d2