~starkingdoms/starkingdoms

0493e0227361edcc0ea834ba235fd90430e17f98 — core 8 months ago 21dabbf
asset system cleanup
M crates/client/src/lib.rs => crates/client/src/lib.rs +2 -1
@@ 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};

M crates/client/src/networking/ws_native.rs => crates/client/src/networking/ws_native.rs +1 -1
@@ 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()

M crates/client/src/rendering/mod.rs => crates/client/src/rendering/mod.rs +1 -1
@@ 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::<Assets>();
                    let assets = self.world.resource::<crate::platform::assets::Assets>();
                    let image = match assets.get(texture.name.clone()) {
                        Some(t) => t,
                        None => continue,