From 78a7e7c7c91122e9ada5f457c8aa6c7f2fd09041 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 5 Mar 2025 11:25:11 +0100 Subject: avoid rc for ddnetworld --- client/src/renderer.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'client/src/renderer.rs') diff --git a/client/src/renderer.rs b/client/src/renderer.rs index d213a41..982487d 100644 --- a/client/src/renderer.rs +++ b/client/src/renderer.rs @@ -8,7 +8,6 @@ use pollster::FutureExt; use std::{ mem::swap, random::random, - rc::Rc, sync::{Arc, mpsc::channel}, time::Instant, }; @@ -58,7 +57,7 @@ pub struct Renderer<'a> { rng: Rng, need_reconfigure: bool, clock: Clock, - map: Rc, + map: Map, from_snap: Snap, to_snap: Snap, tees: TeeStorage, @@ -136,12 +135,12 @@ impl<'a> Renderer<'a> { surface.configure(&device, &surface_configuration); - let map = Rc::new(Map::try_from(&mut twmap).map_err(|e| anyhow!("{e}"))?); + let map = Map::try_from(&mut twmap).map_err(|e| anyhow!("{e}"))?; let (sender, _) = channel(); let (_, receiver) = channel(); - let simulation = - DdnetWorld::new_with_map(map.clone(), sender, receiver).map_err(|e| anyhow!("{e}"))?; + let simulation = DdnetWorld::new_with_map(map.clone().into(), sender, receiver) + .map_err(|e| anyhow!("{e}"))?; Ok(Self { start: Instant::now(), @@ -203,8 +202,6 @@ impl<'a> Renderer<'a> { self.surface_configuration.height, ); - // self.simulation.sn - if self.clock_set { self.clock.update(local_tick); } -- cgit v1.2.3-70-g09d2