From b6bf4cdcd8cc2eb524233671c669e7613e63169b Mon Sep 17 00:00:00 2001 From: core Date: Fri, 7 Mar 2025 23:34:29 -0500 Subject: [PATCH] render work --- Cargo.lock | 2 +- crates/client/0.png | Bin 0 -> 6917 bytes crates/client/Cargo.toml | 4 +- crates/client/dist/index.html | 6 +- ...0f.js => wxbox-client-416c2e642fbec6fa.js} | 20 +- ... => wxbox-client-416c2e642fbec6fa_bg.wasm} | Bin 8767980 -> 8772461 bytes crates/client/src/app.rs | 61 +--- crates/client/src/map.rs | 334 ++++++++++-------- crates/client/src/map/render.rs | 153 ++++++++ 9 files changed, 355 insertions(+), 225 deletions(-) create mode 100644 crates/client/0.png rename crates/client/dist/{wxbox-client-5dd7964ac85d800f.js => wxbox-client-416c2e642fbec6fa.js} (98%) rename crates/client/dist/{wxbox-client-5dd7964ac85d800f_bg.wasm => wxbox-client-416c2e642fbec6fa_bg.wasm} (67%) create mode 100644 crates/client/src/map/render.rs diff --git a/Cargo.lock b/Cargo.lock index 8872930..35a7549 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5111,9 +5111,9 @@ dependencies = [ "egui", "egui_glow", "ehttp", + "glow", "image", "poll-promise", - "serde", "tracing", "tracing-subscriber", "tracing-web", diff --git a/crates/client/0.png b/crates/client/0.png new file mode 100644 index 0000000000000000000000000000000000000000..66e1801a64954c75d2e7776d057efb99d37f43ed GIT binary patch literal 6917 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 Js*y4a{U7HwP3`~y literal 0 HcmV?d00001 diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 47a9ad7..2bd93c3 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" tracing = "0.1" tracing-subscriber = "0.3" eframe = { version = "0.31" } -egui = "0.31" +glow = "*" egui_glow = "0.31" -serde = { version = "1", features = ["derive"] } +egui = "0.31" poll-promise = "0.3" ehttp = "0.5" image = "0.25" diff --git a/crates/client/dist/index.html b/crates/client/dist/index.html index f93b29b..0e08c71 100644 --- a/crates/client/dist/index.html +++ b/crates/client/dist/index.html @@ -94,7 +94,7 @@ } } - + @@ -111,8 +111,8 @@