46 files changed, 6 insertions(+), 5 deletions(-)

R crates/client/src/{ => assets}/shaders/fragment.glsl
R crates/client/src/{ => assets}/shaders/vertex.glsl
R crates/client/src/assets/{ => textures}/autoplr_cfg.svg
R crates/client/src/assets/{ => textures}/autoplr_error.svg
R crates/client/src/assets/{ => textures}/autoplr_on.svg
R crates/client/src/assets/{ => textures}/cargo_off.svg
R crates/client/src/assets/{ => textures}/cargo_on.svg
R crates/client/src/assets/{ => textures}/chassis.svg
R crates/client/src/assets/{ => textures}/earth.svg
R crates/client/src/assets/{ => textures}/earth_icon.svg
R crates/client/src/assets/{ => textures}/ecothruster_on.svg
R crates/client/src/assets/{ => textures}/editor_direction.svg
R crates/client/src/assets/{ => textures}/f.png
R crates/client/src/assets/{ => textures}/happy-tree.png
R crates/client/src/assets/{ => textures}/hearty.svg
R crates/client/src/assets/{ => textures}/hearty_ferris.svg
R crates/client/src/assets/{ => textures}/hearty_party.svg
R crates/client/src/assets/{ => textures}/hub_off.svg
R crates/client/src/assets/{ => textures}/hub_on.svg
R crates/client/src/assets/{ => textures}/jupiter.svg
R crates/client/src/assets/{ => textures}/landingleg.svg
R crates/client/src/assets/{ => textures}/landingthruster_off.svg
R crates/client/src/assets/{ => textures}/landingthruster_on.svg
R crates/client/src/assets/{ => textures}/mars.svg
R crates/client/src/assets/{ => textures}/mars_icon.svg
R crates/client/src/assets/{ => textures}/mercury_NEEDS_4_1_1.svg
R crates/client/src/assets/{ => textures}/missing.svg
R crates/client/src/assets/{ => textures}/moon.svg
R crates/client/src/assets/{ => textures}/moon_icon.svg
R crates/client/src/assets/{ => textures}/powerhub_off.svg
R crates/client/src/assets/{ => textures}/powerhub_on.svg
R crates/client/src/assets/{ => textures}/starfield.svg
R crates/client/src/assets/{ => textures}/starfield_dim.svg
R crates/client/src/assets/{ => textures}/starfield_transp.svg
R crates/client/src/assets/{ => textures}/sun.svg
R crates/client/src/assets/{ => textures}/sun_rings.svg
R crates/client/src/assets/{ => textures}/superthruster_off.svg
R crates/client/src/assets/{ => textures}/superthruster_on.svg
R crates/client/src/assets/{ => textures}/thruster_off.svg
R crates/client/src/assets/{ => textures}/thruster_on.svg
R crates/client/src/assets/{ => textures}/trackindicator.svg
R crates/client/src/assets/{ => textures}/uv.png
R crates/client/src/assets/{ => textures}/venus.svg
M crates/client/src/native/assets.rs
M crates/client/src/rendering/mod.rs
M crates/client/src/wasm/assets.rs

@@ 18,7 18,7 @@ impl Assets {
     }
     pub fn get(&self, local_path: impl Into<String>) -> Option<ImgData> {
         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(),

@@ 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();
 

@@ 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
                 ));