From 67f471c9e181e99800f27568b1e3b6918f19ff56 Mon Sep 17 00:00:00 2001 From: Paris DOUADY Date: Mon, 7 Aug 2023 09:36:57 +0200 Subject: [PATCH] clippy --- egregoria/src/map/objects/parking.rs | 5 ++--- egregoria/src/map/terrain.rs | 11 +---------- native_app/src/rendering/map_rendering.rs | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/egregoria/src/map/objects/parking.rs b/egregoria/src/map/objects/parking.rs index a85e9b37..84ddc115 100644 --- a/egregoria/src/map/objects/parking.rs +++ b/egregoria/src/map/objects/parking.rs @@ -110,11 +110,10 @@ impl ParkingSpots { } } - let k = spots.insert(ParkingSpot { + spots.insert(ParkingSpot { parent, trans: Transform::new_dir(pos, dir), - }); - k + }) }) .collect(); diff --git a/egregoria/src/map/terrain.rs b/egregoria/src/map/terrain.rs index 94887d63..eecf464b 100644 --- a/egregoria/src/map/terrain.rs +++ b/egregoria/src/map/terrain.rs @@ -9,7 +9,7 @@ pub const CHUNK_SIZE: u32 = 1024; pub const CHUNK_RESOLUTION: usize = 32; pub const CELL_SIZE: f32 = CHUNK_SIZE as f32 / CHUNK_RESOLUTION as f32; -#[derive(Clone)] +#[derive(Default, Clone)] pub struct Chunk { pub trees: Vec, pub heights: [[f32; CHUNK_RESOLUTION]; CHUNK_RESOLUTION], @@ -26,15 +26,6 @@ impl Chunk { } } -impl Default for Chunk { - fn default() -> Self { - Self { - trees: Default::default(), - heights: Default::default(), - } - } -} - #[derive(Copy, Clone, Serialize, Deserialize)] pub struct Tree { pub pos: Vec2, diff --git a/native_app/src/rendering/map_rendering.rs b/native_app/src/rendering/map_rendering.rs index 6eae27c6..3df75626 100644 --- a/native_app/src/rendering/map_rendering.rs +++ b/native_app/src/rendering/map_rendering.rs @@ -66,7 +66,7 @@ impl MapRenderer { defer!(log::info!("finished init of road render")); MapRenderer { meshb: MapMeshHandler::new(gfx, goria), - tree_builder: InstancedMeshBuilder::new(mesh.clone()), + tree_builder: InstancedMeshBuilder::new(mesh), trees_cache: FastMap::default(), tree_sub: goria.map().subscribe(UpdateType::Terrain), terrain,