diff --git a/engine/graphics/src/graphics.rs b/engine/graphics/src/graphics.rs index d0fe79e4..cd5ce33e 100644 --- a/engine/graphics/src/graphics.rs +++ b/engine/graphics/src/graphics.rs @@ -94,7 +94,7 @@ impl GraphicsCamera{ raw } } -impl std::default::Default for GraphicsCamera{ +impl Default for GraphicsCamera{ fn default()->Self{ Self{ screen_size:glam::UVec2::ONE, @@ -167,7 +167,7 @@ impl GraphicsState{ } pub fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,map:&map::CompleteMap){ //generate texture view per texture - let texture_views:HashMap=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{ + let texture_views:HashMap=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{ let texture_id=model::TextureId::new(texture_id as u32); let image=match ddsfile::Dds::read(std::io::Cursor::new(texture_data)){ Ok(image)=>image, @@ -803,7 +803,7 @@ impl GraphicsState{ module:&shader, entry_point:Some("vs_entity_texture"), buffers:&[wgpu::VertexBufferLayout{ - array_stride:std::mem::size_of::() as wgpu::BufferAddress, + array_stride:size_of::() as wgpu::BufferAddress, step_mode:wgpu::VertexStepMode::Vertex, attributes:&wgpu::vertex_attr_array![0=>Float32x3,1=>Float32x2,2=>Float32x3,3=>Float32x4], }], diff --git a/engine/physics/src/model.rs b/engine/physics/src/model.rs index 17b12e91..2c0d7e8f 100644 --- a/engine/physics/src/model.rs +++ b/engine/physics/src/model.rs @@ -500,7 +500,7 @@ impl TransformedMesh<'_>{ transform, } } - pub fn verts<'a>(&'a self)->impl Iterator>>+'a{ + pub fn verts<'a>(&'a self)->impl Iterator>>+'a{ self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos)) } fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{ diff --git a/engine/physics/src/physics.rs b/engine/physics/src/physics.rs index 3a469e3f..1c28e341 100644 --- a/engine/physics/src/physics.rs +++ b/engine/physics/src/physics.rs @@ -36,7 +36,7 @@ pub enum InternalInstruction{ pub struct InputState{ mouse:MouseState, next_mouse:MouseState, - controls:strafesnet_common::controls_bitflag::Controls, + controls:Controls, } impl InputState{ fn set_next_mouse(&mut self,next_mouse:MouseState){ @@ -302,7 +302,7 @@ impl PhysicsCamera{ } } -impl std::default::Default for PhysicsCamera{ +impl Default for PhysicsCamera{ fn default()->Self{ Self{ sensitivity:Ratio64Vec2::ONE*200_000, @@ -385,7 +385,7 @@ mod gameplay{ self.unordered_checkpoints.clear(); } } - impl std::default::Default for ModeState{ + impl Default for ModeState{ fn default()->Self{ Self{ mode_id:gameplay_modes::ModeId::MAIN, @@ -1928,7 +1928,7 @@ mod test{ fn test_collision_rotated(relative_body:Body,expected_collision_time:Option