From 0c0b1a9c9140fc8bfba949642773f5a2c517c37d Mon Sep 17 00:00:00 2001 From: core Date: Fri, 28 Mar 2025 09:43:46 -0400 Subject: [PATCH] refactor assets --- .../client/src/{ => assets}/shaders/fragment.glsl | 0 crates/client/src/{ => assets}/shaders/vertex.glsl | 0 .../src/assets/{ => textures}/autoplr_cfg.svg | 0 .../src/assets/{ => textures}/autoplr_error.svg | 0 .../client/src/assets/{ => textures}/autoplr_on.svg | 0 .../client/src/assets/{ => textures}/cargo_off.svg | 0 .../client/src/assets/{ => textures}/cargo_on.svg | 0 crates/client/src/assets/{ => textures}/chassis.svg | 0 crates/client/src/assets/{ => textures}/earth.svg | 0 .../client/src/assets/{ => textures}/earth_icon.svg | 0 .../src/assets/{ => textures}/ecothruster_on.svg | 0 .../src/assets/{ => textures}/editor_direction.svg | 0 crates/client/src/assets/{ => textures}/f.png | Bin .../client/src/assets/{ => textures}/happy-tree.png | Bin crates/client/src/assets/{ => textures}/hearty.svg | 0 .../src/assets/{ => textures}/hearty_ferris.svg | 0 .../src/assets/{ => textures}/hearty_party.svg | 0 crates/client/src/assets/{ => textures}/hub_off.svg | 0 crates/client/src/assets/{ => textures}/hub_on.svg | 0 crates/client/src/assets/{ => textures}/jupiter.svg | 0 .../client/src/assets/{ => textures}/landingleg.svg | 0 .../assets/{ => textures}/landingthruster_off.svg | 0 .../assets/{ => textures}/landingthruster_on.svg | 0 crates/client/src/assets/{ => textures}/mars.svg | 0 .../client/src/assets/{ => textures}/mars_icon.svg | 0 .../assets/{ => textures}/mercury_NEEDS_4_1_1.svg | 0 crates/client/src/assets/{ => textures}/missing.svg | 0 crates/client/src/assets/{ => textures}/moon.svg | 0 .../client/src/assets/{ => textures}/moon_icon.svg | 0 .../src/assets/{ => textures}/powerhub_off.svg | 0 .../src/assets/{ => textures}/powerhub_on.svg | 0 .../client/src/assets/{ => textures}/starfield.svg | 0 .../src/assets/{ => textures}/starfield_dim.svg | 0 .../src/assets/{ => textures}/starfield_transp.svg | 0 crates/client/src/assets/{ => textures}/sun.svg | 0 .../client/src/assets/{ => textures}/sun_rings.svg | 0 .../src/assets/{ => textures}/superthruster_off.svg | 0 .../src/assets/{ => textures}/superthruster_on.svg | 0 .../src/assets/{ => textures}/thruster_off.svg | 0 .../src/assets/{ => textures}/thruster_on.svg | 0 .../src/assets/{ => textures}/trackindicator.svg | 0 crates/client/src/assets/{ => textures}/uv.png | Bin crates/client/src/assets/{ => textures}/venus.svg | 0 crates/client/src/native/assets.rs | 2 +- crates/client/src/rendering/mod.rs | 7 ++++--- crates/client/src/wasm/assets.rs | 2 +- 46 files changed, 6 insertions(+), 5 deletions(-) rename crates/client/src/{ => assets}/shaders/fragment.glsl (100%) rename crates/client/src/{ => assets}/shaders/vertex.glsl (100%) rename crates/client/src/assets/{ => textures}/autoplr_cfg.svg (100%) rename crates/client/src/assets/{ => textures}/autoplr_error.svg (100%) rename crates/client/src/assets/{ => textures}/autoplr_on.svg (100%) rename crates/client/src/assets/{ => textures}/cargo_off.svg (100%) rename crates/client/src/assets/{ => textures}/cargo_on.svg (100%) rename crates/client/src/assets/{ => textures}/chassis.svg (100%) rename crates/client/src/assets/{ => textures}/earth.svg (100%) rename crates/client/src/assets/{ => textures}/earth_icon.svg (100%) rename crates/client/src/assets/{ => textures}/ecothruster_on.svg (100%) rename crates/client/src/assets/{ => textures}/editor_direction.svg (100%) rename crates/client/src/assets/{ => textures}/f.png (100%) rename crates/client/src/assets/{ => textures}/happy-tree.png (100%) rename crates/client/src/assets/{ => textures}/hearty.svg (100%) rename crates/client/src/assets/{ => textures}/hearty_ferris.svg (100%) rename crates/client/src/assets/{ => textures}/hearty_party.svg (100%) rename crates/client/src/assets/{ => textures}/hub_off.svg (100%) rename crates/client/src/assets/{ => textures}/hub_on.svg (100%) rename crates/client/src/assets/{ => textures}/jupiter.svg (100%) rename crates/client/src/assets/{ => textures}/landingleg.svg (100%) rename crates/client/src/assets/{ => textures}/landingthruster_off.svg (100%) rename crates/client/src/assets/{ => textures}/landingthruster_on.svg (100%) rename crates/client/src/assets/{ => textures}/mars.svg (100%) rename crates/client/src/assets/{ => textures}/mars_icon.svg (100%) rename crates/client/src/assets/{ => textures}/mercury_NEEDS_4_1_1.svg (100%) rename crates/client/src/assets/{ => textures}/missing.svg (100%) rename crates/client/src/assets/{ => textures}/moon.svg (100%) rename crates/client/src/assets/{ => textures}/moon_icon.svg (100%) rename crates/client/src/assets/{ => textures}/powerhub_off.svg (100%) rename crates/client/src/assets/{ => textures}/powerhub_on.svg (100%) rename crates/client/src/assets/{ => textures}/starfield.svg (100%) rename crates/client/src/assets/{ => textures}/starfield_dim.svg (100%) rename crates/client/src/assets/{ => textures}/starfield_transp.svg (100%) rename crates/client/src/assets/{ => textures}/sun.svg (100%) rename crates/client/src/assets/{ => textures}/sun_rings.svg (100%) rename crates/client/src/assets/{ => textures}/superthruster_off.svg (100%) rename crates/client/src/assets/{ => textures}/superthruster_on.svg (100%) rename crates/client/src/assets/{ => textures}/thruster_off.svg (100%) rename crates/client/src/assets/{ => textures}/thruster_on.svg (100%) rename crates/client/src/assets/{ => textures}/trackindicator.svg (100%) rename crates/client/src/assets/{ => textures}/uv.png (100%) rename crates/client/src/assets/{ => textures}/venus.svg (100%) diff --git a/crates/client/src/shaders/fragment.glsl b/crates/client/src/assets/shaders/fragment.glsl similarity index 100% rename from crates/client/src/shaders/fragment.glsl rename to crates/client/src/assets/shaders/fragment.glsl diff --git a/crates/client/src/shaders/vertex.glsl b/crates/client/src/assets/shaders/vertex.glsl similarity index 100% rename from crates/client/src/shaders/vertex.glsl rename to crates/client/src/assets/shaders/vertex.glsl diff --git a/crates/client/src/assets/autoplr_cfg.svg b/crates/client/src/assets/textures/autoplr_cfg.svg similarity index 100% rename from crates/client/src/assets/autoplr_cfg.svg rename to crates/client/src/assets/textures/autoplr_cfg.svg diff --git a/crates/client/src/assets/autoplr_error.svg b/crates/client/src/assets/textures/autoplr_error.svg similarity index 100% rename from crates/client/src/assets/autoplr_error.svg rename to crates/client/src/assets/textures/autoplr_error.svg diff --git a/crates/client/src/assets/autoplr_on.svg b/crates/client/src/assets/textures/autoplr_on.svg similarity index 100% rename from crates/client/src/assets/autoplr_on.svg rename to crates/client/src/assets/textures/autoplr_on.svg diff --git a/crates/client/src/assets/cargo_off.svg b/crates/client/src/assets/textures/cargo_off.svg similarity index 100% rename from crates/client/src/assets/cargo_off.svg rename to crates/client/src/assets/textures/cargo_off.svg diff --git a/crates/client/src/assets/cargo_on.svg b/crates/client/src/assets/textures/cargo_on.svg similarity index 100% rename from crates/client/src/assets/cargo_on.svg rename to crates/client/src/assets/textures/cargo_on.svg diff --git a/crates/client/src/assets/chassis.svg b/crates/client/src/assets/textures/chassis.svg similarity index 100% rename from crates/client/src/assets/chassis.svg rename to crates/client/src/assets/textures/chassis.svg diff --git a/crates/client/src/assets/earth.svg b/crates/client/src/assets/textures/earth.svg similarity index 100% rename from crates/client/src/assets/earth.svg rename to crates/client/src/assets/textures/earth.svg diff --git a/crates/client/src/assets/earth_icon.svg b/crates/client/src/assets/textures/earth_icon.svg similarity index 100% rename from crates/client/src/assets/earth_icon.svg rename to crates/client/src/assets/textures/earth_icon.svg diff --git a/crates/client/src/assets/ecothruster_on.svg b/crates/client/src/assets/textures/ecothruster_on.svg similarity index 100% rename from crates/client/src/assets/ecothruster_on.svg rename to crates/client/src/assets/textures/ecothruster_on.svg diff --git a/crates/client/src/assets/editor_direction.svg b/crates/client/src/assets/textures/editor_direction.svg similarity index 100% rename from crates/client/src/assets/editor_direction.svg rename to crates/client/src/assets/textures/editor_direction.svg diff --git a/crates/client/src/assets/f.png b/crates/client/src/assets/textures/f.png similarity index 100% rename from crates/client/src/assets/f.png rename to crates/client/src/assets/textures/f.png diff --git a/crates/client/src/assets/happy-tree.png b/crates/client/src/assets/textures/happy-tree.png similarity index 100% rename from crates/client/src/assets/happy-tree.png rename to crates/client/src/assets/textures/happy-tree.png diff --git a/crates/client/src/assets/hearty.svg b/crates/client/src/assets/textures/hearty.svg similarity index 100% rename from crates/client/src/assets/hearty.svg rename to crates/client/src/assets/textures/hearty.svg diff --git a/crates/client/src/assets/hearty_ferris.svg b/crates/client/src/assets/textures/hearty_ferris.svg similarity index 100% rename from crates/client/src/assets/hearty_ferris.svg rename to crates/client/src/assets/textures/hearty_ferris.svg diff --git a/crates/client/src/assets/hearty_party.svg b/crates/client/src/assets/textures/hearty_party.svg similarity index 100% rename from crates/client/src/assets/hearty_party.svg rename to crates/client/src/assets/textures/hearty_party.svg diff --git a/crates/client/src/assets/hub_off.svg b/crates/client/src/assets/textures/hub_off.svg similarity index 100% rename from crates/client/src/assets/hub_off.svg rename to crates/client/src/assets/textures/hub_off.svg diff --git a/crates/client/src/assets/hub_on.svg b/crates/client/src/assets/textures/hub_on.svg similarity index 100% rename from crates/client/src/assets/hub_on.svg rename to crates/client/src/assets/textures/hub_on.svg diff --git a/crates/client/src/assets/jupiter.svg b/crates/client/src/assets/textures/jupiter.svg similarity index 100% rename from crates/client/src/assets/jupiter.svg rename to crates/client/src/assets/textures/jupiter.svg diff --git a/crates/client/src/assets/landingleg.svg b/crates/client/src/assets/textures/landingleg.svg similarity index 100% rename from crates/client/src/assets/landingleg.svg rename to crates/client/src/assets/textures/landingleg.svg diff --git a/crates/client/src/assets/landingthruster_off.svg b/crates/client/src/assets/textures/landingthruster_off.svg similarity index 100% rename from crates/client/src/assets/landingthruster_off.svg rename to crates/client/src/assets/textures/landingthruster_off.svg diff --git a/crates/client/src/assets/landingthruster_on.svg b/crates/client/src/assets/textures/landingthruster_on.svg similarity index 100% rename from crates/client/src/assets/landingthruster_on.svg rename to crates/client/src/assets/textures/landingthruster_on.svg diff --git a/crates/client/src/assets/mars.svg b/crates/client/src/assets/textures/mars.svg similarity index 100% rename from crates/client/src/assets/mars.svg rename to crates/client/src/assets/textures/mars.svg diff --git a/crates/client/src/assets/mars_icon.svg b/crates/client/src/assets/textures/mars_icon.svg similarity index 100% rename from crates/client/src/assets/mars_icon.svg rename to crates/client/src/assets/textures/mars_icon.svg diff --git a/crates/client/src/assets/mercury_NEEDS_4_1_1.svg b/crates/client/src/assets/textures/mercury_NEEDS_4_1_1.svg similarity index 100% rename from crates/client/src/assets/mercury_NEEDS_4_1_1.svg rename to crates/client/src/assets/textures/mercury_NEEDS_4_1_1.svg diff --git a/crates/client/src/assets/missing.svg b/crates/client/src/assets/textures/missing.svg similarity index 100% rename from crates/client/src/assets/missing.svg rename to crates/client/src/assets/textures/missing.svg diff --git a/crates/client/src/assets/moon.svg b/crates/client/src/assets/textures/moon.svg similarity index 100% rename from crates/client/src/assets/moon.svg rename to crates/client/src/assets/textures/moon.svg diff --git a/crates/client/src/assets/moon_icon.svg b/crates/client/src/assets/textures/moon_icon.svg similarity index 100% rename from crates/client/src/assets/moon_icon.svg rename to crates/client/src/assets/textures/moon_icon.svg diff --git a/crates/client/src/assets/powerhub_off.svg b/crates/client/src/assets/textures/powerhub_off.svg similarity index 100% rename from crates/client/src/assets/powerhub_off.svg rename to crates/client/src/assets/textures/powerhub_off.svg diff --git a/crates/client/src/assets/powerhub_on.svg b/crates/client/src/assets/textures/powerhub_on.svg similarity index 100% rename from crates/client/src/assets/powerhub_on.svg rename to crates/client/src/assets/textures/powerhub_on.svg diff --git a/crates/client/src/assets/starfield.svg b/crates/client/src/assets/textures/starfield.svg similarity index 100% rename from crates/client/src/assets/starfield.svg rename to crates/client/src/assets/textures/starfield.svg diff --git a/crates/client/src/assets/starfield_dim.svg b/crates/client/src/assets/textures/starfield_dim.svg similarity index 100% rename from crates/client/src/assets/starfield_dim.svg rename to crates/client/src/assets/textures/starfield_dim.svg diff --git a/crates/client/src/assets/starfield_transp.svg b/crates/client/src/assets/textures/starfield_transp.svg similarity index 100% rename from crates/client/src/assets/starfield_transp.svg rename to crates/client/src/assets/textures/starfield_transp.svg diff --git a/crates/client/src/assets/sun.svg b/crates/client/src/assets/textures/sun.svg similarity index 100% rename from crates/client/src/assets/sun.svg rename to crates/client/src/assets/textures/sun.svg diff --git a/crates/client/src/assets/sun_rings.svg b/crates/client/src/assets/textures/sun_rings.svg similarity index 100% rename from crates/client/src/assets/sun_rings.svg rename to crates/client/src/assets/textures/sun_rings.svg diff --git a/crates/client/src/assets/superthruster_off.svg b/crates/client/src/assets/textures/superthruster_off.svg similarity index 100% rename from crates/client/src/assets/superthruster_off.svg rename to crates/client/src/assets/textures/superthruster_off.svg diff --git a/crates/client/src/assets/superthruster_on.svg b/crates/client/src/assets/textures/superthruster_on.svg similarity index 100% rename from crates/client/src/assets/superthruster_on.svg rename to crates/client/src/assets/textures/superthruster_on.svg diff --git a/crates/client/src/assets/thruster_off.svg b/crates/client/src/assets/textures/thruster_off.svg similarity index 100% rename from crates/client/src/assets/thruster_off.svg rename to crates/client/src/assets/textures/thruster_off.svg diff --git a/crates/client/src/assets/thruster_on.svg b/crates/client/src/assets/textures/thruster_on.svg similarity index 100% rename from crates/client/src/assets/thruster_on.svg rename to crates/client/src/assets/textures/thruster_on.svg diff --git a/crates/client/src/assets/trackindicator.svg b/crates/client/src/assets/textures/trackindicator.svg similarity index 100% rename from crates/client/src/assets/trackindicator.svg rename to crates/client/src/assets/textures/trackindicator.svg diff --git a/crates/client/src/assets/uv.png b/crates/client/src/assets/textures/uv.png similarity index 100% rename from crates/client/src/assets/uv.png rename to crates/client/src/assets/textures/uv.png diff --git a/crates/client/src/assets/venus.svg b/crates/client/src/assets/textures/venus.svg similarity index 100% rename from crates/client/src/assets/venus.svg rename to crates/client/src/assets/textures/venus.svg diff --git a/crates/client/src/native/assets.rs b/crates/client/src/native/assets.rs index f04e9b4968a3ca92c9d193916b69ede0cc7725d8..dda6a04a6c959f5a4c2d730d63280545f3953b26 100644 --- a/crates/client/src/native/assets.rs +++ b/crates/client/src/native/assets.rs @@ -18,7 +18,7 @@ impl Assets { } pub fn get(&self, local_path: impl Into) -> Option { let local_path = local_path.into(); - let bytes = std::fs::read(format!("src/assets/{}", local_path)).unwrap(); + let bytes = std::fs::read(format!("src/assets/textures/{}", local_path)).unwrap(); if local_path.ends_with(".svg") { let opt = usvg::Options { default_size: usvg::Size::from_wh(20.0, 20.0).unwrap(), diff --git a/crates/client/src/rendering/mod.rs b/crates/client/src/rendering/mod.rs index 4d4aadc3e9a389921efd556b025dd54f2a6063a4..d657d812c3ca01eeeaf1fee943a28e273284bb6e 100644 --- a/crates/client/src/rendering/mod.rs +++ b/crates/client/src/rendering/mod.rs @@ -214,12 +214,12 @@ impl ApplicationHandler for App { let shaders = [ ( "vertex", - include_str!("../shaders/vertex.glsl"), + include_str!("../assets/shaders/vertex.glsl"), glow::VERTEX_SHADER, ), ( "fragment", - include_str!("../shaders/fragment.glsl"), + include_str!("../assets/shaders/fragment.glsl"), glow::FRAGMENT_SHADER, ), ]; @@ -482,9 +482,10 @@ impl ApplicationHandler for App { self.recv_packet_events.send(RecvPacket(packet)); } #[cfg(not(target_arch = "wasm32"))] - for packet in ws.receiver.iter() { + while let Ok(packet) = ws.receiver.try_recv() { self.recv_packet_events.send(RecvPacket(packet)); } + self.send_packet_events.update(); self.recv_packet_events.update(); diff --git a/crates/client/src/wasm/assets.rs b/crates/client/src/wasm/assets.rs index 8f2e7a7f6568dbd8c1543c649997e03977b3fa6e..ab2e1a33e486dd1fa6b23340c92e3dfe964ca2e6 100644 --- a/crates/client/src/wasm/assets.rs +++ b/crates/client/src/wasm/assets.rs @@ -37,7 +37,7 @@ impl AssetLoader for Assets { let request_promise = poll_promise::Promise::spawn_local(async move { let window = web_sys::window().unwrap(); let request = ehttp::Request::get(format!( - "{}/src/assets/{}", + "{}/src/assets/textures/{}", window.location().origin().unwrap(), local_path_clone ));