this is very cool but it won't work because mouse timestamps will be identical while paused

src/main.rs

@@ -7,9 +7,11 @@ use instruction::{TimedInstruction, InstructionConsumer};
 mod bvh;
 mod aabb;
 mod model;
+mod timers;
 mod zeroes;
 mod worker;
 mod physics;
+mod settings;
 mod framework;
 mod primitives;
 mod instruction;
@@ -64,10 +66,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 +79,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 +112,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 +415,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());
@@ -752,7 +756,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 +795,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 +814,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 +837,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 +899,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 +919,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 +963,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 +1054,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,21 +33,22 @@ 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,
+	SetPaused(bool),
 	Idle,
 		//Idle: there were no input events, but the simulation is safe to advance to this timestep
 		//for interpolation / networking / playback reasons, most playback heads will always want
 		//to be 1 instruction ahead to generate the next state for interpolation.
 }
-#[derive(Clone)]
+#[derive(Clone,Debug)]
 pub struct Body {
 	position: glam::Vec3,//I64 where 2^32 = 1 u
 	velocity: glam::Vec3,//I64 where 2^32 = 1 u/s
@@ -175,7 +176,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
 		}
 	}
@@ -453,6 +454,7 @@ impl PhysicsState {
 	pub fn into_worker(mut self)->crate::worker::CompatWorker<TimedInstruction<InputInstruction>,PhysicsOutputState,Box<dyn FnMut(TimedInstruction<InputInstruction>)->PhysicsOutputState>>{
 		let mut mouse_blocking=true;
 		let mut last_mouse_time=self.next_mouse.time;
+		let mut simulation_timer=crate::timers::UnscaledTimer::unpaused();
 		let mut timeline=std::collections::VecDeque::new();
 		crate::worker::CompatWorker::new(self.output(),Box::new(move |ins:TimedInstruction<InputInstruction>|{
 			if if let Some(phys_input)=match ins.instruction{
@@ -460,17 +462,17 @@ impl PhysicsState {
 					if mouse_blocking{
 						//tell the game state which is living in the past about its future
 						timeline.push_front(TimedInstruction{
-							time:last_mouse_time,
+							time:simulation_timer.time(last_mouse_time),
 							instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:m}),
 						});
 					}else{
 						//mouse has just started moving again after being still for longer than 10ms.
 						//replace the entire mouse interpolation state to avoid an intermediate state with identical m0.t m1.t timestamps which will divide by zero
 						timeline.push_front(TimedInstruction{
-							time:last_mouse_time,
+							time:simulation_timer.time(last_mouse_time),
 							instruction:PhysicsInputInstruction::ReplaceMouse(
-								MouseState{time:last_mouse_time,pos:self.next_mouse.pos},
-								MouseState{time:ins.time,pos:m}
+								MouseState{time:simulation_timer.time(last_mouse_time),pos:self.next_mouse.pos},
+								MouseState{time:simulation_timer.time(ins.time),pos:m}
 							),
 						});
 						//delay physics execution until we have an interpolation target
@@ -479,6 +481,14 @@ impl PhysicsState {
 					last_mouse_time=ins.time;
 					None
 				},
+				InputInstruction::SetPaused(s)=>{
+					if s{
+						simulation_timer.pause(ins.time);
+					}else{
+						simulation_timer.unpause(ins.time);
+					}
+					Some(PhysicsInputInstruction::Idle)
+				}
 				InputInstruction::MoveForward(s)=>Some(PhysicsInputInstruction::SetMoveForward(s)),
 				InputInstruction::MoveLeft(s)=>Some(PhysicsInputInstruction::SetMoveLeft(s)),
 				InputInstruction::MoveBack(s)=>Some(PhysicsInputInstruction::SetMoveBack(s)),
@@ -492,7 +502,7 @@ impl PhysicsState {
 			}{
 				//non-mouse event
 				timeline.push_back(TimedInstruction{
-					time:ins.time,
+					time:simulation_timer.time(ins.time),
 					instruction:phys_input,
 				});
 				
@@ -504,7 +514,7 @@ impl PhysicsState {
 					if 10_000_000<ins.time-self.next_mouse.time{
 						//push an event to extrapolate no movement from
 						timeline.push_front(TimedInstruction{
-							time:last_mouse_time,
+							time:simulation_timer.time(last_mouse_time),
 							instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:self.next_mouse.pos}),
 						});
 						last_mouse_time=ins.time;
@@ -526,9 +536,10 @@ impl PhysicsState {
 			}{
 				//empty queue
 				while let Some(instruction)=timeline.pop_front(){
-					self.run(instruction.time);
+					let simulation_time=simulation_timer.time(instruction.time);
+					self.run(simulation_time);
 					self.process_instruction(TimedInstruction{
-						time:instruction.time,
+						time:simulation_time,
 						instruction:PhysicsInstruction::Input(instruction.instruction),
 					});
 				}
@@ -617,6 +628,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)

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/timers.rs

@@ -0,0 +1,237 @@
+type TIME=crate::physics::TIME;
+
+#[derive(Clone)]
+pub struct Timescale{
+	num:i64,
+	den:std::num::NonZeroU64,
+}
+
+#[derive(Clone)]
+pub struct Paused{}
+#[derive(Clone)]
+pub struct Unpaused{}
+#[derive(Clone)]
+pub struct PausedScaled{scale:Timescale}
+#[derive(Clone)]
+pub struct UnpausedScaled{scale:Timescale}
+
+pub trait TimerState{}
+impl TimerState for Paused{}
+impl TimerState for Unpaused{}
+impl TimerState for PausedScaled{}
+impl TimerState for UnpausedScaled{}
+
+pub trait IsPaused{}
+impl IsPaused for Paused{}
+impl IsPaused for PausedScaled{}
+
+pub trait IsUnpaused{}
+impl IsUnpaused for Unpaused{}
+impl IsUnpaused for UnpausedScaled{}
+
+pub trait IsScaled{}
+impl IsScaled for PausedScaled{}
+impl IsScaled for UnpausedScaled{}
+
+pub trait IsUnscaled{}
+impl IsUnscaled for Paused{}
+impl IsUnscaled for Unpaused{}
+
+//scaled timer wrapper
+enum Scaled{
+	Paused(Timer<PausedScaled>),
+	Unpaused(Timer<UnpausedScaled>),
+}
+pub struct ScaledTimer{
+	timer:Scaled,
+}
+impl ScaledTimer{
+	pub fn unpaused()->Self{
+		Self{
+			timer:Scaled::Unpaused(unpaused_scaled(Timescale{num:1,den:std::num::NonZeroU64::new(1).unwrap()}))
+		}
+	}
+	pub fn time(&self,time:TIME)->TIME{
+		match &self.timer{
+			Scaled::Paused(timer)=>timer.time(),
+			Scaled::Unpaused(timer)=>timer.time(time),
+		}
+	}
+	pub fn pause(&mut self,time:TIME){
+		match &self.timer{
+			Scaled::Paused(_)=>(),
+			Scaled::Unpaused(timer)=>self.timer=Scaled::Paused(timer.clone().pause(time)),
+		};
+	}
+	pub fn unpause(&mut self,time:TIME){
+		match &self.timer{
+			Scaled::Paused(timer)=>self.timer=Scaled::Unpaused(timer.clone().unpause(time)),
+			Scaled::Unpaused(_)=>(),
+		};
+	}
+}
+
+//unscaled timer wrapper
+enum Unscaled{
+	Paused(Timer<Paused>),
+	Unpaused(Timer<Unpaused>),
+}
+pub struct UnscaledTimer{
+	timer:Unscaled,
+}
+
+impl UnscaledTimer{
+	pub fn unpaused()->Self{
+		Self{
+			timer:Unscaled::Unpaused(unpaused())
+		}
+	}
+	pub fn time(&self,time:TIME)->TIME{
+		match &self.timer{
+			Unscaled::Paused(timer)=>timer.time(),
+			Unscaled::Unpaused(timer)=>timer.time(time),
+		}
+	}
+	pub fn pause(&mut self,time:TIME){
+		match &self.timer{
+			Unscaled::Paused(_)=>(),
+			Unscaled::Unpaused(timer)=>self.timer=Unscaled::Paused(timer.clone().pause(time)),
+		};
+	}
+	pub fn unpause(&mut self,time:TIME){
+		match &self.timer{
+			Unscaled::Paused(timer)=>self.timer=Unscaled::Unpaused(timer.clone().unpause(time)),
+			Unscaled::Unpaused(_)=>(),
+		};
+	}
+}
+
+#[derive(Clone)]
+pub struct Timer<State:TimerState>{
+	offset:crate::physics::TIME,
+	state:State,
+}
+
+fn get_offset(time:TIME,write_time:TIME)->TIME{
+	write_time-time
+}
+fn get_offset_scaled(time:TIME,write_time:TIME,scale:&Timescale)->TIME{
+	write_time-time*scale.num/scale.den.get() as i64
+}
+
+fn paused()->Timer<Paused>{
+	Timer{
+		offset:0,
+		state:Paused{},
+	}
+}
+fn unpaused()->Timer<Unpaused>{
+	Timer{
+		offset:0,
+		state:Unpaused{},
+	}
+}
+fn paused_scaled(scale:Timescale)->Timer<PausedScaled>{
+	Timer{
+		offset:0,
+		state:PausedScaled{scale},
+	}
+}
+fn unpaused_scaled(scale:Timescale)->Timer<UnpausedScaled>{
+	Timer{
+		offset:0,
+		state:UnpausedScaled{scale},
+	}
+}
+impl Timer<Paused>{
+	pub fn time(&self)->TIME{
+		self.offset
+	}
+	pub fn unpause(self,time:TIME)->Timer<Unpaused>{
+		Timer{
+			offset:get_offset(time,self.time()),
+			state:Unpaused{},
+		}
+	}
+	pub fn set_time(&mut self,time:TIME,write_time:TIME){
+		self.offset=get_offset(time,write_time);
+	}
+	pub fn set_scale(self,time:TIME,scale:Timescale)->Timer<PausedScaled>{
+		Timer{
+			offset:get_offset_scaled(time,self.time(),&scale),
+			state:PausedScaled{scale},
+		}
+	}
+}
+impl Timer<Unpaused>{
+	pub fn time(&self,time:TIME)->TIME{
+		self.offset+time
+	}
+	pub fn pause(self,time:TIME)->Timer<Paused>{
+		Timer{
+			offset:self.time(time),
+			state:Paused{},
+		}
+	}
+	pub fn set_time(&mut self,time:TIME,write_time:TIME){
+		self.offset=get_offset(time,write_time);
+	}
+	pub fn set_scale(self,time:TIME,scale:Timescale)->Timer<UnpausedScaled>{
+		Timer{
+			offset:get_offset_scaled(time,self.time(time),&scale),
+			state:UnpausedScaled{scale},
+		}
+	}
+}
+impl Timer<PausedScaled>{
+	pub fn time(&self)->TIME{
+		self.offset
+	}
+	pub fn unpause(self,time:TIME)->Timer<UnpausedScaled>{
+		Timer{
+			offset:get_offset_scaled(time,self.time(),&self.state.scale),
+			state:UnpausedScaled{scale:self.state.scale},
+		}
+	}
+	pub fn set_time(&mut self,time:TIME,write_time:TIME){
+		self.offset=get_offset_scaled(time,write_time,&self.state.scale);
+	}
+	pub fn set_scale(self,time:TIME,scale:Timescale)->Timer<PausedScaled>{
+		Timer{
+			offset:get_offset_scaled(time,self.time(),&scale),
+			state:PausedScaled{scale},
+		}
+	}
+}
+impl Timer<UnpausedScaled>{
+	pub fn time(&self,time:TIME)->TIME{
+		self.offset+time*self.state.scale.num/self.state.scale.den.get() as i64
+	}
+	pub fn pause(self,time:TIME)->Timer<PausedScaled>{
+		Timer{
+			offset:self.time(time),
+			state:PausedScaled{scale:self.state.scale},
+		}
+	}
+	pub fn set_time(&mut self,time:TIME,write_time:TIME){
+		self.offset=get_offset_scaled(time,write_time,&self.state.scale);
+	}
+	pub fn set_scale(self,time:TIME,scale:Timescale)->Timer<UnpausedScaled>{
+		Timer{
+			offset:get_offset_scaled(time,self.time(time),&scale),
+			//self.offset+time*self.state.scale.num/self.state.scale.den.get() as i64-time*scale.num/scale.den.get() as i64
+			state:UnpausedScaled{scale},
+		}
+	}
+}
+
+#[test]
+fn test_timer_unscaled(){
+	const ONE_SECOND:TIME=1_000_000_000;
+	let run_prepare=paused();
+
+	let run_start=run_prepare.unpause(ONE_SECOND);
+	let run_finish=run_start.pause(11*ONE_SECOND);
+
+	assert_eq!(run_finish.time(),10*ONE_SECOND);
+}