From 13aa62ecbc5e26be3b2379ebdfd3d51aca295cd3 Mon Sep 17 00:00:00 2001 From: core Date: Sat, 8 Mar 2025 13:29:30 -0500 Subject: [PATCH] render work --- .idea/wxbox.iml | 5 + Cargo.lock | 5 +- crates/client/Cargo.toml | 1 + crates/client/dist/index.html | 6 +- ...90.js => wxbox-client-b2e1a3e7de3c6850.js} | 41 ++-- ... => wxbox-client-b2e1a3e7de3c6850_bg.wasm} | Bin 8772158 -> 9297860 bytes crates/client/src/app.rs | 11 +- crates/client/src/map.rs | 12 +- crates/client/src/map/frag.glsl | 10 + crates/client/src/map/render.rs | 228 +++++++++--------- crates/client/src/map/vertex.glsl | 10 + 11 files changed, 183 insertions(+), 146 deletions(-) rename crates/client/dist/{wxbox-client-5fe4727443779190.js => wxbox-client-b2e1a3e7de3c6850.js} (98%) rename crates/client/dist/{wxbox-client-5fe4727443779190_bg.wasm => wxbox-client-b2e1a3e7de3c6850_bg.wasm} (63%) create mode 100644 crates/client/src/map/frag.glsl create mode 100644 crates/client/src/map/vertex.glsl diff --git a/.idea/wxbox.iml b/.idea/wxbox.iml index d2174f3..cab36b6 100644 --- a/.idea/wxbox.iml +++ b/.idea/wxbox.iml @@ -12,6 +12,11 @@ + + + + + diff --git a/Cargo.lock b/Cargo.lock index 35a7549..c6c0d56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -828,9 +828,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" dependencies = [ "bytemuck_derive", ] @@ -5106,6 +5106,7 @@ dependencies = [ name = "wxbox-client" version = "0.1.0" dependencies = [ + "bytemuck", "console_error_panic_hook", "eframe", "egui", diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 2bd93c3..acc22f7 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -13,6 +13,7 @@ egui = "0.31" poll-promise = "0.3" ehttp = "0.5" image = "0.25" +bytemuck = "1.22" [target.'cfg(target_arch = "wasm32")'.dependencies] tracing-web = "0.1" diff --git a/crates/client/dist/index.html b/crates/client/dist/index.html index c22edf2..d908a3d 100644 --- a/crates/client/dist/index.html +++ b/crates/client/dist/index.html @@ -94,7 +94,7 @@ } } - + @@ -111,8 +111,8 @@