the macroer (we were so close to greatness)

Cargo.lock

@@ -538,6 +538,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "flate2"
 version = "1.0.27"
@@ -617,6 +623,15 @@ dependencies = [
  "waker-fn",
 ]
 
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -762,6 +777,16 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "include_wgsl"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57ac28436974a64aef47cbf8453e8f1a558b779177fe50b7e3c3774e2cb9ba47"
+dependencies = [
+ "naga 0.7.3",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -1013,6 +1038,24 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "naga"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806f448a7ce662ca79ef5484ef8f451a9b7c51b8166c95f5a667228b3825a6ca"
+dependencies = [
+ "bit-set",
+ "bitflags 1.3.2",
+ "codespan-reporting",
+ "fxhash",
+ "hexf-parse",
+ "indexmap 1.9.3",
+ "log",
+ "num-traits 0.2.16",
+ "spirv",
+ "thiserror",
+]
+
 [[package]]
 name = "naga"
 version = "0.13.0"
@@ -1026,6 +1069,7 @@ dependencies = [
  "indexmap 1.9.3",
  "log",
  "num-traits 0.2.16",
+ "petgraph",
  "rustc-hash",
  "spirv",
  "termcolor",
@@ -1282,6 +1326,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
+[[package]]
+name = "petgraph"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.0.0",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -1696,6 +1750,7 @@ dependencies = [
  "ddsfile",
  "env_logger",
  "glam",
+ "include_wgsl",
  "lazy-regex",
  "log",
  "obj",
@@ -2027,7 +2082,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "log",
- "naga",
+ "naga 0.13.0",
  "parking_lot",
  "profiling",
  "raw-window-handle",
@@ -2052,7 +2107,7 @@ dependencies = [
  "bitflags 2.4.0",
  "codespan-reporting",
  "log",
- "naga",
+ "naga 0.13.0",
  "parking_lot",
  "profiling",
  "raw-window-handle",
@@ -2089,7 +2144,7 @@ dependencies = [
  "libloading 0.8.0",
  "log",
  "metal",
- "naga",
+ "naga 0.13.0",
  "objc",
  "parking_lot",
  "profiling",

Cargo.toml

@@ -12,6 +12,7 @@ configparser = "3.0.2"
 ddsfile = "0.5.1"
 env_logger = "0.10.0"
 glam = "0.24.1"
+include_wgsl = { version = "1.1.1", features = ["spv-out"] }
 lazy-regex = "3.0.2"
 log = "0.4.20"
 obj = "0.10.2"
@@ -21,7 +22,7 @@ rbx_binary = "0.7.1"
 rbx_dom_weak = "2.5.0"
 rbx_reflection_database = "0.2.7"
 rbx_xml = "0.13.1"
-wgpu = "0.17.0"
+wgpu = { version = "0.17.0", features = ["spirv"] }
 winit = "0.28.6"
 
 #[profile.release]

src/main.rs

@@ -10,6 +10,7 @@ mod model;
 mod zeroes;
 mod worker;
 mod physics;
+mod settings;
 mod framework;
 mod primitives;
 mod instruction;
@@ -64,10 +65,10 @@ fn perspective_rh(fov_x_slope: f32, fov_y_slope: f32, z_near: f32, z_far: f32) -
 	)
 }
 impl GraphicsCamera{
-	pub fn new(screen_size:glam::UVec2,fov_y:f32)->Self{
+	pub fn new(screen_size:glam::UVec2,fov:glam::Vec2)->Self{
 		Self{
 			screen_size,
-			fov: glam::vec2(fov_y*(screen_size.x as f32)/(screen_size.y as f32),fov_y),
+			fov,
 		}
 	}
 	pub fn proj(&self)->glam::Mat4{
@@ -77,10 +78,6 @@ impl GraphicsCamera{
 		//f32 good enough for view matrix
 		glam::Mat4::from_translation(pos) * glam::Mat4::from_euler(glam::EulerRot::YXZ, angles.x, angles.y, 0f32)
 	}
-	pub fn set_screen_size(&mut self,screen_size:glam::UVec2){
-		self.screen_size=screen_size;
-		self.fov.x=self.fov.y*(screen_size.x as f32)/(screen_size.y as f32);
-	}
 
 	pub fn to_uniform_data(&self,(pos,angles): (glam::Vec3,glam::Vec2)) -> [f32; 16 * 4] {
 		let proj=self.proj();
@@ -114,12 +111,16 @@ impl GraphicsState{
 	pub fn clear(&mut self){
 		self.models.clear();
 	}
+	pub fn load_user_settings(&mut self,user_settings:&settings::UserSettings){
+		self.camera.fov=user_settings.calculate_fov(1.0,&self.camera.screen_size).as_vec2();
+	}
 }
 
 pub struct GlobalState{
 	start_time: std::time::Instant,
 	manual_mouse_lock:bool,
 	mouse:physics::MouseState,
+	user_settings:settings::UserSettings,
 	graphics:GraphicsState,
 	physics_thread:worker::CompatWorker<TimedInstruction<InputInstruction>,physics::PhysicsOutputState,Box<dyn FnMut(TimedInstruction<InputInstruction>)->physics::PhysicsOutputState>>,
 }
@@ -413,6 +414,8 @@ impl framework::Example for GlobalState {
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	) -> Self {
+		//wee
+		let user_settings=settings::read_user_settings();
 		let mut indexed_models = Vec::new();
 		indexed_models.append(&mut model::generate_indexed_model_list_from_obj(obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap(),*glam::Vec4::ONE.as_ref()));
 		indexed_models.push(primitives::unit_sphere());
@@ -553,7 +556,7 @@ impl framework::Example for GlobalState {
 		// Create the render pipeline
 		let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
 			label: None,
-			source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
+			source: wgpu::ShaderSource::SpirV(Cow::Borrowed(include_wgsl_to_spv!("shader.wgsl"))),
 		});
 
 		//load textures
@@ -752,7 +755,11 @@ impl framework::Example for GlobalState {
 
 		let mut physics = physics::PhysicsState::default();
 
-		let camera=GraphicsCamera::new(glam::uvec2(config.width,config.height), 1.0);
+		physics.load_user_settings(&user_settings);
+
+		let screen_size=glam::uvec2(config.width,config.height);
+
+		let camera=GraphicsCamera::new(screen_size,user_settings.calculate_fov(1.0,&screen_size).as_vec2());
 		let camera_uniforms = camera.to_uniform_data(physics.output().adjust_mouse(&physics.next_mouse));
 		let camera_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
 			label: Some("Camera"),
@@ -787,7 +794,7 @@ impl framework::Example for GlobalState {
 
 		let depth_view = Self::create_depth_texture(config, device);
 
-		let graphics=GraphicsState {
+		let mut graphics=GraphicsState {
 			pipelines:GraphicsPipelines{
 				skybox:sky_pipeline,
 				model:model_pipeline
@@ -806,6 +813,8 @@ impl framework::Example for GlobalState {
 			temp_squid_texture_view: squid_texture_view,
 		};
 
+		graphics.load_user_settings(&user_settings);
+
 		let indexed_model_instances=model::IndexedModelInstances{
 			textures:Vec::new(),
 			models:indexed_models,
@@ -827,6 +836,7 @@ impl framework::Example for GlobalState {
 			start_time:Instant::now(),
 			manual_mouse_lock:false,
 			mouse:physics::MouseState::default(),
+			user_settings,
 			graphics,
 			physics_thread,
 		};
@@ -888,9 +898,11 @@ impl framework::Example for GlobalState {
 						time:physics.time,
 						instruction: PhysicsInstruction::Input(physics::PhysicsInputInstruction::Reset),
 					});
+					physics.load_user_settings(&self.user_settings);
 					physics.generate_models(&indexed_model_instances);
 					self.physics_thread=physics.into_worker();
 
+					//graphics.load_user_settings(&self.user_settings);
 					self.generate_model_graphics(device,queue,indexed_model_instances);
 					//manual reset
 				}else{
@@ -906,51 +918,23 @@ impl framework::Example for GlobalState {
 
 	#[allow(clippy::single_match)]
 	fn update(&mut self, window: &winit::window::Window, device: &wgpu::Device, queue: &wgpu::Queue, event: winit::event::WindowEvent) {
+		let time=self.start_time.elapsed().as_nanos() as i64;
 		match event {
 			winit::event::WindowEvent::DroppedFile(path) => self.load_file(path,device,queue),
 			winit::event::WindowEvent::Focused(state)=>{
 				//pause unpause
 				//recalculate pressed keys on focus
-			}
-			_=>(),
-		}
-	}
-
-	fn device_event(&mut self, window: &winit::window::Window, event: winit::event::DeviceEvent) {
-		//there's no way this is the best way get a timestamp.
-		let time=self.start_time.elapsed().as_nanos() as i64;
-		match event {
-			winit::event::DeviceEvent::Key(winit::event::KeyboardInput {
-				state,
-				scancode: keycode,
+			},
+			winit::event::WindowEvent::KeyboardInput {
+				input:winit::event::KeyboardInput{state, virtual_keycode,..},
 				..
-			}) => {
+			}=>{
 				let s=match state {
 					winit::event::ElementState::Pressed => true,
 					winit::event::ElementState::Released => false,
 				};
-				if let Some(input_instruction)=match keycode {
-					17=>Some(InputInstruction::MoveForward(s)),//W
-					30=>Some(InputInstruction::MoveLeft(s)),//A
-					31=>Some(InputInstruction::MoveBack(s)),//S
-					32=>Some(InputInstruction::MoveRight(s)),//D
-					18=>Some(InputInstruction::MoveUp(s)),//E
-					16=>Some(InputInstruction::MoveDown(s)),//Q
-					57=>Some(InputInstruction::Jump(s)),//Space
-					44=>Some(InputInstruction::Zoom(s)),//Z
-					19=>if s{Some(InputInstruction::Reset)}else{None},//R
-					01=>{//Esc
-						if s{
-							self.manual_mouse_lock=false;
-							match window.set_cursor_grab(winit::window::CursorGrabMode::None){
-								Ok(())=>(),
-								Err(e)=>println!("Could not release cursor: {:?}",e),
-							}
-							window.set_cursor_visible(true);
-						}
-						None
-					},
-					15=>{//Tab
+				match virtual_keycode{
+					Some(winit::event::VirtualKeyCode::Tab)=>{
 						if s{
 							self.manual_mouse_lock=false;
 							match window.set_cursor_position(winit::dpi::PhysicalPosition::new(self.graphics.camera.screen_size.x as f32/2.0, self.graphics.camera.screen_size.y as f32/2.0)){
@@ -978,16 +962,56 @@ impl framework::Example for GlobalState {
 							}
 						}
 						window.set_cursor_visible(s);
-						None
 					},
-					_ => {println!("scancode {}",keycode);None},
-				}{
-					self.physics_thread.send(TimedInstruction{
-						time,
-						instruction:input_instruction,
-					}).unwrap();
+					Some(winit::event::VirtualKeyCode::F11)=>{
+						if s{
+							if window.fullscreen().is_some(){
+								window.set_fullscreen(None);
+							}else{
+								window.set_fullscreen(Some(winit::window::Fullscreen::Borderless(None)));
+							}
+						}
+					},
+					Some(winit::event::VirtualKeyCode::Escape)=>{
+						if s{
+							self.manual_mouse_lock=false;
+							match window.set_cursor_grab(winit::window::CursorGrabMode::None){
+								Ok(())=>(),
+								Err(e)=>println!("Could not release cursor: {:?}",e),
+							}
+							window.set_cursor_visible(true);
+						}
+					},
+					Some(keycode)=>{
+						if let Some(input_instruction)=match keycode {
+							winit::event::VirtualKeyCode::W => Some(InputInstruction::MoveForward(s)),
+							winit::event::VirtualKeyCode::A => Some(InputInstruction::MoveLeft(s)),
+							winit::event::VirtualKeyCode::S => Some(InputInstruction::MoveBack(s)),
+							winit::event::VirtualKeyCode::D => Some(InputInstruction::MoveRight(s)),
+							winit::event::VirtualKeyCode::E => Some(InputInstruction::MoveUp(s)),
+							winit::event::VirtualKeyCode::Q => Some(InputInstruction::MoveDown(s)),
+							winit::event::VirtualKeyCode::Space => Some(InputInstruction::Jump(s)),
+							winit::event::VirtualKeyCode::Z => Some(InputInstruction::Zoom(s)),
+							winit::event::VirtualKeyCode::R => if s{Some(InputInstruction::Reset)}else{None},
+							_ => None,
+						}{
+							self.physics_thread.send(TimedInstruction{
+								time,
+								instruction:input_instruction,
+							}).unwrap();
+						}
+					},
+					_=>(),
 				}
 			},
+			_=>(),
+		}
+	}
+
+	fn device_event(&mut self, window: &winit::window::Window, event: winit::event::DeviceEvent) {
+		//there's no way this is the best way get a timestamp.
+		let time=self.start_time.elapsed().as_nanos() as i64;
+		match event {
 			winit::event::DeviceEvent::MouseMotion {
 			    delta,//these (f64,f64) are integers on my machine
 			} => {
@@ -1029,7 +1053,8 @@ impl framework::Example for GlobalState {
 		_queue: &wgpu::Queue,
 	) {
 		self.graphics.depth_view = Self::create_depth_texture(config, device);
-		self.graphics.camera.set_screen_size(glam::uvec2(config.width, config.height));
+		self.graphics.camera.screen_size=glam::uvec2(config.width, config.height);
+		self.graphics.load_user_settings(&self.user_settings);
 	}
 
 	fn render(

src/physics.rs

@@ -19,12 +19,12 @@ pub enum PhysicsInstruction {
 pub enum PhysicsInputInstruction {
 	ReplaceMouse(MouseState,MouseState),
 	SetNextMouse(MouseState),
-	SetMoveForward(bool),
-	SetMoveLeft(bool),
-	SetMoveBack(bool),
 	SetMoveRight(bool),
 	SetMoveUp(bool),
+	SetMoveBack(bool),
+	SetMoveLeft(bool),
 	SetMoveDown(bool),
+	SetMoveForward(bool),
 	SetJump(bool),
 	SetZoom(bool),
 	Reset,
@@ -33,12 +33,12 @@ pub enum PhysicsInputInstruction {
 #[derive(Debug)]
 pub enum InputInstruction {
 	MoveMouse(glam::IVec2),
-	MoveForward(bool),
-	MoveLeft(bool),
-	MoveBack(bool),
 	MoveRight(bool),
 	MoveUp(bool),
+	MoveBack(bool),
+	MoveLeft(bool),
 	MoveDown(bool),
+	MoveForward(bool),
 	Jump(bool),
 	Zoom(bool),
 	Reset,
@@ -175,7 +175,7 @@ impl PhysicsCamera {
 		Self{
 			offset,
 			angles: glam::DVec2::ZERO,
-			sensitivity: glam::dvec2(1.0/16384.0,1.0/16384.0),
+			sensitivity: glam::dvec2(1.0/1024.0,1.0/1024.0),
 			mouse:MouseState{pos:glam::IVec2::ZERO,time:-1},//escape initialization hell divide by zero
 		}
 	}
@@ -617,6 +617,10 @@ impl PhysicsState {
 		println!("Physics Objects: {}",self.models.len());
 	}
 
+	pub fn load_user_settings(&mut self,user_settings:&crate::settings::UserSettings){
+		self.camera.sensitivity=user_settings.calculate_sensitivity();
+	}
+
 	pub fn get_mode(&self,mode_id:u32)->Option<&crate::model::ModeDescription>{
 		if let Some(&mode)=self.mode_from_mode_id.get(&mode_id){
 			self.modes.get(mode)
@@ -909,7 +913,7 @@ impl PhysicsState {
 	fn predict_collision_start(&self,time:TIME,time_limit:TIME,model_id:u32) -> Option<TimedInstruction<PhysicsInstruction>> {
 		let mesh0=self.mesh();
 		let mesh1=self.models.get(model_id as usize).unwrap().mesh();
-		let (p,v,a,time)=(self.body.position,self.body.velocity,self.body.acceleration,self.body.time);
+		let (p,v,a,body_time)=(self.body.position,self.body.velocity,self.body.acceleration,self.body.time);
 		//find best t
 		let mut best_time=time_limit;
 		let mut best_face:Option<TreyMeshFace>=None;
@@ -918,7 +922,7 @@ impl PhysicsState {
 			//must collide now or in the future
 			//must beat the current soonest collision time
 			//must be moving towards surface
-			let t_time=time+((t as f64)*1_000_000_000f64) as TIME;
+			let t_time=body_time+((t as f64)*1_000_000_000f64) as TIME;
 			if time<=t_time&&t_time<best_time&&0f32<v.x+a.x*t{
 				let dp=self.body.extrapolated_position(t_time)-p;
 				//faces must be overlapping
@@ -934,7 +938,7 @@ impl PhysicsState {
 			//must collide now or in the future
 			//must beat the current soonest collision time
 			//must be moving towards surface
-			let t_time=time+((t as f64)*1_000_000_000f64) as TIME;
+			let t_time=body_time+((t as f64)*1_000_000_000f64) as TIME;
 			if time<=t_time&&t_time<best_time&&v.x+a.x*t<0f32{
 				let dp=self.body.extrapolated_position(t_time)-p;
 				//faces must be overlapping
@@ -951,7 +955,7 @@ impl PhysicsState {
 			//must collide now or in the future
 			//must beat the current soonest collision time
 			//must be moving towards surface
-			let t_time=time+((t as f64)*1_000_000_000f64) as TIME;
+			let t_time=body_time+((t as f64)*1_000_000_000f64) as TIME;
 			if time<=t_time&&t_time<best_time&&0f32<v.y+a.y*t{
 				let dp=self.body.extrapolated_position(t_time)-p;
 				//faces must be overlapping
@@ -967,7 +971,7 @@ impl PhysicsState {
 			//must collide now or in the future
 			//must beat the current soonest collision time
 			//must be moving towards surface
-			let t_time=time+((t as f64)*1_000_000_000f64) as TIME;
+			let t_time=body_time+((t as f64)*1_000_000_000f64) as TIME;
 			if time<=t_time&&t_time<best_time&&v.y+a.y*t<0f32{
 				let dp=self.body.extrapolated_position(t_time)-p;
 				//faces must be overlapping
@@ -984,7 +988,7 @@ impl PhysicsState {
 			//must collide now or in the future
 			//must beat the current soonest collision time
 			//must be moving towards surface
-			let t_time=time+((t as f64)*1_000_000_000f64) as TIME;
+			let t_time=body_time+((t as f64)*1_000_000_000f64) as TIME;
 			if time<=t_time&&t_time<best_time&&0f32<v.z+a.z*t{
 				let dp=self.body.extrapolated_position(t_time)-p;
 				//faces must be overlapping
@@ -1000,7 +1004,7 @@ impl PhysicsState {
 			//must collide now or in the future
 			//must beat the current soonest collision time
 			//must be moving towards surface
-			let t_time=time+((t as f64)*1_000_000_000f64) as TIME;
+			let t_time=body_time+((t as f64)*1_000_000_000f64) as TIME;
 			if time<=t_time&&t_time<best_time&&v.z+a.z*t<0f32{
 				let dp=self.body.extrapolated_position(t_time)-p;
 				//faces must be overlapping

src/settings.rs

@@ -0,0 +1,123 @@
+struct Ratio{
+	ratio:f64,
+}
+enum DerivedFov{
+	FromScreenAspect,
+	FromAspect(Ratio),
+}
+enum Fov{
+	Exactly{x:f64,y:f64},
+	DeriveX{x:DerivedFov,y:f64},
+	DeriveY{x:f64,y:DerivedFov},
+}
+impl Default for Fov{
+	fn default() -> Self {
+		Fov::DeriveX{x:DerivedFov::FromScreenAspect,y:1.0}
+	}
+}
+
+enum Sensitivity{
+	Exactly{x:f64,y:f64},
+	DeriveX{x:Ratio,y:f64},
+	DeriveY{x:f64,y:Ratio},
+}
+impl Default for Sensitivity{
+	fn default() -> Self {
+		Sensitivity::DeriveY{x:0.001,y:Ratio{ratio:1.0}}
+	}
+}
+
+#[derive(Default)]
+pub struct UserSettings{
+	fov:Fov,
+	sensitivity:Sensitivity,
+}
+impl UserSettings{
+	pub fn calculate_fov(&self,zoom:f64,screen_size:&glam::UVec2)->glam::DVec2{
+		zoom*match &self.fov{
+			&Fov::Exactly{x,y}=>glam::dvec2(x,y),
+			Fov::DeriveX{x,y}=>match x{
+				DerivedFov::FromScreenAspect=>glam::dvec2(y*(screen_size.x as f64/screen_size.y as f64),*y),
+				DerivedFov::FromAspect(ratio)=>glam::dvec2(y*ratio.ratio,*y),
+			},
+			Fov::DeriveY{x,y}=>match y{
+				DerivedFov::FromScreenAspect=>glam::dvec2(*x,x*(screen_size.y as f64/screen_size.x as f64)),
+				DerivedFov::FromAspect(ratio)=>glam::dvec2(*x,x*ratio.ratio),
+			},
+		}
+	}
+	pub fn calculate_sensitivity(&self)->glam::DVec2{
+		match &self.sensitivity{
+			&Sensitivity::Exactly{x,y}=>glam::dvec2(x,y),
+			Sensitivity::DeriveX{x,y}=>glam::dvec2(y*x.ratio,*y),
+			Sensitivity::DeriveY{x,y}=>glam::dvec2(*x,x*y.ratio),
+		}
+	}
+}
+
+/*
+//sensitivity is raw input dots (i.e. dpi = dots per inch) to radians conversion factor
+sensitivity_x=0.001
+sensitivity_y_from_x_ratio=1
+Sensitivity::DeriveY{x:0.0.001,y:DerivedSensitivity{ratio:1.0}}
+*/
+
+pub fn read_user_settings()->UserSettings{
+	let mut cfg=configparser::ini::Ini::new();
+	if let Ok(_)=cfg.load("settings.conf"){
+		let (cfg_fov_x,cfg_fov_y)=(cfg.getfloat("camera","fov_x"),cfg.getfloat("camera","fov_y"));
+		let fov=match(cfg_fov_x,cfg_fov_y){
+			(Ok(Some(fov_x)),Ok(Some(fov_y)))=>Fov::Exactly {
+				x:fov_x,
+				y:fov_y
+			},
+			(Ok(Some(fov_x)),Ok(None))=>Fov::DeriveY{
+				x:fov_x,
+				y:if let Ok(Some(fov_y_from_x_ratio))=cfg.getfloat("camera","fov_y_from_x_ratio"){
+					DerivedFov::FromAspect(Ratio{ratio:fov_y_from_x_ratio})
+				}else{
+					DerivedFov::FromScreenAspect
+				}
+			},
+			(Ok(None),Ok(Some(fov_y)))=>Fov::DeriveX{
+				x:if let Ok(Some(fov_x_from_y_ratio))=cfg.getfloat("camera","fov_x_from_y_ratio"){
+					DerivedFov::FromAspect(Ratio{ratio:fov_x_from_y_ratio})
+				}else{
+					DerivedFov::FromScreenAspect
+				},
+				y:fov_y,
+			},
+			_=>{
+				Fov::default()
+			},
+		};
+		let (cfg_sensitivity_x,cfg_sensitivity_y)=(cfg.getfloat("camera","sensitivity_x"),cfg.getfloat("camera","sensitivity_y"));
+		let sensitivity=match(cfg_sensitivity_x,cfg_sensitivity_y){
+			(Ok(Some(sensitivity_x)),Ok(Some(sensitivity_y)))=>Sensitivity::Exactly {
+				x:sensitivity_x,
+				y:sensitivity_y
+			},
+			(Ok(Some(sensitivity_x)),Ok(None))=>Sensitivity::DeriveY{
+				x:sensitivity_x,
+				y:Ratio{
+					ratio:if let Ok(Some(sensitivity_y_from_x_ratio))=cfg.getfloat("camera","sensitivity_y_from_x_ratio"){sensitivity_y_from_x_ratio}else{1.0}
+				}
+			},
+			(Ok(None),Ok(Some(sensitivity_y)))=>Sensitivity::DeriveX{
+				x:Ratio{
+					ratio:if let Ok(Some(sensitivity_x_from_y_ratio))=cfg.getfloat("camera","sensitivity_x_from_y_ratio"){sensitivity_x_from_y_ratio}else{1.0}
+				},
+				y:sensitivity_y,
+			},
+			_=>{
+				Sensitivity::default()
+			},
+		};
+		UserSettings{
+			fov,
+			sensitivity,
+		}
+	}else{
+		UserSettings::default()
+	}
+}

src/worker.rs

@@ -79,7 +79,7 @@ fn test_worker() {
 	);
 
 	// Send tasks to the worker
-	for i in 0..5 {
+	for _ in 0..5 {
 		let task = crate::instruction::TimedInstruction{
 			time:0,
 			instruction:crate::physics::PhysicsInstruction::StrafeTick,