From 0493e0227361edcc0ea834ba235fd90430e17f98 Mon Sep 17 00:00:00 2001 From: core Date: Fri, 28 Mar 2025 09:03:26 -0400 Subject: [PATCH] asset system cleanup --- crates/client/src/lib.rs | 3 ++- crates/client/src/networking/ws_native.rs | 2 +- crates/client/src/rendering/mod.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/client/src/lib.rs b/crates/client/src/lib.rs index da0a3ca9554f7cec0fb49ca150e6213c60af3442..5226f6d71a894d1d7b9c7feb94e2821496f0f981 100644 --- a/crates/client/src/lib.rs +++ b/crates/client/src/lib.rs @@ -2,7 +2,8 @@ use bevy_ecs::{event::Events, world::World}; use components::{Camera, Chat, Menu, Part, Player, RecvPacket, SendPacket, Texture, Transform}; use nalgebra::{Rotation2, Rotation3, Scale2, Scale3, Translation2, Translation3, Vector3}; use networking::ws::Ws; -use rendering::{assets::Assets, App}; +use rendering::App; +use platform::assets::Assets; use starkingdoms_common::packet::Packet; use tracing::info; use winit::event_loop::{ControlFlow, EventLoop}; diff --git a/crates/client/src/networking/ws_native.rs b/crates/client/src/networking/ws_native.rs index cee8db9718d430034c4701f90241c7bc42690171..a8e12e24df6f0fb28c9baf69cb5f927edbb05df7 100644 --- a/crates/client/src/networking/ws_native.rs +++ b/crates/client/src/networking/ws_native.rs @@ -68,7 +68,7 @@ impl Ws { packet_receiver, } } - pub fn send_packet(&mut self, packet: &Packet) { + pub fn send_packet(&mut self, packet: Packet) { self.socket .lock() .unwrap() diff --git a/crates/client/src/rendering/mod.rs b/crates/client/src/rendering/mod.rs index 772c934d6fc00a4b666b71001756a10297f1c64b..9e360318738714340587501bc11964690393c240 100644 --- a/crates/client/src/rendering/mod.rs +++ b/crates/client/src/rendering/mod.rs @@ -591,7 +591,7 @@ impl ApplicationHandler for App { for (transform, texture) in sprites { if !self.textures.contains_key(&texture.name) { - let assets = self.world.resource::(); + let assets = self.world.resource::(); let image = match assets.get(texture.name.clone()) { Some(t) => t, None => continue,