From b7fa5382188088f0ad643ac2748171b229a14a56 Mon Sep 17 00:00:00 2001 From: kirjavascript Date: Wed, 15 Jun 2022 17:53:25 +0100 Subject: [PATCH] git ignore stuff --- .gitignore | 2 +- Cargo.lock | 12 ++++++------ frontend/.gitignore | 4 ++-- frontend/Cargo.toml | 4 ++-- frontend/src/app.rs | 40 +++++++++++++++++++--------------------- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index f04b3d8..5f136b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/target +target **/*.rs.bk notes diff --git a/Cargo.lock b/Cargo.lock index 8cd9fd5..fdca20c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -590,7 +590,7 @@ checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" [[package]] name = "eframe" version = "0.18.0" -source = "git+https://github.com/emilk/egui?branch=master#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" +source = "git+https://github.com/emilk/egui?rev=7eeb292a#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" dependencies = [ "bytemuck", "dark-light", @@ -611,7 +611,7 @@ dependencies = [ [[package]] name = "egui" version = "0.18.1" -source = "git+https://github.com/emilk/egui?branch=master#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" +source = "git+https://github.com/emilk/egui?rev=7eeb292a#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" dependencies = [ "ahash 0.7.6", "epaint", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.18.0" -source = "git+https://github.com/emilk/egui?branch=master#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" +source = "git+https://github.com/emilk/egui?rev=7eeb292a#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" dependencies = [ "arboard", "egui", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.18.1" -source = "git+https://github.com/emilk/egui?branch=master#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" +source = "git+https://github.com/emilk/egui?rev=7eeb292a#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" dependencies = [ "bytemuck", "egui", @@ -650,7 +650,7 @@ dependencies = [ [[package]] name = "emath" version = "0.18.0" -source = "git+https://github.com/emilk/egui?branch=master#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" +source = "git+https://github.com/emilk/egui?rev=7eeb292a#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" dependencies = [ "bytemuck", ] @@ -687,7 +687,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.18.1" -source = "git+https://github.com/emilk/egui?branch=master#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" +source = "git+https://github.com/emilk/egui?rev=7eeb292a#7eeb292adfacd9311a420ac3ea225e2261a8f8d3" dependencies = [ "ab_glyph", "ahash 0.7.6", diff --git a/frontend/.gitignore b/frontend/.gitignore index a450ca4..5ae4063 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -1,3 +1,3 @@ /target -./static/*.js -./static/*.wasm +static/* +!static/index.html diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml index f1486f7..2a2147d 100644 --- a/frontend/Cargo.toml +++ b/frontend/Cargo.toml @@ -27,8 +27,8 @@ instant = "0.1" # eframe = { version = "0.18.0", features = ["persistence"] } # egui = { path = "/home/cake/dev/egui/egui" } # eframe = { path = "/home/cake/dev/egui/eframe" } -egui = { git = "https://github.com/emilk/egui", branch = "master" } -eframe = { git = "https://github.com/emilk/egui", branch = "master" } +egui = { git = "https://github.com/emilk/egui", rev = "7eeb292a" } +eframe = { git = "https://github.com/emilk/egui", rev = "7eeb292a" } # serde = { version = "1", features = ["derive"] } # You only need this if you want app persistence # native: diff --git a/frontend/src/app.rs b/frontend/src/app.rs index 8771faf..702a848 100644 --- a/frontend/src/app.rs +++ b/frontend/src/app.rs @@ -178,28 +178,26 @@ impl eframe::App for Frontend { egui::Window::new("vram") .show(ctx, |ui| { - // let qty = 2; + let mut pixels = vec![]; + for duxel in &self.emu.core.mem.vdp.VRAM[0..64] { + let pixel = (*duxel & 0xF0) >> 4; + let color = self.emu.core.mem.vdp.color(0, pixel as _); + pixels.push(egui::Color32::from_rgb(color.0, color.1, color.2)); + let pixel = *duxel & 0xF; + let color = self.emu.core.mem.vdp.color(0, pixel as _); + pixels.push(egui::Color32::from_rgb(color.0, color.1, color.2)); + } + let texture: &egui::TextureHandle = &ui.ctx().load_texture( + "palette", + egui::ColorImage { + size: [8, 8* 2], + pixels, + }, + egui::TextureFilter::Nearest + ); + let img = egui::Image::new(texture, texture.size_vec2() * 20.); - // let mut pixels = vec![]; - // for duxel in &self.emu.core.mem.vdp.VRAM[0..(32*qty)] { - // let pixel = (*duxel & 0xF0) >> 4; - // let color = self.emu.core.mem.vdp.color(0, pixel as _); - // pixels.push(egui::Color32::from_rgb(color.0, color.1, color.2)); - // let pixel = *duxel & 0xF; - // let color = self.emu.core.mem.vdp.color(0, pixel as _); - // pixels.push(egui::Color32::from_rgb(color.0, color.1, color.2)); - // } - // let texture: &egui::TextureHandle = &ui.ctx().load_texture( - // "palette", - // egui::ColorImage { - // size: [8, 8 * qty], - // pixels, - // }, - // egui::TextureFilter::Nearest - // ); - // let img = egui::Image::new(texture, texture.size_vec2() * 20.); - - // ui.add(img); + ui.add(img); }); egui::CentralPanel::default().show(ctx, |ui| {