diff options
| author | HampusM <hampus@hampusmat.com> | 2026-05-23 19:56:41 +0200 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2026-05-23 19:56:41 +0200 |
| commit | 8a41f5aeb3ac143d731928d1c343cd9338190f0a (patch) | |
| tree | a7a8bba7e119354abbaa9fff6ec4e16d2f66b829 /engine/src | |
| parent | 02afe68342870ce4f37d7e8fb45c985397d6e08d (diff) | |
Diffstat (limited to 'engine/src')
| -rw-r--r-- | engine/src/asset.rs | 11 | ||||
| -rw-r--r-- | engine/src/camera.rs | 1 | ||||
| -rw-r--r-- | engine/src/camera/fly.rs | 9 | ||||
| -rw-r--r-- | engine/src/collision.rs | 1 | ||||
| -rw-r--r-- | engine/src/draw_flags.rs | 3 | ||||
| -rw-r--r-- | engine/src/file_format/wavefront/obj.rs | 26 | ||||
| -rw-r--r-- | engine/src/image.rs | 2 | ||||
| -rw-r--r-- | engine/src/input.rs | 1 | ||||
| -rw-r--r-- | engine/src/lib.rs | 2 | ||||
| -rw-r--r-- | engine/src/lighting.rs | 3 | ||||
| -rw-r--r-- | engine/src/material.rs | 3 | ||||
| -rw-r--r-- | engine/src/mesh/cube.rs | 2 | ||||
| -rw-r--r-- | engine/src/model.rs | 5 | ||||
| -rw-r--r-- | engine/src/projection.rs | 2 | ||||
| -rw-r--r-- | engine/src/reflection.rs | 2 | ||||
| -rw-r--r-- | engine/src/renderer.rs | 20 | ||||
| -rw-r--r-- | engine/src/renderer/main_render_pass.rs | 2 | ||||
| -rw-r--r-- | engine/src/renderer/object.rs | 3 | ||||
| -rw-r--r-- | engine/src/renderer/opengl.rs | 26 | ||||
| -rw-r--r-- | engine/src/renderer/opengl/graphics_mesh.rs | 2 | ||||
| -rw-r--r-- | engine/src/shader.rs | 12 | ||||
| -rw-r--r-- | engine/src/shader/default.rs | 11 | ||||
| -rw-r--r-- | engine/src/transform.rs | 3 | ||||
| -rw-r--r-- | engine/src/windowing.rs | 22 | ||||
| -rw-r--r-- | engine/src/windowing/window.rs | 3 | ||||
| -rw-r--r-- | engine/src/work_queue.rs | 2 |
26 files changed, 82 insertions, 97 deletions
diff --git a/engine/src/asset.rs b/engine/src/asset.rs index 1ab3cb1..95d9dc3 100644 --- a/engine/src/asset.rs +++ b/engine/src/asset.rs @@ -1,4 +1,4 @@ -use std::any::{Any, type_name}; +use std::any::{type_name, Any}; use std::borrow::Cow; use std::cell::RefCell; use std::collections::HashMap; @@ -8,18 +8,17 @@ use std::fmt::{Debug, Display}; use std::hash::{DefaultHasher, Hash, Hasher}; use std::marker::PhantomData; use std::path::{Path, PathBuf}; -use std::sync::Arc; use std::sync::mpsc::{ + channel as mpsc_channel, Receiver as MpscReceiver, Sender as MpscSender, - channel as mpsc_channel, }; +use std::sync::Arc; use crate::ecs::pair::{ChildOf, Pair}; -use crate::ecs::phase::{PRE_UPDATE as PRE_UPDATE_PHASE, Phase}; +use crate::ecs::phase::{Phase, PRE_UPDATE as PRE_UPDATE_PHASE}; use crate::ecs::sole::Single; -use crate::ecs::{Sole, declare_entity}; - +use crate::ecs::{declare_entity, Sole}; use crate::work_queue::{Work, WorkQueue}; declare_entity!( diff --git a/engine/src/camera.rs b/engine/src/camera.rs index 22a0702..6b07769 100644 --- a/engine/src/camera.rs +++ b/engine/src/camera.rs @@ -1,5 +1,4 @@ use crate::ecs::Component; - use crate::projection::{Perspective, Projection}; use crate::vector::Vec3; diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs index eddc8ff..a6b336c 100644 --- a/engine/src/camera/fly.rs +++ b/engine/src/camera/fly.rs @@ -1,13 +1,12 @@ +use crate::builder; +use crate::camera::{Active as ActiveCamera, Camera}; +use crate::delta_time::DeltaTime; use crate::ecs::component::local::Local; use crate::ecs::phase::UPDATE as UPDATE_PHASE; use crate::ecs::sole::Single; -use crate::ecs::system::Into; use crate::ecs::system::initializable::Initializable; +use crate::ecs::system::Into; use crate::ecs::{Component, Query}; - -use crate::builder; -use crate::camera::{Active as ActiveCamera, Camera}; -use crate::delta_time::DeltaTime; use crate::input::keyboard::{Key, Keyboard}; use crate::input::mouse::Mouse; use crate::transform::WorldPosition; diff --git a/engine/src/collision.rs b/engine/src/collision.rs index 24cb152..139b924 100644 --- a/engine/src/collision.rs +++ b/engine/src/collision.rs @@ -1,5 +1,4 @@ use crate::ecs::Component; - use crate::mesh::Mesh; use crate::vector::Vec3; diff --git a/engine/src/draw_flags.rs b/engine/src/draw_flags.rs index bd3d714..ecc94a8 100644 --- a/engine/src/draw_flags.rs +++ b/engine/src/draw_flags.rs @@ -1,6 +1,5 @@ -use crate::ecs::Component; - use crate::builder; +use crate::ecs::Component; builder! { /// Flags for how a object should be drawn. diff --git a/engine/src/file_format/wavefront/obj.rs b/engine/src/file_format/wavefront/obj.rs index 446903c..ebbbe45 100644 --- a/engine/src/file_format/wavefront/obj.rs +++ b/engine/src/file_format/wavefront/obj.rs @@ -7,18 +7,18 @@ use std::fs::read_to_string; use std::path::PathBuf; use crate::file_format::wavefront::common::{ + keyword, + parse_statement_line, ParsingError, Statement, Triplet, - keyword, - parse_statement_line, }; use crate::mesh::vertex_buffer::{ NamedVertexAttr, VertexAttrInfo, VertexBuffer as MeshVertexBuffer, }; -use crate::mesh::{Mesh, POSITION_VERTEX_ATTRIB_NAME, VertexAttrType}; +use crate::mesh::{Mesh, VertexAttrType, POSITION_VERTEX_ATTRIB_NAME}; use crate::util::try_option; use crate::vector::{Vec2, Vec3}; @@ -264,7 +264,9 @@ pub enum Error #[error(transparent)] ParsingError(#[from] ParsingError), - #[error("Face vertex position with index {vertex_pos_index} (1-based) was not found")] + #[error( + "Face vertex position with index {vertex_pos_index} (1-based) was not found" + )] FaceVertexPositionNotFound { vertex_pos_index: u32 @@ -567,16 +569,12 @@ fn get_mtl_libs_from_statements( return None; } - let mtl_lib_paths = try_option!( - statement - .arguments - .iter() - .enumerate() - .map(|(index, value)| Ok(PathBuf::from( - value.to_text(index, *line_no)? - ))) - .collect::<Result<Vec<_>, ParsingError>>() - ); + let mtl_lib_paths = try_option!(statement + .arguments + .iter() + .enumerate() + .map(|(index, value)| Ok(PathBuf::from(value.to_text(index, *line_no)?))) + .collect::<Result<Vec<_>, ParsingError>>()); Some(Ok(mtl_lib_paths)) }) diff --git a/engine/src/image.rs b/engine/src/image.rs index b6d8013..dbcad9d 100644 --- a/engine/src/image.rs +++ b/engine/src/image.rs @@ -62,7 +62,7 @@ impl Image } pub fn from_color(dimens: impl Into<Dimens<u32>>, color: impl Into<Color<u8>>) - -> Self + -> Self { let dimens: Dimens<u32> = dimens.into(); diff --git a/engine/src/input.rs b/engine/src/input.rs index 613f0ad..9e8f0b6 100644 --- a/engine/src/input.rs +++ b/engine/src/input.rs @@ -2,7 +2,6 @@ use crate::ecs::declare_entity; use crate::ecs::extension::Collector as ExtensionCollector; use crate::ecs::pair::{ChildOf, Pair}; use crate::ecs::phase::Phase; - use crate::windowing::PHASE as WINDOWING_PHASE; pub mod keyboard; diff --git a/engine/src/lib.rs b/engine/src/lib.rs index 5249e14..4b06f5a 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -2,7 +2,7 @@ #![allow(clippy::needless_pass_by_value)] use crate::asset::{Assets, Extension as AssetExtension}; -use crate::delta_time::{DeltaTime, LastUpdate, update as update_delta_time}; +use crate::delta_time::{update as update_delta_time, DeltaTime, LastUpdate}; use crate::ecs::component::Sequence as ComponentSequence; use crate::ecs::extension::Extension; use crate::ecs::phase::PRE_UPDATE as PRE_UPDATE_PHASE; diff --git a/engine/src/lighting.rs b/engine/src/lighting.rs index f1b6570..2a07541 100644 --- a/engine/src/lighting.rs +++ b/engine/src/lighting.rs @@ -1,8 +1,7 @@ -use crate::ecs::{Component, Sole}; - use crate::builder; use crate::color::Color; use crate::data_types::vector::Vec3; +use crate::ecs::{Component, Sole}; builder! { #[builder(name = PointLightBuilder, derives = (Debug, Clone))] diff --git a/engine/src/material.rs b/engine/src/material.rs index accb9a1..59f0a6a 100644 --- a/engine/src/material.rs +++ b/engine/src/material.rs @@ -1,8 +1,7 @@ -use crate::ecs::Component; - use crate::asset::Handle as AssetHandle; use crate::builder; use crate::color::Color; +use crate::ecs::Component; use crate::texture::Texture; pub mod asset; diff --git a/engine/src/mesh/cube.rs b/engine/src/mesh/cube.rs index dba6473..b30449f 100644 --- a/engine/src/mesh/cube.rs +++ b/engine/src/mesh/cube.rs @@ -8,7 +8,7 @@ use crate::mesh::vertex_buffer::{ VertexAttrInfo, VertexBuffer as MeshVertexBuffer, }; -use crate::mesh::{Mesh, POSITION_VERTEX_ATTRIB_NAME, VertexAttrType}; +use crate::mesh::{Mesh, VertexAttrType, POSITION_VERTEX_ATTRIB_NAME}; use crate::vector::{Vec2, Vec3}; builder! { diff --git a/engine/src/model.rs b/engine/src/model.rs index 0aaa877..60a5615 100644 --- a/engine/src/model.rs +++ b/engine/src/model.rs @@ -1,11 +1,10 @@ use std::borrow::Cow; use std::collections::HashMap; -use crate::ecs::Component; - use crate::asset::{Assets, Handle as AssetHandle}; -use crate::material::Material; +use crate::ecs::Component; use crate::material::asset::Map as MaterialAssetMap; +use crate::material::Material; use crate::mesh::Mesh; pub mod asset; diff --git a/engine/src/projection.rs b/engine/src/projection.rs index 46df6d4..e4f5898 100644 --- a/engine/src/projection.rs +++ b/engine/src/projection.rs @@ -25,7 +25,7 @@ impl Perspective /// Creates a perspective projection matrix using right-handed coordinates. #[inline] pub fn to_matrix_rh(&self, aspect: f32, clip_volume: ClipVolume) - -> Matrix<f32, 4, 4> + -> Matrix<f32, 4, 4> { let mut out = Matrix::new(); diff --git a/engine/src/reflection.rs b/engine/src/reflection.rs index 429946b..679c0b9 100644 --- a/engine/src/reflection.rs +++ b/engine/src/reflection.rs @@ -1,5 +1,5 @@ use std::alloc::Layout; -use std::any::{TypeId, type_name}; +use std::any::{type_name, TypeId}; use std::fmt::Debug; pub use engine_macros::Reflection; diff --git a/engine/src/renderer.rs b/engine/src/renderer.rs index a302b8e..9818f80 100644 --- a/engine/src/renderer.rs +++ b/engine/src/renderer.rs @@ -2,32 +2,32 @@ use std::collections::VecDeque; use std::sync::atomic::{AtomicU64, Ordering}; use bitflags::bitflags; +use engine_macros::Reflection; + +use crate::asset::Handle as AssetHandle; +use crate::builder; +use crate::data_types::dimens::Dimens; +use crate::draw_flags::PolygonModeConfig; use crate::ecs::actions::Actions; use crate::ecs::component::local::Local; use crate::ecs::event::component::{Changed, EventMatchExt, Removed}; use crate::ecs::pair::{ChildOf, Pair}; -use crate::ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase}; +use crate::ecs::phase::{Phase, POST_UPDATE as POST_UPDATE_PHASE}; use crate::ecs::query::term::With; use crate::ecs::sole::Single; -use crate::ecs::system::Into; use crate::ecs::system::initializable::Initializable; use crate::ecs::system::observer::Observe; -use crate::ecs::{Component, Query, Sole, declare_entity}; -use engine_macros::Reflection; - -use crate::asset::Handle as AssetHandle; -use crate::builder; -use crate::data_types::dimens::Dimens; -use crate::draw_flags::PolygonModeConfig; +use crate::ecs::system::Into; +use crate::ecs::{declare_entity, Component, Query, Sole}; use crate::mesh::Mesh; use crate::renderer::blending::Config as BlendingConfig; use crate::renderer::object::{Id as ObjectId, Store as ObjectStore}; -use crate::shader::Program as ShaderProgram; use crate::shader::cursor::{ BindingLocation as ShaderBindingLocation, BindingValue as ShaderBindingValue, Cursor as ShaderCursor, }; +use crate::shader::Program as ShaderProgram; use crate::texture::Texture; use crate::vector::Vec2; use crate::windowing::window::Window; diff --git a/engine/src/renderer/main_render_pass.rs b/engine/src/renderer/main_render_pass.rs index 04050f8..e63ce0e 100644 --- a/engine/src/renderer/main_render_pass.rs +++ b/engine/src/renderer/main_render_pass.rs @@ -1,8 +1,8 @@ use crate::asset::Assets; use crate::draw_flags::{DrawFlags, NoDraw, PolygonModeConfig}; -use crate::ecs::Query; use crate::ecs::query::term::{With, Without}; use crate::ecs::sole::Single; +use crate::ecs::Query; use crate::model::{MaterialSearchResult, Model}; use crate::renderer::object::{Id as RendererObjectId, Store as RendererObjectStore}; use crate::renderer::{ diff --git a/engine/src/renderer/object.rs b/engine/src/renderer/object.rs index 8441959..e10011d 100644 --- a/engine/src/renderer/object.rs +++ b/engine/src/renderer/object.rs @@ -1,9 +1,8 @@ use std::collections::HashMap; use std::sync::atomic::{AtomicU64, Ordering}; -use crate::ecs::Sole; - use crate::asset::Id as AssetId; +use crate::ecs::Sole; pub type RawValue = u32; diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs index dcdd6a5..e6163ab 100644 --- a/engine/src/renderer/opengl.rs +++ b/engine/src/renderer/opengl.rs @@ -3,10 +3,6 @@ use std::borrow::Cow; use std::collections::HashMap; -use crate::ecs::actions::Actions; -use crate::ecs::query::term::Without; -use crate::ecs::sole::Single; -use crate::ecs::{Component, Query, Sole}; use glutin::config::Config as GlutinConfig; use glutin::display::GetGlDisplay; use glutin::error::Error as GlutinError; @@ -17,29 +13,29 @@ use glutin::surface::{ WindowSurface as GlutinWindowSurface, }; use opengl_bindings::blending::{ + configure as gl_blending_configure, Configuration as GlBlendingConfig, Equation as GlBlendingEquation, Factor as GlBlendingFactor, - configure as gl_blending_configure, }; use opengl_bindings::debug::{ + set_debug_message_callback, + set_debug_message_control, MessageIdsAction, MessageSeverity, MessageSource, MessageType, SetDebugMessageControlError as GlSetDebugMessageControlError, - set_debug_message_callback, - set_debug_message_control, }; use opengl_bindings::misc::{ - BufferClearMask as GlBufferClearMask, - Capability, clear_buffers, define_scissor_box as gl_define_scissor_box, enable, get_viewport as gl_get_viewport, set_enabled, set_viewport as gl_set_viewport, + BufferClearMask as GlBufferClearMask, + Capability, }; use opengl_bindings::shader::{ Error as GlShaderError, @@ -72,6 +68,10 @@ use zerocopy::{Immutable, IntoBytes}; use crate::asset::{Assets, Handle as AssetHandle}; use crate::data_types::dimens::Dimens; +use crate::ecs::actions::Actions; +use crate::ecs::query::term::Without; +use crate::ecs::sole::Single; +use crate::ecs::{Component, Query, Sole}; use crate::image::{ColorType as ImageColorType, Image}; use crate::matrix::Matrix; use crate::reflection::EnumReflectionExt; @@ -95,10 +95,10 @@ use crate::renderer::{ DrawMeshOptions, DrawPropertiesUpdateFlags, GraphicsProperties, - POST_RENDER_PHASE, - RENDER_PHASE, SurfaceId, SurfaceSpec, + POST_RENDER_PHASE, + RENDER_PHASE, }; use crate::shader::cursor::BindingValue as ShaderBindingValue; use crate::shader::{ @@ -115,13 +115,13 @@ use crate::texture::{ }; use crate::util::OptionExt; use crate::vector::{Vec2, Vec3}; -use crate::windowing::Context as WindowingContext; use crate::windowing::window::{ Closed as WindowClosed, CreationAttributes as WindowCreationAttributes, CreationReady, Window, }; +use crate::windowing::Context as WindowingContext; mod glutin_compat; mod graphics_mesh; @@ -1346,7 +1346,7 @@ fn opengl_debug_message_cb( { use std::backtrace::{Backtrace, BacktraceStatus}; - use tracing::{Level, event}; + use tracing::{event, Level}; macro_rules! create_event { ($level: expr) => { diff --git a/engine/src/renderer/opengl/graphics_mesh.rs b/engine/src/renderer/opengl/graphics_mesh.rs index c5ff0c6..7db72d4 100644 --- a/engine/src/renderer/opengl/graphics_mesh.rs +++ b/engine/src/renderer/opengl/graphics_mesh.rs @@ -1,4 +1,3 @@ -use opengl_bindings::CurrentContextWithFns as GlCurrentContextWithFns; use opengl_bindings::buffer::{Buffer as GlBuffer, Usage as GlBufferUsage}; use opengl_bindings::vertex_array::{ AttributeFormat as GlVertexArrayAttributeFormat, @@ -7,6 +6,7 @@ use opengl_bindings::vertex_array::{ VertexArray as GlVertexArray, VertexBufferSpec as GlVertexArrayVertexBufferSpec, }; +use opengl_bindings::CurrentContextWithFns as GlCurrentContextWithFns; use crate::mesh::{Mesh, VertexAttrType}; use crate::renderer::MeshUsage; diff --git a/engine/src/shader.rs b/engine/src/shader.rs index 7988724..e3580e2 100644 --- a/engine/src/shader.rs +++ b/engine/src/shader.rs @@ -22,19 +22,19 @@ use shader_slang::{ use crate::asset::{ Assets, Event as AssetEvent, - HANDLE_ASSETS_PHASE, Handle as AssetHandle, Id as AssetId, Submitter as AssetSubmitter, + HANDLE_ASSETS_PHASE, }; use crate::builder; use crate::ecs::pair::{ChildOf, Pair}; -use crate::ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase, START as START_PHASE}; +use crate::ecs::phase::{Phase, POST_UPDATE as POST_UPDATE_PHASE, START as START_PHASE}; use crate::ecs::sole::Single; -use crate::ecs::{Component, Sole, declare_entity}; +use crate::ecs::{declare_entity, Component, Sole}; use crate::shader::default::{ - ASSET_LABEL, enqueue_set_shader_bindings as default_shader_enqueue_set_shader_bindings, + ASSET_LABEL, }; pub mod cursor; @@ -203,7 +203,7 @@ pub struct ProgramReflection<'a> impl<'a> ProgramReflection<'a> { pub fn get_entry_point_by_index(&self, index: u32) - -> Option<EntryPointReflection<'a>> + -> Option<EntryPointReflection<'a>> { Some(EntryPointReflection { inner: self.inner.entry_point_by_index(index)?, @@ -211,7 +211,7 @@ impl<'a> ProgramReflection<'a> } pub fn get_entry_point_by_name(&self, name: &str) - -> Option<EntryPointReflection<'a>> + -> Option<EntryPointReflection<'a>> { Some(EntryPointReflection { inner: self.inner.find_entry_point_by_name(name)?, diff --git a/engine/src/shader/default.rs b/engine/src/shader/default.rs index c217af6..8144fdf 100644 --- a/engine/src/shader/default.rs +++ b/engine/src/shader/default.rs @@ -1,15 +1,14 @@ use std::path::Path; use std::sync::LazyLock; -use crate::ecs::Query; -use crate::ecs::actions::Actions; -use crate::ecs::query::term::Without; -use crate::ecs::sole::Single; - use crate::asset::{Assets, Label as AssetLabel}; use crate::camera::{Active as ActiveCamera, Camera}; use crate::data_types::dimens::Dimens; use crate::draw_flags::NoDraw; +use crate::ecs::actions::Actions; +use crate::ecs::query::term::Without; +use crate::ecs::sole::Single; +use crate::ecs::Query; use crate::lighting::{DirectionalLight, GlobalLight, PointLight}; use crate::material::{Flags as MaterialFlags, Material}; use crate::matrix::Matrix; @@ -327,7 +326,7 @@ fn create_model_matrix(transform: Transform) -> Matrix<f32, 4, 4> } fn create_view_matrix(camera: &Camera, camera_world_pos: &Vec3<f32>) --> Matrix<f32, 4, 4> + -> Matrix<f32, 4, 4> { let mut view = Matrix::new(); diff --git a/engine/src/transform.rs b/engine/src/transform.rs index e80bd00..642fb72 100644 --- a/engine/src/transform.rs +++ b/engine/src/transform.rs @@ -1,6 +1,5 @@ -use crate::ecs::Component; - use crate::builder; +use crate::ecs::Component; use crate::vector::Vec3; builder!( diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs index e7a632f..ea5a692 100644 --- a/engine/src/windowing.rs +++ b/engine/src/windowing.rs @@ -3,21 +3,11 @@ use std::sync::{Arc, Weak}; use std::thread::{Builder as ThreadBuilder, JoinHandle as ThreadJoinHandle}; use crossbeam_channel::{ + bounded as bounded_channel, Receiver as ChannelReceiver, Sender as ChannelSender, TrySendError, - bounded as bounded_channel, }; -use crate::ecs::actions::Actions; -use crate::ecs::component::Component; -use crate::ecs::entity::obtainer::Obtainer as EntityObtainer; -use crate::ecs::event::component::{Added, Changed, EventMatchExt, Removed}; -use crate::ecs::pair::{ChildOf, Pair}; -use crate::ecs::phase::{Phase, UPDATE as UPDATE_PHASE}; -use crate::ecs::sole::Single; -use crate::ecs::system::observer::Observe; -use crate::ecs::uid::Uid; -use crate::ecs::{Query, Sole, declare_entity}; use raw_window_handle::{DisplayHandle, HandleError, HasDisplayHandle, WindowHandle}; use winit::application::ApplicationHandler; use winit::dpi::PhysicalPosition; @@ -33,6 +23,16 @@ use winit::keyboard::PhysicalKey; use winit::window::{Window as WinitWindow, WindowId as WinitWindowId}; use crate::data_types::dimens::Dimens; +use crate::ecs::actions::Actions; +use crate::ecs::component::Component; +use crate::ecs::entity::obtainer::Obtainer as EntityObtainer; +use crate::ecs::event::component::{Added, Changed, EventMatchExt, Removed}; +use crate::ecs::pair::{ChildOf, Pair}; +use crate::ecs::phase::{Phase, UPDATE as UPDATE_PHASE}; +use crate::ecs::sole::Single; +use crate::ecs::system::observer::Observe; +use crate::ecs::uid::Uid; +use crate::ecs::{declare_entity, Query, Sole}; use crate::util::MapVec; use crate::vector::Vec2; use crate::windowing::keyboard::{Key, KeyState, Keyboard, UnknownKeyCodeError}; diff --git a/engine/src/windowing/window.rs b/engine/src/windowing/window.rs index 72c6342..817ea3c 100644 --- a/engine/src/windowing/window.rs +++ b/engine/src/windowing/window.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use crate::ecs::Component; - use crate::data_types::dimens::Dimens; +use crate::ecs::Component; pub mod platform; diff --git a/engine/src/work_queue.rs b/engine/src/work_queue.rs index 48cb2ff..a2b7db9 100644 --- a/engine/src/work_queue.rs +++ b/engine/src/work_queue.rs @@ -1,5 +1,5 @@ use std::marker::PhantomData; -use std::sync::mpsc::{Sender as MpscSender, channel as mpsc_channel}; +use std::sync::mpsc::{channel as mpsc_channel, Sender as MpscSender}; use std::thread::{Builder as ThreadBuilder, JoinHandle as ThreadJoinHandle}; pub struct Work<UserData: Send + Sync + 'static> |
