mirror of
https://github.com/kirjavascript/trueLMAO.git
synced 2024-05-20 05:10:21 -04:00
git ignore stuff
This commit is contained in:
parent
e871a982d9
commit
b7fa538218
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,4 +1,4 @@
|
||||||
/target
|
target
|
||||||
**/*.rs.bk
|
**/*.rs.bk
|
||||||
notes
|
notes
|
||||||
|
|
||||||
|
|
12
Cargo.lock
generated
12
Cargo.lock
generated
|
@ -590,7 +590,7 @@ checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "eframe"
|
name = "eframe"
|
||||||
version = "0.18.0"
|
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 = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"dark-light",
|
"dark-light",
|
||||||
|
@ -611,7 +611,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "egui"
|
name = "egui"
|
||||||
version = "0.18.1"
|
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 = [
|
dependencies = [
|
||||||
"ahash 0.7.6",
|
"ahash 0.7.6",
|
||||||
"epaint",
|
"epaint",
|
||||||
|
@ -622,7 +622,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "egui-winit"
|
name = "egui-winit"
|
||||||
version = "0.18.0"
|
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 = [
|
dependencies = [
|
||||||
"arboard",
|
"arboard",
|
||||||
"egui",
|
"egui",
|
||||||
|
@ -636,7 +636,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "egui_glow"
|
name = "egui_glow"
|
||||||
version = "0.18.1"
|
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 = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"egui",
|
"egui",
|
||||||
|
@ -650,7 +650,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "emath"
|
name = "emath"
|
||||||
version = "0.18.0"
|
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 = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
]
|
]
|
||||||
|
@ -687,7 +687,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "epaint"
|
name = "epaint"
|
||||||
version = "0.18.1"
|
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 = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"ahash 0.7.6",
|
"ahash 0.7.6",
|
||||||
|
|
4
frontend/.gitignore
vendored
4
frontend/.gitignore
vendored
|
@ -1,3 +1,3 @@
|
||||||
/target
|
/target
|
||||||
./static/*.js
|
static/*
|
||||||
./static/*.wasm
|
!static/index.html
|
||||||
|
|
|
@ -27,8 +27,8 @@ instant = "0.1"
|
||||||
# eframe = { version = "0.18.0", features = ["persistence"] }
|
# eframe = { version = "0.18.0", features = ["persistence"] }
|
||||||
# egui = { path = "/home/cake/dev/egui/egui" }
|
# egui = { path = "/home/cake/dev/egui/egui" }
|
||||||
# eframe = { path = "/home/cake/dev/egui/eframe" }
|
# eframe = { path = "/home/cake/dev/egui/eframe" }
|
||||||
egui = { git = "https://github.com/emilk/egui", branch = "master" }
|
egui = { git = "https://github.com/emilk/egui", rev = "7eeb292a" }
|
||||||
eframe = { git = "https://github.com/emilk/egui", branch = "master" }
|
eframe = { git = "https://github.com/emilk/egui", rev = "7eeb292a" }
|
||||||
# serde = { version = "1", features = ["derive"] } # You only need this if you want app persistence
|
# serde = { version = "1", features = ["derive"] } # You only need this if you want app persistence
|
||||||
|
|
||||||
# native:
|
# native:
|
||||||
|
|
|
@ -178,28 +178,26 @@ impl eframe::App for Frontend {
|
||||||
|
|
||||||
egui::Window::new("vram")
|
egui::Window::new("vram")
|
||||||
.show(ctx, |ui| {
|
.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![];
|
ui.add(img);
|
||||||
// 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);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
egui::CentralPanel::default().show(ctx, |ui| {
|
egui::CentralPanel::default().show(ctx, |ui| {
|
||||||
|
|
Loading…
Reference in a new issue