From eda6a468758dda4575b2d808936a7730c8261e72 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Wed, 11 Sep 2024 14:22:21 +0200 Subject: [PATCH] fix some warnings --- kubi/src/block_placement.rs | 2 +- kubi/src/camera/frustum.rs | 2 +- kubi/src/camera/matrices.rs | 4 ++-- kubi/src/client_physics.rs | 2 +- kubi/src/control_flow.rs | 2 +- kubi/src/filesystem.rs | 2 +- kubi/src/init.rs | 5 ++--- kubi/src/networking.rs | 11 +++++------ kubi/src/player_controller.rs | 2 +- kubi/src/prefabs/loader.rs | 2 +- kubi/src/rendering.rs | 2 +- kubi/src/rendering/entities.rs | 7 ++----- kubi/src/rendering/smoverlay.rs | 2 +- kubi/src/world/chunk.rs | 2 +- kubi/src/world/mesh.rs | 2 +- kubi/src/world/raycast.rs | 2 +- 16 files changed, 23 insertions(+), 28 deletions(-) diff --git a/kubi/src/block_placement.rs b/kubi/src/block_placement.rs index acad8ff..1e65a3f 100644 --- a/kubi/src/block_placement.rs +++ b/kubi/src/block_placement.rs @@ -34,7 +34,7 @@ fn pick_block_with_number_keys( mut holding: ViewMut, input: UniqueView, ) { - let Some((_, mut holding)) = (&main_player, &mut holding).iter().next() else { return }; + let Some((_, holding)) = (&main_player, &mut holding).iter().next() else { return }; for &(key, block) in BLOCK_KEY_MAP { if input.keyboard_state.contains(key as u32) { holding.0 = Some(block); diff --git a/kubi/src/camera/frustum.rs b/kubi/src/camera/frustum.rs index 4c4e3de..f9de8e7 100644 --- a/kubi/src/camera/frustum.rs +++ b/kubi/src/camera/frustum.rs @@ -124,7 +124,7 @@ pub fn update_frustum( mut cameras: ViewMut, transforms: View ) { - for (mut camera, _) in (&mut cameras, transforms.inserted_or_modified()).iter() { + for (camera, _) in (&mut cameras, transforms.inserted_or_modified()).iter() { camera.frustum = Frustum::compute(&camera); } } diff --git a/kubi/src/camera/matrices.rs b/kubi/src/camera/matrices.rs index 6230447..f8c1695 100644 --- a/kubi/src/camera/matrices.rs +++ b/kubi/src/camera/matrices.rs @@ -9,7 +9,7 @@ fn update_view_matrix( mut vm_camera: ViewMut, v_transform: View ) { - for (mut camera, transform) in (&mut vm_camera, v_transform.inserted_or_modified()).iter() { + for (camera, transform) in (&mut vm_camera, v_transform.inserted_or_modified()).iter() { let (_, rotation, translation) = transform.0.to_scale_rotation_translation(); let direction = (rotation.normalize() * Vec3::NEG_Z).normalize(); camera.view_matrix = Mat4::look_to_rh(translation, direction, camera.up); @@ -21,7 +21,7 @@ fn update_perspective_matrix( ren: UniqueView, ) { let sz = ren.size_vec2(); - for mut camera in (&mut vm_camera).iter() { + for camera in (&mut vm_camera).iter() { camera.perspective_matrix = Mat4::perspective_rh( camera.fov, sz.x / sz.y, diff --git a/kubi/src/client_physics.rs b/kubi/src/client_physics.rs index f6ef9e6..28f2a07 100644 --- a/kubi/src/client_physics.rs +++ b/kubi/src/client_physics.rs @@ -106,7 +106,7 @@ pub fn update_client_physics_late( world: UniqueView, dt: UniqueView, ) { - for (mut actor, mut transform) in (&mut actors, &mut transforms).iter() { + for (actor, mut transform) in (&mut actors, &mut transforms).iter() { if actor.disable { actor.forces = Vec3::ZERO; continue; diff --git a/kubi/src/control_flow.rs b/kubi/src/control_flow.rs index 03ec5e2..212ab4b 100644 --- a/kubi/src/control_flow.rs +++ b/kubi/src/control_flow.rs @@ -1,5 +1,5 @@ use shipyard::{UniqueView, UniqueViewMut, Unique, AllStoragesView}; -use winit::{keyboard::KeyCode, event_loop::ControlFlow}; +use winit::keyboard::KeyCode; use crate::input::RawKbmInputState; #[derive(Unique)] diff --git a/kubi/src/filesystem.rs b/kubi/src/filesystem.rs index 272889c..0a36363 100644 --- a/kubi/src/filesystem.rs +++ b/kubi/src/filesystem.rs @@ -1,6 +1,6 @@ use std::{fs::File, path::Path, io::{Read, Seek}}; use anyhow::Result; -use shipyard::{Unique, AllStoragesView}; +use shipyard::Unique; pub trait ReadOnly: Read + Seek {} impl ReadOnly for T {} diff --git a/kubi/src/init.rs b/kubi/src/init.rs index fba8a51..e6fa838 100644 --- a/kubi/src/init.rs +++ b/kubi/src/init.rs @@ -1,11 +1,10 @@ use shipyard::{AllStoragesView, UniqueViewMut}; -use std::{env, net::SocketAddr, fs::OpenOptions, path::Path}; -use anyhow::Result; +use std::{env, net::SocketAddr, path::Path}; use crate::{ networking::{GameType, ServerAddress}, state::{GameState, NextState} }; -use kubi_shared::data::{io_thread::IOThreadManager, WorldSaveFile, open_local_save_file}; +use kubi_shared::data::{io_thread::IOThreadManager, open_local_save_file}; pub fn initialize_from_args( all_storages: AllStoragesView, diff --git a/kubi/src/networking.rs b/kubi/src/networking.rs index e9e5b5e..ab9d18b 100644 --- a/kubi/src/networking.rs +++ b/kubi/src/networking.rs @@ -1,19 +1,18 @@ use shipyard::{Unique, AllStoragesView, UniqueView, UniqueViewMut, Workload, IntoWorkload, EntitiesViewMut, Component, ViewMut, SystemModificator, View, IntoIter, WorkloadModificator}; use std::net::SocketAddr; use uflow::{ - client::{Client, Config as ClientConfig, Event as ClientEvent}, + client::{Client, Config as ClientConfig, Event as ClientEvent}, EndpointConfig }; use kubi_shared::networking::{ messages::ServerToClientMessage, - state::ClientJoinState, + state::ClientJoinState, client::ClientIdMap, }; use crate::{ - events::EventComponent, - control_flow::RequestExit, - world::tasks::ChunkTaskManager, - state::is_ingame_or_loading, + events::EventComponent, + world::tasks::ChunkTaskManager, + state::is_ingame_or_loading, fixed_timestamp::FixedTimestamp }; diff --git a/kubi/src/player_controller.rs b/kubi/src/player_controller.rs index 23e2638..6866053 100644 --- a/kubi/src/player_controller.rs +++ b/kubi/src/player_controller.rs @@ -128,7 +128,7 @@ pub fn debug_switch_ctl_type( mut actors: ViewMut, kbm_state: UniqueView, ) { - for (mut controller, mut actor) in (&mut controllers, &mut actors).iter() { + for (controller, actor) in (&mut controllers, &mut actors).iter() { if kbm_state.keyboard_state.contains(KeyCode::F4 as u32) { *controller = PlayerController::DEFAULT_FPS_CTL; actor.disable = false; diff --git a/kubi/src/prefabs/loader.rs b/kubi/src/prefabs/loader.rs index ab11b32..f5f7711 100644 --- a/kubi/src/prefabs/loader.rs +++ b/kubi/src/prefabs/loader.rs @@ -2,7 +2,7 @@ use glam::UVec2; use strum::IntoEnumIterator; use rayon::prelude::*; use wgpu::util::{DeviceExt, TextureDataOrder}; -use std::{io::{BufReader, Read}, path::{Path, PathBuf}}; +use std::{io::BufReader, path::{Path, PathBuf}}; use crate::{filesystem::AssetManager, prefabs::ModelVertex, rendering::{BufferPair, Renderer}}; use super::AssetPaths; diff --git a/kubi/src/rendering.rs b/kubi/src/rendering.rs index 288627b..41c293a 100644 --- a/kubi/src/rendering.rs +++ b/kubi/src/rendering.rs @@ -1,4 +1,4 @@ -use shipyard::{AllStoragesViewMut, IntoIter, IntoWorkload, SystemModificator, Unique, UniqueView, UniqueViewMut, View, Workload, WorkloadModificator}; +use shipyard::{AllStoragesViewMut, IntoIter, IntoWorkload, Unique, UniqueView, UniqueViewMut, View, Workload, WorkloadModificator}; use winit::dpi::PhysicalSize; use glam::Vec3; use crate::{events::WindowResizedEvent, hui_integration::kubi_ui_draw, state::is_ingame}; diff --git a/kubi/src/rendering/entities.rs b/kubi/src/rendering/entities.rs index 84865cf..b6f66fd 100644 --- a/kubi/src/rendering/entities.rs +++ b/kubi/src/rendering/entities.rs @@ -1,8 +1,5 @@ -use shipyard::{AllStoragesView, IntoIter, IntoWithId, Unique, UniqueView, View}; -use kubi_shared::{entity::Entity, transform::Transform}; -use crate::{ - camera::Camera, prefabs::GpuPrefabs, settings::GameSettings -}; +use shipyard::{AllStoragesView, Unique, UniqueView}; +use crate::prefabs::GpuPrefabs; use super::{camera_uniform::CameraUniformBuffer, depth::DepthTexture, RenderCtx}; diff --git a/kubi/src/rendering/smoverlay.rs b/kubi/src/rendering/smoverlay.rs index a81907c..8b15d20 100644 --- a/kubi/src/rendering/smoverlay.rs +++ b/kubi/src/rendering/smoverlay.rs @@ -1,5 +1,5 @@ use shipyard::{AllStoragesView, Unique, UniqueView}; -use super::{primitives::FstriPrimitive, RenderCtx, Renderer}; +use super::{primitives::FstriPrimitive, RenderCtx}; mod uniform; mod pipeline; diff --git a/kubi/src/world/chunk.rs b/kubi/src/world/chunk.rs index f728f28..de52da8 100644 --- a/kubi/src/world/chunk.rs +++ b/kubi/src/world/chunk.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use glam::IVec3; use atomic::Atomic; use kubi_shared::worldgen::AbortState; -use crate::rendering::{world::ChunkVertex, BufferPair}; +use crate::rendering::BufferPair; pub use kubi_shared::chunk::{CHUNK_SIZE, BlockData}; diff --git a/kubi/src/world/mesh.rs b/kubi/src/world/mesh.rs index 98d1ec6..6bf12d4 100644 --- a/kubi/src/world/mesh.rs +++ b/kubi/src/world/mesh.rs @@ -1,4 +1,4 @@ -use glam::{ivec3, IVec3, Vec3}; +use glam::{ivec3, IVec3}; use strum::IntoEnumIterator; use kubi_shared::block::{Block, RenderType, Transparency}; use crate::world::chunk::CHUNK_SIZE; diff --git a/kubi/src/world/raycast.rs b/kubi/src/world/raycast.rs index cda092f..2e8ce1e 100644 --- a/kubi/src/world/raycast.rs +++ b/kubi/src/world/raycast.rs @@ -57,7 +57,7 @@ pub fn update_raycasts( if !(world.is_inserted_or_modified() || (transform.inserted_or_modified(), &raycast).iter().next().is_some()) { return } - for (transform, mut report) in (&transform, &mut raycast).iter() { + for (transform, report) in (&transform, &mut raycast).iter() { let (_, rotation, position) = transform.0.to_scale_rotation_translation(); let direction = (rotation.normalize() * Vec3::NEG_Z).normalize(); *report = LookingAtBlock(world.raycast(position, direction, Some(30.)));