the more

Splits the MeshQuery trait into MeshQuery and MeshTopology and cleans up much of the physics traits.  A notable optimization is using a closure for iterating variable length topological lists.  Intermediate allocations are avoided in this way.

Reviewed-on: #33
Co-authored-by: Rhys Lloyd <krakow20@gmail.com>
Co-committed-by: Rhys Lloyd <krakow20@gmail.com>

Cargo.toml

@@ -35,3 +35,22 @@ unused_lifetimes = "warn"
 unused_qualifications = "warn"
 # variant_size_differences = "warn"
 unexpected_cfgs = "warn"
+
+[workspace.dependencies]
+glam = "0.31.0"
+
+# engine
+strafesnet_graphics = { path = "engine/graphics", registry = "strafesnet" }
+strafesnet_physics = { version = "0.0.1", path = "engine/physics", registry = "strafesnet" }
+strafesnet_session = { path = "engine/session", registry = "strafesnet" }
+strafesnet_settings = { path = "engine/settings", registry = "strafesnet" }
+
+# lib
+fixed_wide = { version = "0.2.2", path = "lib/fixed_wide", registry = "strafesnet" }
+linear_ops = { version = "0.1.1", path = "lib/linear_ops", registry = "strafesnet" }
+ratio_ops = { version = "0.1.0", path = "lib/ratio_ops", registry = "strafesnet" }
+strafesnet_bsp_loader = { path = "lib/bsp_loader", registry = "strafesnet" }
+strafesnet_common = { version = "0.8.3", path = "lib/common", registry = "strafesnet" }
+strafesnet_deferred_loader = { version = "0.5.1", path = "lib/deferred_loader", registry = "strafesnet" }
+strafesnet_rbx_loader = { path = "lib/rbx_loader", registry = "strafesnet" }
+strafesnet_snf = { version = "0.3.2", path = "lib/snf", registry = "strafesnet" }

engine/graphics/Cargo.toml

@@ -1,16 +1,14 @@
 [package]
 name = "strafesnet_graphics"
-version = "0.1.0"
+version = "0.0.2"
 edition = "2024"
 
 [dependencies]
 bytemuck = { version = "1.13.1", features = ["derive"] }
 ddsfile = "0.5.1"
-glam = "0.30.0"
+glam.workspace = true
 id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
-strafesnet_session = { path = "../session", registry = "strafesnet" }
-strafesnet_settings = { path = "../settings", registry = "strafesnet" }
+strafesnet_common.workspace = true
 wgpu = "28.0.0"
 
 [lints]

engine/graphics/src/graphics.rs

@@ -1,8 +1,6 @@
 use std::borrow::Cow;
 use std::collections::{HashSet,HashMap};
 use strafesnet_common::map;
-use strafesnet_settings::settings;
-use strafesnet_session::session;
 use strafesnet_common::model::{self, ColorId, NormalId, PolygonIter, PositionId, RenderConfigId, TextureCoordinateId, VertexId};
 use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
 use crate::model::{self as model_graphics,IndexedGraphicsMeshOwnedRenderConfig,IndexedGraphicsMeshOwnedRenderConfigId,GraphicsMeshOwnedRenderConfig,GraphicsModelColor4,GraphicsModelOwned,GraphicsVertex};
@@ -54,6 +52,10 @@ struct GraphicsPipelines{
 	model:wgpu::RenderPipeline,
 }
 
+pub fn view_inv(pos:glam::Vec3,angles:glam::Vec2)->glam::Mat4{
+	//f32 good enough for view matrix
+	glam::Mat4::from_mat3_translation(glam::Mat3::from_euler(glam::EulerRot::YXZ,angles.x,angles.y,0f32),pos)
+}
 struct GraphicsCamera{
 	screen_size:glam::UVec2,
 	fov:glam::Vec2,//slope
@@ -75,15 +77,10 @@ impl GraphicsCamera{
 	pub fn proj(&self)->glam::Mat4{
 		perspective_rh(self.fov.x,self.fov.y,0.4,4000.0)
 	}
-	pub fn world(&self,pos:glam::Vec3,angles:glam::Vec2)->glam::Mat4{
-		//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 to_uniform_data(&self,pos:glam::Vec3,angles:glam::Vec2)->[f32;16*4]{
+	pub fn to_uniform_data(&self,view_inv:glam::Mat4)->[f32;16*4]{
 		let proj=self.proj();
 		let proj_inv=proj.inverse();
-		let view_inv=self.world(pos,angles);
 		let view=view_inv.inverse();
 
 		let mut raw=[0f32; 16 * 4];
@@ -162,9 +159,6 @@ 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 fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,map:&map::CompleteMap){
 		//generate texture view per texture
 		let texture_views:HashMap<model::TextureId,wgpu::TextureView>=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{
@@ -634,7 +628,7 @@ impl GraphicsState{
 		// Create the render pipeline
 		let shader=device.create_shader_module(wgpu::ShaderModuleDescriptor{
 			label:None,
-			source:wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("../../../strafe-client/src/shader.wgsl"))),
+			source:wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("../shaders/shader.wgsl"))),
 		});
 
 		//load textures
@@ -662,10 +656,10 @@ impl GraphicsState{
 				wgpu::TextureFormat::Astc{
 					block:AstcBlock::B4x4,
 					channel:AstcChannel::UnormSrgb,
-				}=>&include_bytes!("../../../strafe-client/images/astc.dds")[..],
-				wgpu::TextureFormat::Etc2Rgb8UnormSrgb=>&include_bytes!("../../../strafe-client/images/etc2.dds")[..],
-				wgpu::TextureFormat::Bc1RgbaUnormSrgb=>&include_bytes!("../../../strafe-client/images/bc1.dds")[..],
-				wgpu::TextureFormat::Bgra8UnormSrgb=>&include_bytes!("../../../strafe-client/images/bgra.dds")[..],
+				}=>&include_bytes!("../images/astc.dds")[..],
+				wgpu::TextureFormat::Etc2Rgb8UnormSrgb=>&include_bytes!("../images/etc2.dds")[..],
+				wgpu::TextureFormat::Bc1RgbaUnormSrgb=>&include_bytes!("../images/bc1.dds")[..],
+				wgpu::TextureFormat::Bgra8UnormSrgb=>&include_bytes!("../images/bgra.dds")[..],
 				_=>unreachable!(),
 			};
 
@@ -708,7 +702,7 @@ impl GraphicsState{
 
 		//squid
 		let squid_texture_view={
-			let bytes=include_bytes!("../../../strafe-client/images/squid.dds");
+			let bytes=include_bytes!("../images/squid.dds");
 
 			let image=ddsfile::Dds::read(&mut std::io::Cursor::new(bytes)).unwrap();
 
@@ -833,7 +827,7 @@ impl GraphicsState{
 		});
 
 		let camera=GraphicsCamera::default();
-		let camera_uniforms=camera.to_uniform_data(glam::Vec3::ZERO,glam::Vec2::ZERO);
+		let camera_uniforms=camera.to_uniform_data(view_inv(glam::Vec3::ZERO,glam::Vec2::ZERO));
 		let camera_buf=device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
 			label:Some("Camera"),
 			contents:bytemuck::cast_slice(&camera_uniforms),
@@ -890,28 +884,25 @@ impl GraphicsState{
 		&mut self,
 		device:&wgpu::Device,
 		config:&wgpu::SurfaceConfiguration,
-		user_settings:&settings::UserSettings,
+		fov:glam::Vec2,
 	){
 		self.depth_view=Self::create_depth_texture(config,device);
 		self.camera.screen_size=glam::uvec2(config.width,config.height);
-		self.load_user_settings(user_settings);
+		self.camera.fov=fov;
 	}
 	pub fn render(
 		&mut self,
 		view:&wgpu::TextureView,
 		device:&wgpu::Device,
 		queue:&wgpu::Queue,
-		frame_state:session::FrameState,
+		camera:glam::Mat4,
 	){
 		//TODO:use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
 
 		let mut encoder=device.create_command_encoder(&wgpu::CommandEncoderDescriptor{label:None});
 
 		// update rotation
-		let camera_uniforms=self.camera.to_uniform_data(
-			frame_state.body.extrapolated_position(frame_state.time).map(Into::<f32>::into).to_array().into(),
-			frame_state.camera.simulate_move_angles(glam::IVec2::ZERO)
-		);
+		let camera_uniforms=self.camera.to_uniform_data(camera);
 		self.staging_belt
 			.write_buffer(
 				&mut encoder,

engine/graphics/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod model;
+pub mod setup;
 pub mod graphics;

engine/graphics/src/setup.rs

@@ -0,0 +1,112 @@
+fn optional_features()->wgpu::Features{
+	wgpu::Features::TEXTURE_COMPRESSION_ASTC
+	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
+}
+fn required_features()->wgpu::Features{
+	wgpu::Features::TEXTURE_COMPRESSION_BC
+}
+fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
+	wgpu::DownlevelCapabilities{
+		flags:wgpu::DownlevelFlags::empty(),
+		shader_model:wgpu::ShaderModel::Sm5,
+		..wgpu::DownlevelCapabilities::default()
+	}
+}
+
+pub mod step1{
+	pub fn create_instance()->wgpu::Instance{
+		Default::default()
+	}
+}
+
+pub mod step2{
+	pub fn create_surface<'window>(instance:&wgpu::Instance,target:impl Into<wgpu::SurfaceTarget<'window>>)->Result<wgpu::Surface<'window>,wgpu::CreateSurfaceError>{
+		instance.create_surface(target)
+	}
+}
+
+pub mod step3{
+	pub async fn pick_adapter(instance:&wgpu::Instance,surface:&wgpu::Surface<'_>)->Option<wgpu::Adapter>{
+		let backends=wgpu::Backends::from_env().unwrap_or_default();
+		//TODO: prefer adapter that implements optional features
+		//let optional_features=optional_features();
+		let required_features=super::required_features();
+		let required_downlevel_capabilities=super::required_downlevel_capabilities();
+
+		//no helper function smh gotta write it myself
+		let adapters=instance.enumerate_adapters(backends).await;
+
+		let adapter=adapters.into_iter()
+			// reverse because we want to select adapters that appear first in ties,
+			// and max_by_key selects the last equal element in the iterator.
+			.rev()
+			.filter(|adapter|
+				adapter.is_surface_supported(surface)
+				&&adapter.features().contains(required_features)
+				&&{
+					let downlevel_capabilities=adapter.get_downlevel_capabilities();
+					downlevel_capabilities.shader_model>=required_downlevel_capabilities.shader_model
+					&&downlevel_capabilities.flags.contains(required_downlevel_capabilities.flags)
+				}
+			)
+			.max_by_key(|adapter|match adapter.get_info().device_type{
+				wgpu::DeviceType::IntegratedGpu=>3,
+				wgpu::DeviceType::DiscreteGpu=>4,
+				wgpu::DeviceType::VirtualGpu=>2,
+				wgpu::DeviceType::Other|wgpu::DeviceType::Cpu=>1,
+			})?;
+
+		let adapter_info=adapter.get_info();
+		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
+
+		Some(adapter)
+	}
+}
+
+pub mod step4{
+	pub async fn request_device(adapter:&wgpu::Adapter)->(wgpu::Device,wgpu::Queue){
+		let optional_features=super::optional_features();
+		let required_features=super::required_features();
+
+		// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
+		let needed_limits=crate::graphics::required_limits().using_resolution(adapter.limits());
+
+		let (device, queue)=adapter
+			.request_device(
+				&wgpu::DeviceDescriptor{
+					label:None,
+					required_features:(optional_features&adapter.features())|required_features,
+					required_limits:needed_limits,
+					memory_hints:wgpu::MemoryHints::Performance,
+					trace:wgpu::Trace::Off,
+					experimental_features:wgpu::ExperimentalFeatures::disabled(),
+				},
+			).await
+			.expect("Unable to find a suitable GPU adapter!");
+
+		(
+			device,
+			queue,
+		)
+	}
+}
+
+pub mod step5{
+	pub fn configure_surface(
+		adapter:&wgpu::Adapter,
+		device:&wgpu::Device,
+		surface:&wgpu::Surface<'_>,
+		(width,height):(u32,u32),
+	)->wgpu::SurfaceConfiguration{
+		let mut config=surface
+			.get_default_config(adapter, width, height)
+			.expect("Surface isn't supported by the adapter.");
+
+		let surface_view_format=config.format.add_srgb_suffix();
+		config.view_formats.push(surface_view_format);
+		config.present_mode=wgpu::PresentMode::AutoNoVsync;
+		surface.configure(device,&config);
+
+		config
+	}
+}

engine/physics/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "strafesnet_physics"
-version = "0.1.0"
+version = "0.0.1"
 edition = "2024"
 
 [dependencies]
 arrayvec = "0.7.6"
-glam = "0.30.0"
+glam.workspace = true
 id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

engine/physics/src/body.rs

@@ -2,12 +2,18 @@ use strafesnet_common::aabb;
 use strafesnet_common::integer::{self,vec3,Time,Planar64,Planar64Vec3};
 #[derive(Clone,Copy,Debug,Hash)]
 pub struct Body<T>{
-	pub position:Planar64Vec3,//I64 where 2^32 = 1 u
-	pub velocity:Planar64Vec3,//I64 where 2^32 = 1 u/s
-	pub acceleration:Planar64Vec3,//I64 where 2^32 = 1 u/s/s
-	pub time:Time<T>,//nanoseconds x xxxxD!
+	pub position:Planar64Vec3,
+	pub velocity:Planar64Vec3,
+	pub time:Time<T>,
 }
-impl<T> std::ops::Neg for Body<T>{
+#[derive(Clone,Copy,Debug,Hash)]
+pub struct Trajectory<T>{
+	pub position:Planar64Vec3,
+	pub velocity:Planar64Vec3,
+	pub acceleration:Planar64Vec3,
+	pub time:Time<T>,
+}
+impl<T> std::ops::Neg for Trajectory<T>{
 	type Output=Self;
 	fn neg(self)->Self::Output{
 		Self{
@@ -18,10 +24,10 @@ impl<T> std::ops::Neg for Body<T>{
 		}
 	}
 }
-impl<T:Copy> std::ops::Neg for &Body<T>{
-	type Output=Body<T>;
+impl<T:Copy> std::ops::Neg for &Trajectory<T>{
+	type Output=Trajectory<T>;
 	fn neg(self)->Self::Output{
-		Body{
+		Trajectory{
 			position:self.position,
 			velocity:-self.velocity,
 			acceleration:self.acceleration,
@@ -32,6 +38,32 @@ impl<T:Copy> std::ops::Neg for &Body<T>{
 
 impl<T> Body<T>
 	where Time<T>:Copy,
+{
+	pub const ZERO:Self=Self::new(vec3::zero(),vec3::zero(),Time::ZERO);
+	pub const fn new(position:Planar64Vec3,velocity:Planar64Vec3,time:Time<T>)->Self{
+		Self{
+			position,
+			velocity,
+			time,
+		}
+	}
+	pub const fn with_acceleration(self,acceleration:Planar64Vec3)->Trajectory<T>{
+		let Body{
+			position,
+			velocity,
+			time,
+		}=self;
+		Trajectory{
+			position,
+			velocity,
+			acceleration,
+			time,
+		}
+	}
+}
+
+impl<T> Trajectory<T>
+	where Time<T>:Copy,
 {
 	pub const ZERO:Self=Self::new(vec3::zero(),vec3::zero(),vec3::zero(),Time::ZERO);
 	pub const fn new(position:Planar64Vec3,velocity:Planar64Vec3,acceleration:Planar64Vec3,time:Time<T>)->Self{
@@ -42,13 +74,14 @@ impl<T> Body<T>
 			time,
 		}
 	}
-	pub const fn relative_to<'a>(&'a self,body0:&'a Body<T>)->VirtualBody<'a,T>{
+	pub fn relative_to(&self,trj0:&Self,time:Time<T>)->Self{
 		//(p0,v0,a0,t0)
 		//(p1,v1,a1,t1)
-		VirtualBody{
-			body0,
-			body1:self,
-		}
+		Trajectory::new(
+			self.extrapolated_position(time)-trj0.extrapolated_position(time),
+			self.extrapolated_velocity(time)-trj0.extrapolated_velocity(time),
+			self.acceleration-trj0.acceleration,
+			time)
 	}
 	pub fn extrapolated_position(&self,time:Time<T>)->Planar64Vec3{
 		let dt=time-self.time;
@@ -60,10 +93,12 @@ impl<T> Body<T>
 		let dt=time-self.time;
 		self.velocity+(self.acceleration*dt).map(|elem|elem.divide().clamp_1())
 	}
-	pub fn advance_time(&mut self,time:Time<T>){
-		self.position=self.extrapolated_position(time);
-		self.velocity=self.extrapolated_velocity(time);
-		self.time=time;
+	pub fn extrapolated_body(&self,time:Time<T>)->Body<T>{
+		Body::new(
+			self.extrapolated_position(time),
+			self.extrapolated_velocity(time),
+			time,
+		)
 	}
 	pub fn extrapolated_position_ratio_dt<Num,Den,N1,D1,N2,N3,D2,N4,T1>(&self,dt:integer::Ratio<Num,Den>)->Planar64Vec3
 		where
@@ -101,10 +136,12 @@ impl<T> Body<T>
 		// a*dt + v
 		self.acceleration.map(|elem|(dt*elem).divide().clamp())+self.velocity
 	}
-	pub fn advance_time_ratio_dt(&mut self,dt:crate::model::GigaTime){
-		self.position=self.extrapolated_position_ratio_dt(dt);
-		self.velocity=self.extrapolated_velocity_ratio_dt(dt);
-		self.time+=dt.into();
+	pub fn extrapolated_body_ratio_dt(&self,dt:crate::model::GigaTime)->Body<T>{
+		Body::new(
+			self.extrapolated_position_ratio_dt(dt),
+			self.extrapolated_velocity_ratio_dt(dt),
+			self.time+dt.into(),
+		)
 	}
 	pub fn infinity_dir(&self)->Option<Planar64Vec3>{
 		if self.velocity==vec3::zero(){
@@ -144,28 +181,12 @@ impl<T> Body<T>
 
 }
 impl<T> std::fmt::Display for Body<T>{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"p({}) v({}) t({})",self.position,self.velocity,self.time)
+	}
+}
+impl<T> std::fmt::Display for Trajectory<T>{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"p({}) v({}) a({}) t({})",self.position,self.velocity,self.acceleration,self.time)
 	}
 }
-
-pub struct VirtualBody<'a,T>{
-	body0:&'a Body<T>,
-	body1:&'a Body<T>,
-}
-impl<T> VirtualBody<'_,T>
-	where Time<T>:Copy,
-{
-	pub fn extrapolated_position(&self,time:Time<T>)->Planar64Vec3{
-		self.body1.extrapolated_position(time)-self.body0.extrapolated_position(time)
-	}
-	pub fn extrapolated_velocity(&self,time:Time<T>)->Planar64Vec3{
-		self.body1.extrapolated_velocity(time)-self.body0.extrapolated_velocity(time)
-	}
-	pub fn acceleration(&self)->Planar64Vec3{
-		self.body1.acceleration-self.body0.acceleration
-	}
-	pub fn body(&self,time:Time<T>)->Body<T>{
-		Body::new(self.extrapolated_position(time),self.extrapolated_velocity(time),self.acceleration(),time)
-	}
-}

engine/physics/src/face_crawler.rs

@@ -1,32 +1,27 @@
-use crate::model::{into_giga_time,GigaTime,FEV,MeshQuery,DirectedEdge};
-use strafesnet_common::integer::{Fixed,Ratio,vec3::Vector3};
-use crate::physics::{Time,Body};
+use crate::model::{into_giga_time,GigaTime};
+use strafesnet_common::integer::{Fixed,Ratio,vec3::Vector3,Planar64Vec3};
+use crate::physics::{Time,Trajectory};
+use crate::mesh_query::{FEV,DirectedEdge,MeshQuery,MeshTopology};
 
 use core::ops::Bound;
 
-enum Transition<M:MeshQuery>{
+enum Transition<M:MeshTopology>{
 	Miss,
 	Next(FEV<M>,GigaTime),
 	Hit(M::Face,GigaTime),
 }
 
-pub enum CrawlResult<M:MeshQuery>{
+pub enum CrawlResult<M:MeshTopology>{
 	Miss(FEV<M>),
 	Hit(M::Face,GigaTime),
 }
-impl<M:MeshQuery> CrawlResult<M>{
+impl<M:MeshTopology> CrawlResult<M>{
 	pub fn hit(self)->Option<(M::Face,GigaTime)>{
 		match self{
 			CrawlResult::Miss(_)=>None,
 			CrawlResult::Hit(face,time)=>Some((face,time)),
 		}
 	}
-	pub fn miss(self)->Option<FEV<M>>{
-		match self{
-			CrawlResult::Miss(fev)=>Some(fev),
-			CrawlResult::Hit(_,_)=>None,
-		}
-	}
 }
 
 // TODO: move predict_collision_face_out algorithm in here or something
@@ -70,17 +65,18 @@ where
 	}
 }
 
-impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
+impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>,Position=Planar64Vec3,Direction=Planar64Vec3>> FEV<M>
 	where
 		// This is hardcoded for MinkowskiMesh lol
 		M::Face:Copy,
 		M::Edge:Copy,
+		M::DirectedEdge:Copy,
 		M::Vert:Copy,
 		F:core::ops::Mul<Fixed<1,32>,Output=Fixed<4,128>>,
 		<F as core::ops::Mul<Fixed<1,32>>>::Output:core::iter::Sum,
 		M::Offset:core::ops::Sub<<F as std::ops::Mul<Fixed<1,32>>>::Output>,
 {
-	fn next_transition(&self,mesh:&M,body:&Body,lower_bound:Bound<GigaTime>,mut upper_bound:Bound<GigaTime>)->Transition<M>{
+	fn next_transition(&self,mesh:&M,trajectory:&Trajectory,lower_bound:Bound<GigaTime>,mut upper_bound:Bound<GigaTime>)->Transition<M>{
 		//conflicting derivative means it crosses in the wrong direction.
 		//if the transition time is equal to an already tested transition, do not replace the current best.
 		let mut best_transition=Transition::Miss;
@@ -92,29 +88,29 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 				let (n,d)=mesh.face_nd(face_id);
 				//TODO: use higher precision d value?
 				//use the mesh transform translation instead of baking it into the d value.
-				for dt in Fixed::<4,128>::zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
-					if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+				for dt in Fixed::<4,128>::zeroes2((n.dot(trajectory.position)-d)*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
+					if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 						upper_bound=Bound::Included(dt);
 						best_transition=Transition::Hit(face_id,dt);
 						break;
 					}
 				}
 				//test each edge collision time, ignoring roots with zero or conflicting derivative
-				for &directed_edge_id in mesh.face_edges(face_id).as_ref(){
+				mesh.for_each_face_edge(face_id,|directed_edge_id|{
 					let edge_n=mesh.directed_edge_n(directed_edge_id);
 					let n=n.cross(edge_n);
 					let &[v0,v1]=mesh.edge_verts(directed_edge_id.as_undirected()).as_ref();
 					//WARNING: d is moved out of the *2 block because of adding two vertices!
 					//WARNING: precision is swept under the rug!
 					//wrap for speed
-					for dt in Fixed::<4,128>::zeroes2(n.dot(body.position*2-(mesh.vert(v0)+mesh.vert(v1))).wrap_4(),n.dot(body.velocity).wrap_4()*2,n.dot(body.acceleration).wrap_4()){
-						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+					for dt in Fixed::<4,128>::zeroes2(n.dot(trajectory.position*2-(mesh.vert(v0)+mesh.vert(v1))).wrap_4(),n.dot(trajectory.velocity).wrap_4()*2,n.dot(trajectory.acceleration).wrap_4()){
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Edge(directed_edge_id.as_undirected()),dt);
 							break;
 						}
 					}
-				}
+				});
 				//if none:
 			},
 			&FEV::Edge(edge_id)=>{
@@ -123,15 +119,15 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 				let &[ev0,ev1]=edge_verts.as_ref();
 				let (v0,v1)=(mesh.vert(ev0),mesh.vert(ev1));
 				let edge_n=v1-v0;
-				let delta_pos=body.position*2-(v0+v1);
+				let delta_pos=trajectory.position*2-(v0+v1);
 				for (i,&edge_face_id) in mesh.edge_faces(edge_id).as_ref().iter().enumerate(){
 					let face_n=mesh.face_nd(edge_face_id).0;
 					//edge_n gets parity from the order of edge_faces
 					let n=face_n.cross(edge_n)*((i as i64)*2-1);
 					//WARNING yada yada d *2
 					//wrap for speed
-					for dt in Fixed::<4,128>::zeroes2(n.dot(delta_pos).wrap_4(),n.dot(body.velocity).wrap_4()*2,n.dot(body.acceleration).wrap_4()){
-						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+					for dt in Fixed::<4,128>::zeroes2(n.dot(delta_pos).wrap_4(),n.dot(trajectory.velocity).wrap_4()*2,n.dot(trajectory.acceleration).wrap_4()){
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Face(edge_face_id),dt);
 							break;
@@ -142,8 +138,8 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 				for (i,&vert_id) in edge_verts.as_ref().iter().enumerate(){
 					//vertex normal gets parity from vert index
 					let n=edge_n*(1-2*(i as i64));
-					for dt in Fixed::<2,64>::zeroes2((n.dot(body.position-mesh.vert(vert_id)))*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
-						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+					for dt in Fixed::<2,64>::zeroes2((n.dot(trajectory.position-mesh.vert(vert_id)))*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 							let dt=Ratio::new(dt.num.widen_4(),dt.den.widen_4());
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Vert(vert_id),dt);
@@ -155,28 +151,28 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 			},
 			&FEV::Vert(vert_id)=>{
 				//test each edge collision time, ignoring roots with zero or conflicting derivative
-				for &directed_edge_id in mesh.vert_edges(vert_id).as_ref(){
+				mesh.for_each_vert_edge(vert_id,|directed_edge_id|{
 					//edge is directed away from vertex, but we want the dot product to turn out negative
 					let n=-mesh.directed_edge_n(directed_edge_id);
-					for dt in Fixed::<2,64>::zeroes2((n.dot(body.position-mesh.vert(vert_id)))*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
-						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+					for dt in Fixed::<2,64>::zeroes2((n.dot(trajectory.position-mesh.vert(vert_id)))*2,n.dot(trajectory.velocity)*2,n.dot(trajectory.acceleration)){
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
 							let dt=Ratio::new(dt.num.widen_4(),dt.den.widen_4());
 							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Edge(directed_edge_id.as_undirected()),dt);
 							break;
 						}
 					}
-				}
+				});
 				//if none:
 			},
 		}
 		best_transition
 	}
-	pub fn crawl(mut self,mesh:&M,relative_body:&Body,lower_bound:Bound<&Time>,upper_bound:Bound<&Time>)->CrawlResult<M>{
-		let mut lower_bound=lower_bound.map(|&t|into_giga_time(t,relative_body.time));
-		let upper_bound=upper_bound.map(|&t|into_giga_time(t,relative_body.time));
+	pub fn crawl(mut self,mesh:&M,trajectory:&Trajectory,lower_bound:Bound<&Time>,upper_bound:Bound<&Time>)->CrawlResult<M>{
+		let mut lower_bound=lower_bound.map(|&t|into_giga_time(t,trajectory.time));
+		let upper_bound=upper_bound.map(|&t|into_giga_time(t,trajectory.time));
 		for _ in 0..20{
-			match self.next_transition(mesh,relative_body,lower_bound,upper_bound){
+			match self.next_transition(mesh,trajectory,lower_bound,upper_bound){
 				Transition::Miss=>return CrawlResult::Miss(self),
 				Transition::Next(next_fev,next_time)=>(self,lower_bound)=(next_fev,Bound::Included(next_time)),
 				Transition::Hit(face,time)=>return CrawlResult::Hit(face,time),

engine/physics/src/lib.rs

@@ -1,7 +1,10 @@
 mod body;
-mod push_solve;
 mod face_crawler;
+mod mesh_query;
+mod minkowski;
 mod model;
+mod push_solve;
+mod minimum_difference;
 
 pub mod physics;
 

engine/physics/src/mesh_query.rs

@@ -0,0 +1,56 @@
+pub enum FEV<M:MeshTopology>{
+	Vert(M::Vert),
+	Edge(M::Edge),
+	Face(M::Face),
+}
+
+pub trait UndirectedEdge{
+	type DirectedEdge:DirectedEdge<UndirectedEdge=Self>;
+	fn as_directed(self,parity:bool)->Self::DirectedEdge;
+}
+pub trait DirectedEdge{
+	type UndirectedEdge:UndirectedEdge<DirectedEdge=Self>;
+	fn as_undirected(self)->Self::UndirectedEdge;
+	fn parity(&self)->bool;
+	fn reverse(self)->Self
+		where
+			Self:Sized
+	{
+		let parity=!self.parity();
+		self.as_undirected().as_directed(parity)
+	}
+}
+
+pub trait MeshTopology{
+	type Face;
+	type Edge:UndirectedEdge<DirectedEdge=Self::DirectedEdge>;
+	type DirectedEdge:DirectedEdge<UndirectedEdge=Self::Edge>;
+	type Vert;
+	fn for_each_vert_edge(&self,vert_id:Self::Vert,f:impl FnMut(Self::DirectedEdge));
+	fn for_each_vert_face(&self,vert_id:Self::Vert,f:impl FnMut(Self::Face));
+	fn edge_faces(&self,edge_id:Self::Edge)->impl AsRef<[Self::Face;2]>;
+	fn edge_verts(&self,edge_id:Self::Edge)->impl AsRef<[Self::Vert;2]>;
+	#[expect(unused)]
+	fn for_each_face_vert(&self,face_id:Self::Face,f:impl FnMut(Self::Vert));
+	fn for_each_face_edge(&self,face_id:Self::Face,f:impl FnMut(Self::DirectedEdge));
+}
+
+// Make face_nd d value relative
+// euclidean point?
+// Simplex physics
+// Directed edge necessary?
+// recursive for_each function calls
+// define faces from vertices (Fixed<2> vs Fixed<3>)
+pub trait MeshQuery:MeshTopology{
+	type Position;
+	type Direction;
+	type Normal;
+	type Offset;
+	fn vert(&self,vert_id:Self::Vert)->Self::Position;
+	fn farthest_vert(&self,dir:Self::Direction)->Self::Vert;
+	/// This must return a point inside the mesh.
+	fn hint_point(&self)->Self::Position;
+	fn face_nd(&self,face_id:Self::Face)->(Self::Normal,Self::Offset);
+	fn edge_n(&self,edge_id:Self::Edge)->Self::Direction;
+	fn directed_edge_n(&self,directed_edge_id:Self::DirectedEdge)->Self::Direction;
+}

engine/physics/src/minimum_difference.rs

@@ -0,0 +1,923 @@
+use strafesnet_common::integer::vec3;
+use strafesnet_common::integer::vec3::Vector3;
+use strafesnet_common::integer::{Fixed,Planar64,Planar64Vec3};
+
+use crate::mesh_query::{FEV,DirectedEdge,MeshQuery,MeshTopology};
+// TODO: remove mesh invert
+use crate::minkowski::{MinkowskiMesh,MinkowskiVert};
+
+// This algorithm is based on Lua code
+// written by Trey Reynolds in 2021
+
+type Simplex<const N:usize,Vert>=[Vert;N];
+#[derive(Clone,Copy)]
+enum Simplex1_3<Vert>{
+	Simplex1(Simplex<1,Vert>),
+	Simplex2(Simplex<2,Vert>),
+	Simplex3(Simplex<3,Vert>),
+}
+impl<Vert> Simplex1_3<Vert>{
+	fn push_front(self,v:Vert)->Simplex2_4<Vert>{
+		match self{
+			Simplex1_3::Simplex1([v0])=>Simplex2_4::Simplex2([v,v0]),
+			Simplex1_3::Simplex2([v0,v1])=>Simplex2_4::Simplex3([v,v0,v1]),
+			Simplex1_3::Simplex3([v0,v1,v2])=>Simplex2_4::Simplex4([v,v0,v1,v2]),
+		}
+	}
+}
+#[derive(Clone,Copy)]
+enum Simplex2_4<Vert>{
+	Simplex2(Simplex<2,Vert>),
+	Simplex3(Simplex<3,Vert>),
+	Simplex4(Simplex<4,Vert>),
+}
+
+/*
+local function absDet(r, u, v, w)
+	if w then
+		return math.abs((u - r):Cross(v - r):Dot(w - r))
+	elseif v then
+		return (u - r):Cross(v - r).magnitude
+	elseif u then
+		return (u - r).magnitude
+	else
+		return 1
+	end
+end
+*/
+impl<Vert> Simplex2_4<Vert>{
+	fn det_is_zero<M:MeshQuery<Vert=Vert,Position=Planar64Vec3>>(self,mesh:&M)->bool{
+		match self{
+			Self::Simplex4([p0,p1,p2,p3])=>{
+				let p0=mesh.vert(p0);
+				let p1=mesh.vert(p1);
+				let p2=mesh.vert(p2);
+				let p3=mesh.vert(p3);
+				(p1-p0).cross(p2-p0).dot(p3-p0)==Fixed::ZERO
+			},
+			Self::Simplex3([p0,p1,p2])=>{
+				let p0=mesh.vert(p0);
+				let p1=mesh.vert(p1);
+				let p2=mesh.vert(p2);
+				(p1-p0).cross(p2-p0)==vec3::zero()
+			},
+			Self::Simplex2([p0,p1])=>{
+				let p0=mesh.vert(p0);
+				let p1=mesh.vert(p1);
+				p1-p0==vec3::zero()
+			}
+		}
+	}
+}
+
+/*
+local function choosePerpendicularDirection(d)
+	local x, y, z = d.x, d.y, d.z
+	local best = math.min(x*x, y*y, z*z)
+	if x*x == best then
+		return Vector3.new(y*y + z*z, -x*y, -x*z)
+	elseif y*y == best then
+		return Vector3.new(-x*y, x*x + z*z, -y*z)
+	else
+		return Vector3.new(-x*z, -y*z, x*x + y*y)
+	end
+end
+*/
+fn choose_perpendicular_direction(d:Planar64Vec3)->Planar64Vec3{
+	let x=d.x.abs();
+	let y=d.y.abs();
+	let z=d.z.abs();
+	if x<y&&x<z{
+		Vector3::new([Fixed::ZERO,-d.z,d.y])
+	}else if y<z{
+		Vector3::new([d.z,Fixed::ZERO,-d.x])
+	}else{
+		Vector3::new([-d.y,d.x,Fixed::ZERO])
+	}
+}
+
+const fn choose_any_direction()->Planar64Vec3{
+	vec3::X
+}
+
+fn narrow_dir2(dir:Vector3<Fixed<2,64>>)->Planar64Vec3{
+	if dir==vec3::zero(){
+		return dir.narrow_1().unwrap();
+	}
+	let x=dir.x.as_bits().unsigned_abs().bits();
+	let y=dir.y.as_bits().unsigned_abs().bits();
+	let z=dir.z.as_bits().unsigned_abs().bits();
+	let big=x.max(y).max(z);
+	const MAX_BITS:u32=64+31;
+	if MAX_BITS<big{
+		dir>>(big-MAX_BITS)
+	}else{
+		dir
+	}.narrow_1().unwrap()
+}
+fn narrow_dir3(dir:Vector3<Fixed<3,96>>)->Planar64Vec3{
+	if dir==vec3::zero(){
+		return dir.narrow_1().unwrap();
+	}
+	let x=dir.x.as_bits().unsigned_abs().bits();
+	let y=dir.y.as_bits().unsigned_abs().bits();
+	let z=dir.z.as_bits().unsigned_abs().bits();
+	let big=x.max(y).max(z);
+	const MAX_BITS:u32=96+31;
+	if MAX_BITS<big{
+		dir>>(big-MAX_BITS)
+	}else{
+		dir
+	}.narrow_1().unwrap()
+}
+
+fn reduce1<M:MeshQuery<Position=Planar64Vec3>>(
+	[v0]:Simplex<1,M::Vert>,
+	mesh:&M,
+	point:Planar64Vec3,
+)->Reduced<M::Vert>
+	where M::Vert:Copy,
+{
+	// --debug.profilebegin("reduceSimplex0")
+	// local a = a1 - a0
+	let p0=mesh.vert(v0);
+
+	// local p = -a
+	let p=-(p0+point);
+
+	// local direction = p
+	let mut dir=p;
+
+	// if direction.magnitude == 0 then
+	// 	direction = chooseAnyDirection()
+	if dir==vec3::zero(){
+		dir=choose_any_direction();
+	}
+
+	// return direction, a0, a1
+	Reduced{
+		dir,
+		simplex:Simplex1_3::Simplex1([v0]),
+	}
+}
+
+// local function reduceSimplex1(a0, a1, b0, b1)
+fn reduce2<M:MeshQuery<Position=Planar64Vec3>>(
+	[v0,v1]:Simplex<2,M::Vert>,
+	mesh:&M,
+	point:Planar64Vec3,
+)->Reduced<M::Vert>
+	where
+		M::Vert:Copy
+{
+	// --debug.profilebegin("reduceSimplex1")
+	// local a = a1 - a0
+	// local b = b1 - b0
+	let p0=mesh.vert(v0);
+	let p1=mesh.vert(v1);
+
+	// local p = -a
+	// local u = b - a
+	let p=-(p0+point);
+	let u=p1-p0;
+
+	// -- modify to take into account the radiuses
+	// local p_u = p:Dot(u)
+	let p_u=p.dot(u);
+
+	// if p_u >= 0 then
+	if !p_u.is_negative(){
+		// local direction = u:Cross(p):Cross(u)
+		let direction=u.cross(p).cross(u);
+
+		// if direction.magnitude == 0 then
+		if direction==vec3::zero(){
+			return Reduced{
+				dir:choose_perpendicular_direction(u),
+				simplex:Simplex1_3::Simplex2([v0,v1]),
+			};
+		}
+
+		// -- modify the direction to take into account a0R and b0R
+		// return direction, a0, a1, b0, b1
+		return Reduced{
+			dir:narrow_dir3(direction),
+			simplex:Simplex1_3::Simplex2([v0,v1]),
+		};
+	}
+
+	// local direction = p
+	let mut dir=p;
+
+	// if direction.magnitude == 0 then
+	if dir==vec3::zero(){
+		dir=choose_perpendicular_direction(u);
+	}
+
+	// return direction, a0, a1
+	Reduced{
+		dir,
+		simplex:Simplex1_3::Simplex1([v0]),
+	}
+}
+
+// local function reduceSimplex2(a0, a1, b0, b1, c0, c1)
+fn reduce3<M:MeshQuery<Position=Planar64Vec3>>(
+	[v0,mut v1,v2]:Simplex<3,M::Vert>,
+	mesh:&M,
+	point:Planar64Vec3,
+)->Reduced<M::Vert>
+	where
+		M::Vert:Copy
+{
+	// --debug.profilebegin("reduceSimplex2")
+	// local a = a1 - a0
+	// local b = b1 - b0
+	// local c = c1 - c0
+	let p0=mesh.vert(v0);
+	let p1=mesh.vert(v1);
+	let p2=mesh.vert(v2);
+
+	// local p = -a
+	// local u = b - a
+	// local v = c - a
+	let p=-(p0+point);
+	let mut u=p1-p0;
+	let v=p2-p0;
+
+	// local uv = u:Cross(v)
+	// local up = u:Cross(p)
+	// local pv = p:Cross(v)
+	// local uv_up = uv:Dot(up)
+	// local uv_pv = uv:Dot(pv)
+	let mut uv=u.cross(v);
+	let mut up=u.cross(p);
+	let pv=p.cross(v);
+	let uv_up=uv.dot(up);
+	let uv_pv=uv.dot(pv);
+
+	// if uv_up >= 0 and uv_pv >= 0 then
+	if !uv_up.is_negative()&&!uv_pv.is_negative(){
+		// local uvp = uv:Dot(p)
+		let uvp=uv.dot(p);
+
+		// local direction = uvp < 0 and -uv or uv
+		let direction=if uvp.is_negative(){
+			-uv
+		}else{
+			uv
+		};
+
+		// return direction, a0, a1, b0, b1, c0, c1
+		return Reduced{
+			dir:narrow_dir2(direction),
+			simplex:Simplex1_3::Simplex3([v0,v1,v2]),
+		};
+	}
+
+	// local u_u = u:Dot(u)
+	// local v_v = v:Dot(v)
+	// local uDist = uv_up/(u_u*v.magnitude)
+	// local vDist = uv_pv/(v_v*u.magnitude)
+	// local minDist2 = math.min(uDist, vDist)
+	let u_dist=uv_up*v.length();
+	let v_dist=uv_pv*u.length();
+
+	// if vDist == minDist2 then
+	if v_dist<u_dist{
+		u=v;
+		up=-pv;
+		uv=-uv;
+		// b0 = c0
+		// b1 = c1
+		v1=v2;
+	}
+
+	// local p_u = p:Dot(u)
+	let p_u=p.dot(u);
+
+	// if p_u >= 0 then
+	if !p_u.is_negative(){
+		// local direction = up:Cross(u)
+		let direction=up.cross(u);
+		// if direction.magnitude == 0 then
+		if direction==vec3::zero(){
+			// direction = uv
+			return Reduced{
+				dir:narrow_dir2(uv),
+				simplex:Simplex1_3::Simplex2([v0,v1]),
+			};
+		}
+
+		// return direction, a0, a1, b0, b1
+		return Reduced{
+			dir:narrow_dir3(direction),
+			simplex:Simplex1_3::Simplex2([v0,v1]),
+		};
+	}
+
+	// local direction = p
+	let dir=p;
+	// if direction.magnitude == 0 then
+	if dir==vec3::zero(){
+		// direction = uv
+		return Reduced{
+			dir:narrow_dir2(uv),
+			simplex:Simplex1_3::Simplex1([v0]),
+		};
+	}
+	// return direction, a0, a0
+	Reduced{
+		dir,
+		simplex:Simplex1_3::Simplex1([v0]),
+	}
+}
+
+// local function reduceSimplex3(a0, a1, b0, b1, c0, c1, d0, d1)
+fn reduce4<M:MeshQuery<Position=Planar64Vec3>>(
+	[v0,mut v1,mut v2,v3]:Simplex<4,M::Vert>,
+	mesh:&M,
+	point:Planar64Vec3,
+)->Reduce<M::Vert>
+	where
+		M::Vert:Copy
+{
+	// --debug.profilebegin("reduceSimplex3")
+	// local a = a1 - a0
+	// local b = b1 - b0
+	// local c = c1 - c0
+	// local d = d1 - d0
+	let p0=mesh.vert(v0);
+	let p1=mesh.vert(v1);
+	let p2=mesh.vert(v2);
+	let p3=mesh.vert(v3);
+
+	// local p = -a
+	// local u = b - a
+	// local v = c - a
+	// local w = d - a
+	let p=-(p0+point);
+	let mut u=p1-p0;
+	let mut v=p2-p0;
+	let w=p3-p0;
+
+	// local uv = u:Cross(v)
+	// local vw = v:Cross(w)
+	// local wu = w:Cross(u)
+	// local uvw = uv:Dot(w)
+	// local pvw = vw:Dot(p)
+	// local upw = wu:Dot(p)
+	// local uvp = uv:Dot(p)
+	let mut uv=u.cross(v);
+	let vw=v.cross(w);
+	let wu=w.cross(u);
+	let uv_w=uv.dot(w);
+	let pv_w=vw.dot(p);
+	let up_w=wu.dot(p);
+	let uv_p=uv.dot(p);
+
+	// if pvw/uvw >= 0 and upw/uvw >= 0 and uvp/uvw >= 0 then
+	if !pv_w.div_sign(uv_w).is_negative()
+	 &&!up_w.div_sign(uv_w).is_negative()
+	 &&!uv_p.div_sign(uv_w).is_negative(){
+		// origin is contained, this is a positive detection
+		// local direction = Vector3.new(0, 0, 0)
+		// return direction, a0, a1, b0, b1, c0, c1, d0, d1
+		return Reduce::Escape([v0,v1,v2,v3]);
+	}
+
+	// local uvwSign = uvw < 0 and -1 or uvw > 0 and 1 or 0
+	// local uvDist = uvp*uvwSign/uv.magnitude
+	// local vwDist = pvw*uvwSign/vw.magnitude
+	// local wuDist = upw*uvwSign/wu.magnitude
+	// local minDist3 = math.min(uvDist, vwDist, wuDist)
+	let uv_dist=uv_p.mul_sign(uv_w);
+	let vw_dist=pv_w.mul_sign(uv_w);
+	let wu_dist=up_w.mul_sign(uv_w);
+	let wu_len=wu.length();
+	let uv_len=uv.length();
+	let vw_len=vw.length();
+
+	if vw_dist*wu_len<wu_dist*vw_len{
+		// if vwDist == minDist3 then
+		if vw_dist*uv_len<uv_dist*vw_len{
+			(u,v)=(v,w);
+			uv=vw;
+			// uv_p=pv_w; // unused
+			// b0, c0 = c0, d0
+			// b1, c1 = c1, d1
+			(v1,v2)=(v2,v3);
+		}
+	}else{
+		// elseif wuDist == minDist3 then
+		if wu_dist*uv_len<uv_dist*wu_len{
+			(u,v)=(w,u);
+			uv=wu;
+			// uv_p=up_w; // unused
+			// b0, c0 = d0, b0
+			// b1, c1 = d1, b1
+			// before [a,b,c,d]
+			(v1,v2)=(v3,v1);
+			// after [a,d,b]
+		}
+	}
+
+	// local up = u:Cross(p)
+	// local pv = p:Cross(v)
+	// local uv_up = uv:Dot(up)
+	// local uv_pv = uv:Dot(pv)
+	let mut up=u.cross(p);
+	let pv=p.cross(v);
+	let uv_up=uv.dot(up);
+	let uv_pv=uv.dot(pv);
+
+	// if uv_up >= 0 and uv_pv >= 0 then
+	if !uv_up.is_negative()&&!uv_pv.is_negative(){
+		// local direction = uvw < 0 and uv or -uv
+		// return direction, a0, a1, b0, b1, c0, c1
+		let dir=if uv_w.is_negative(){
+			narrow_dir2(uv)
+		}else{
+			narrow_dir2(-uv)
+		};
+		return Reduce::Reduced(Reduced{
+			dir,
+			simplex:Simplex1_3::Simplex3([v0,v1,v2]),
+		});
+	}
+
+	// local u_u = u:Dot(u)
+	// local v_v = v:Dot(v)
+	// local uDist = uv_up/(u_u*v.magnitude)
+	// local vDist = uv_pv/(v_v*u.magnitude)
+	// local minDist2 = math.min(uDist, vDist)
+	let u_dist=uv_up*v.length();
+	let v_dist=uv_pv*u.length();
+
+	// if vDist == minDist2 then
+	if v_dist<u_dist{
+		u=v;
+		up=-pv;
+		uv=-uv;
+		// b0 = c0
+		// b1 = c1
+		v1=v2;
+	}
+
+	// local p_u = p:Dot(u)
+	let p_u=p.dot(u);
+
+	// if p_u >= 0 then
+	if !p_u.is_negative(){
+		// local direction = up:Cross(u)
+		let direction=up.cross(u);
+		// if direction.magnitude == 0 then
+		if direction==vec3::zero(){
+			// direction = uvw < 0 and uv or -uv
+			// return direction, a0, a1, b0, b1
+			let dir=if uv_w.is_negative(){
+				narrow_dir2(uv)
+			}else{
+				narrow_dir2(-uv)
+			};
+			return Reduce::Reduced(Reduced{
+				dir,
+				simplex:Simplex1_3::Simplex2([v0,v1]),
+			});
+		}
+
+		// return direction, a0, a1, b0, b1
+		return Reduce::Reduced(Reduced{
+			dir:narrow_dir3(direction),
+			simplex:Simplex1_3::Simplex2([v0,v1]),
+		});
+	}
+
+	// local direction = p
+	let dir=p;
+	// if direction.magnitude == 0 then
+	if dir==vec3::zero(){
+		// direction = uvw < 0 and uv or -uv
+		let dir=if uv_w.is_negative(){
+			narrow_dir2(uv)
+		}else{
+			narrow_dir2(-uv)
+		};
+		return Reduce::Reduced(Reduced{
+			dir,
+			simplex:Simplex1_3::Simplex1([v0]),
+		});
+	}
+
+	// return direction, a0, a1
+	Reduce::Reduced(Reduced{
+		dir,
+		simplex:Simplex1_3::Simplex1([v0]),
+	})
+}
+
+struct Reduced<Vert>{
+	dir:Planar64Vec3,
+	simplex:Simplex1_3<Vert>,
+}
+
+enum Reduce<Vert>{
+	Escape(Simplex<4,Vert>),
+	Reduced(Reduced<Vert>),
+}
+
+impl<Vert> Simplex2_4<Vert>{
+	fn reduce<M:MeshQuery<Vert=Vert,Position=Planar64Vec3>>(self,mesh:&M,point:Planar64Vec3)->Reduce<Vert>
+		where
+			M::Vert:Copy
+	{
+		match self{
+			Self::Simplex2(simplex)=>Reduce::Reduced(reduce2(simplex,mesh,point)),
+			Self::Simplex3(simplex)=>Reduce::Reduced(reduce3(simplex,mesh,point)),
+			Self::Simplex4(simplex)=>reduce4(simplex,mesh,point),
+		}
+	}
+}
+
+//infinity fev algorithm state transition
+#[derive(Debug)]
+enum Transition<Vert>{
+	Done,//found closest vert, no edges are better
+	Vert(Vert),//transition to vert
+}
+enum EV<M:MeshTopology>{
+	Vert(M::Vert),
+	Edge(M::Edge),
+}
+impl<M:MeshTopology> From<EV<M>> for FEV<M>{
+	fn from(value:EV<M>)->Self{
+		match value{
+			EV::Vert(minkowski_vert)=>FEV::Vert(minkowski_vert),
+			EV::Edge(minkowski_edge)=>FEV::Edge(minkowski_edge),
+		}
+	}
+}
+
+trait Contains{
+	fn contains(&self,point:Planar64Vec3)->bool;
+}
+
+// convenience type to check if a point is within some threshold of a plane.
+struct ThickPlane{
+	point:Planar64Vec3,
+	normal:Vector3<Fixed<2,64>>,
+	epsilon:Fixed<3,96>,
+}
+impl ThickPlane{
+	fn new<M:MeshQuery<Position=Planar64Vec3>>(mesh:&M,[v0,v1,v2]:Simplex<3,M::Vert>)->Self{
+		let p0=mesh.vert(v0);
+		let p1=mesh.vert(v1);
+		let p2=mesh.vert(v2);
+		let point=p0;
+		let normal=(p1-p0).cross(p2-p0);
+		// Allow ~ 2*sqrt(3) units of thickness on the plane
+		// This is to account for the variance of two voxels across the longest diagonal
+		let epsilon=(normal.length()*(Planar64::EPSILON*3)).wrap_3();
+		Self{point,normal,epsilon}
+	}
+}
+impl Contains for ThickPlane{
+	fn contains(&self,point:Planar64Vec3)->bool{
+		(point-self.point).dot(self.normal).abs()<=self.epsilon
+	}
+}
+
+struct ThickLine{
+	point:Planar64Vec3,
+	dir:Planar64Vec3,
+	epsilon:Fixed<4,128>,
+}
+impl ThickLine{
+	fn new<M:MeshQuery<Position=Planar64Vec3>>(mesh:&M,[v0,v1]:Simplex<2,M::Vert>)->Self{
+		let p0=mesh.vert(v0);
+		let p1=mesh.vert(v1);
+		let point=p0;
+		let dir=p1-p0;
+		// Allow ~ 2*sqrt(3) units of thickness on the plane
+		// This is to account for the variance of two voxels across the longest diagonal
+		let epsilon=(dir.length_squared()*(Planar64::EPSILON*3)).widen_4();
+		Self{point,dir,epsilon}
+	}
+}
+impl Contains for ThickLine{
+	fn contains(&self,point:Planar64Vec3)->bool{
+		(point-self.point).cross(self.dir).length_squared()<=self.epsilon
+	}
+}
+
+struct EVFinder<'a,M,C>{
+	mesh:&'a M,
+	constraint:C,
+	best_distance_squared:Fixed<2,64>,
+}
+
+impl<M:MeshQuery<Position=Planar64Vec3>,C:Contains> EVFinder<'_,M,C>
+	where
+		M::Vert:Copy,
+		M::DirectedEdge:Copy,
+{
+	fn next_transition_vert(&mut self,vert_id:M::Vert,point:Planar64Vec3)->Transition<M::Vert>{
+		let mut best_transition=Transition::Done;
+		self.mesh.for_each_vert_edge(vert_id,|directed_edge_id|{
+			//test if this edge's opposite vertex closer
+			let edge_verts=self.mesh.edge_verts(directed_edge_id.as_undirected());
+			//select opposite vertex
+			let test_vert_id=edge_verts.as_ref()[directed_edge_id.parity() as usize];
+			let test_pos=self.mesh.vert(test_vert_id);
+			let diff=point-test_pos;
+			let distance_squared=diff.dot(diff);
+			// ensure test_vert_id is coplanar to simplex
+			if distance_squared<self.best_distance_squared&&self.constraint.contains(test_pos){
+				best_transition=Transition::Vert(test_vert_id);
+				self.best_distance_squared=distance_squared;
+			}
+		});
+		best_transition
+	}
+	fn final_ev(&mut self,vert_id:M::Vert,point:Planar64Vec3)->EV<M>{
+		let mut best_transition=EV::Vert(vert_id);
+		let vert_pos=self.mesh.vert(vert_id);
+		let diff=point-vert_pos;
+		self.mesh.for_each_vert_edge(vert_id,|directed_edge_id|{
+			//test if this edge is closer
+			let edge_verts=self.mesh.edge_verts(directed_edge_id.as_undirected());
+			let test_vert_id=edge_verts.as_ref()[directed_edge_id.parity() as usize];
+			let test_pos=self.mesh.vert(test_vert_id);
+			let edge_n=test_pos-vert_pos;
+			let d=edge_n.dot(diff);
+			//test the edge
+			let edge_nn=edge_n.dot(edge_n);
+			// ensure edge contains closest point and directed_edge_id is coplanar to simplex
+			if !d.is_negative()&&d<=edge_nn&&self.constraint.contains(test_pos){
+				let distance_squared={
+					let c=diff.cross(edge_n);
+					//wrap for speed
+					(c.dot(c)/edge_nn).divide().wrap_2()
+				};
+				if distance_squared<=self.best_distance_squared{
+					best_transition=EV::Edge(directed_edge_id.as_undirected());
+					self.best_distance_squared=distance_squared;
+				}
+			}
+		});
+		best_transition
+	}
+	fn crawl_boundaries(&mut self,mut vert_id:M::Vert,point:Planar64Vec3)->EV<M>
+		where
+			M::Vert:Copy
+	{
+		loop{
+			match self.next_transition_vert(vert_id,point){
+				Transition::Done=>return self.final_ev(vert_id,point),
+				Transition::Vert(new_vert_id)=>vert_id=new_vert_id,
+			}
+		}
+	}
+}
+/// This function hops along parallel vertices until it finds the EV which contains the closest point to `point`.
+fn crawl_to_closest_ev<M:MeshQuery<Position=Planar64Vec3>>(mesh:&M,simplex:Simplex<2,M::Vert>,point:Planar64Vec3)->EV<M>
+	where
+		M::Vert:Copy,
+		M::DirectedEdge:Copy,
+{
+	// naively start at the closest vertex
+	// the closest vertex is not necessarily the one with the fewest boundary hops
+	// but it doesn't matter, we will get there regardless.
+	let (vert_id,best_distance_squared)=simplex.into_iter().map(|vert_id|{
+		let diff=point-mesh.vert(vert_id);
+		(vert_id,diff.dot(diff))
+	}).min_by_key(|&(_,d)|d).unwrap();
+
+	let constraint=ThickLine::new(mesh,simplex);
+	let mut finder=EVFinder{constraint,mesh,best_distance_squared};
+	//start on any vertex
+	//cross uncrossable vertex-edge boundaries until you find the closest vertex or edge
+	//cross edge-face boundary if it's uncrossable
+	finder.crawl_boundaries(vert_id,point)
+}
+
+/// This function hops along connected vertices until it finds the FEV which contains the closest point to `point`.
+fn crawl_to_closest_fev<'a>(mesh:&MinkowskiMesh<'a>,simplex:Simplex<3,MinkowskiVert>,point:Planar64Vec3)->FEV::<MinkowskiMesh<'a>>{
+	// naively start at the closest vertex
+	// the closest vertex is not necessarily the one with the fewest boundary hops
+	// but it doesn't matter, we will get there regardless.
+	let (vert_id,best_distance_squared)=simplex.into_iter().map(|vert_id|{
+		let diff=point-mesh.vert(vert_id);
+		(vert_id,diff.dot(diff))
+	}).min_by_key(|&(_,d)|d).unwrap();
+
+	let constraint=ThickPlane::new(mesh,simplex);
+	let mut finder=EVFinder{constraint,mesh,best_distance_squared};
+	//start on any vertex
+	//cross uncrossable vertex-edge boundaries until you find the closest vertex or edge
+	//cross edge-face boundary if it's uncrossable
+	match finder.crawl_boundaries(vert_id,point){
+		//if a vert is returned, it is the closest point to the infinity point
+		EV::Vert(vert_id)=>FEV::Vert(vert_id),
+		EV::Edge(edge_id)=>{
+			//cross to face if we are on the wrong side
+			let edge_n=mesh.edge_n(edge_id);
+			// point is multiplied by two because vert_sum sums two vertices.
+			let delta_pos=point*2-{
+				let &[v0,v1]=mesh.edge_verts(edge_id).as_ref();
+				mesh.vert(v0)+mesh.vert(v1)
+			};
+			for (i,&face_id) in mesh.edge_faces(edge_id).as_ref().iter().enumerate(){
+				//test if this face is closer
+				let (face_n,d)=mesh.face_nd(face_id);
+				//if test point is behind face, the face is invalid
+				// TODO: find out why I thought of this backwards
+				if !(face_n.dot(point)-d).is_positive(){
+					continue;
+				}
+				//edge-face boundary nd, n facing out of the face towards the edge
+				let boundary_n=face_n.cross(edge_n)*(i as i64*2-1);
+				let boundary_d=boundary_n.dot(delta_pos);
+				//is test point behind edge, i.e. contained in the face
+				if !boundary_d.is_positive(){
+					//both faces cannot pass this condition, return early if one does.
+					return FEV::Face(face_id);
+				}
+			}
+			FEV::Edge(edge_id)
+		},
+	}
+}
+
+pub fn closest_fev_not_inside<'a>(mesh:&MinkowskiMesh<'a>,point:Planar64Vec3)->Option<FEV<MinkowskiMesh<'a>>>{
+	const ENABLE_FAST_FAIL:bool=false;
+	// TODO: remove mesh negation
+	minimum_difference::<ENABLE_FAST_FAIL,_,_>(&-mesh,point,
+		// on_exact
+		|is_intersecting,simplex|{
+			if is_intersecting{
+				return None;
+			}
+			// Convert simplex to FEV
+			// Vertices must be inverted since the mesh is inverted
+			Some(match simplex{
+				Simplex1_3::Simplex1([v0])=>FEV::Vert(-v0),
+				Simplex1_3::Simplex2([v0,v1])=>{
+					// invert
+					let (v0,v1)=(-v0,-v1);
+					crawl_to_closest_ev(mesh,[v0,v1],point).into()
+				},
+				Simplex1_3::Simplex3([v0,v1,v2])=>{
+					// invert
+					let (v0,v1,v2)=(-v0,-v1,-v2);
+					// Shimmy to the side until you find a face that contains the closest point
+					// it's ALWAYS representable as a face, but this algorithm may
+					// return E or V in edge cases but I don't think that will break the face crawler
+					crawl_to_closest_fev(mesh,[v0,v1,v2],point)
+				},
+			})
+		},
+		// on_escape
+		|_simplex|{
+			// intersection is guaranteed at this point
+			// local norm, dist, u0, u1, v0, v1, w0, w1 = expand(queryP, queryQ, a0, a1, b0, b1, c0, c1, d0, d1, 1e-5)
+			// let simplex=refine_to_exact(mesh,simplex);
+			None
+		},
+		// fast_fail value is irrelevant and will never be returned!
+		||unreachable!()
+	)
+}
+
+pub fn contains_point(mesh:&MinkowskiMesh<'_>,point:Planar64Vec3)->bool{
+	const ENABLE_FAST_FAIL:bool=true;
+	// TODO: remove mesh negation
+	minimum_difference::<ENABLE_FAST_FAIL,_,_>(&-mesh,point,
+		// on_exact
+		|is_intersecting,_simplex|{
+			is_intersecting
+		},
+		// on_escape
+		|_simplex|{
+			// intersection is guaranteed at this point
+			true
+		},
+		// fast_fail value
+		||false
+	)
+}
+
+// local function minimumDifference(
+// 	queryP, radiusP,
+// 	queryQ, radiusQ,
+// 	exitRadius, testIntersection
+// )
+fn minimum_difference<const ENABLE_FAST_FAIL:bool,T,M:MeshQuery<Position=Planar64Vec3,Direction=Planar64Vec3>>(
+	mesh:&M,
+	point:Planar64Vec3,
+	on_exact:impl FnOnce(bool,Simplex1_3<M::Vert>)->T,
+	on_escape:impl FnOnce(Simplex<4,M::Vert>)->T,
+	on_fast_fail:impl FnOnce()->T,
+)->T
+	where
+		M::Vert:Copy
+{
+	// local initialAxis = queryQ() - queryP()
+	// local new_point_p = queryP(initialAxis)
+	// local new_point_q = queryQ(-initialAxis)
+	// local direction, a0, a1, b0, b1, c0, c1, d0, d1
+	let mut initial_axis=mesh.hint_point()+point;
+	// degenerate case
+	if initial_axis==vec3::zero(){
+		initial_axis=choose_any_direction();
+	}
+	let last_point=mesh.farthest_vert(-initial_axis);
+	// this represents the 'a' value in the commented code
+	let mut last_pos=mesh.vert(last_point);
+	let Reduced{dir:mut direction,simplex:mut simplex_small}=reduce1([last_point],mesh,point);
+
+	// exitRadius = testIntersection and 0 or exitRadius or 1/0
+	// for _ = 1, 100 do
+	loop{
+		// new_point_p = queryP(-direction)
+		// new_point_q = queryQ(direction)
+		// local next_point = new_point_q - new_point_p
+		let next_point=mesh.farthest_vert(direction);
+		let next_pos=mesh.vert(next_point);
+
+		// if -direction:Dot(next_point) > (exitRadius + radiusP + radiusQ)*direction.magnitude then
+		if ENABLE_FAST_FAIL&&direction.dot(next_pos+point).is_negative(){
+			return on_fast_fail();
+		}
+
+		let simplex_big=simplex_small.push_front(next_point);
+
+		// if
+		// 	direction:Dot(next_point - a) <= 0 or
+		// 	absDet(next_point, a, b, c) < 1e-6
+		if !direction.dot(next_pos-last_pos).is_positive()
+		||simplex_big.det_is_zero(mesh){
+			// Found enough information to compute the exact closest point.
+			// local norm = direction.unit
+			// local dist = a:Dot(norm)
+			// local hits = -dist < radiusP + radiusQ
+			let is_intersecting=(last_pos+point).dot(direction).is_positive();
+			return on_exact(is_intersecting,simplex_small);
+		}
+
+		// direction, a0, a1, b0, b1, c0, c1, d0, d1 = reduceSimplex(new_point_p, new_point_q, a0, a1, b0, b1, c0, c1)
+		match simplex_big.reduce(mesh,point){
+			// if a and b and c and d then
+			Reduce::Escape(simplex)=>{
+				// Enough information to conclude that the meshes are intersecting.
+				// Topology information is computed if needed.
+				return on_escape(simplex);
+			},
+			Reduce::Reduced(reduced)=>{
+				direction=reduced.dir;
+				simplex_small=reduced.simplex;
+			},
+		}
+
+		// next loop this will be a
+		last_pos=next_pos;
+	}
+}
+
+#[cfg(test)]
+mod test{
+	use super::*;
+    use crate::model::{PhysicsMesh,PhysicsMeshView};
+
+    fn mesh_contains_point(mesh:PhysicsMeshView<'_>,point:Planar64Vec3)->bool{
+		const ENABLE_FAST_FAIL:bool=true;
+		// TODO: remove mesh negation
+		minimum_difference::<ENABLE_FAST_FAIL,_,_>(&mesh,point,
+			// on_exact
+			|is_intersecting,_simplex|{
+				is_intersecting
+			},
+			// on_escape
+			|_simplex|{
+				// intersection is guaranteed at this point
+				true
+			},
+			// fast_fail value
+			||false
+		)
+	}
+
+	#[test]
+	fn test_cube_points(){
+		let mesh=PhysicsMesh::unit_cube();
+		let mesh_view=mesh.complete_mesh_view();
+		for x in -2..=2{
+			for y in -2..=2{
+				for z in -2..=2{
+					let point=vec3::int(x,y,z)>>1;
+					assert!(mesh_contains_point(mesh_view,point),"Mesh did not contain point {point}");
+				}
+			}
+		}
+	}
+}

engine/physics/src/minkowski.rs

@@ -0,0 +1,407 @@
+use core::ops::{Bound,RangeBounds};
+
+use strafesnet_common::integer::{Planar64Vec3,Ratio,Fixed,vec3::Vector3};
+use crate::model::into_giga_time;
+use crate::model::{SubmeshVertId,SubmeshEdgeId,SubmeshDirectedEdgeId,SubmeshFaceId,TransformedMesh,GigaTime};
+use crate::mesh_query::{MeshQuery,MeshTopology,DirectedEdge,UndirectedEdge};
+use crate::physics::{Time,Trajectory};
+
+struct AsRefHelper<T>(T);
+impl<T> AsRef<T> for AsRefHelper<T>{
+	fn as_ref(&self)->&T{
+		&self.0
+	}
+}
+
+//Note that a face on a minkowski mesh refers to a pair of fevs on the meshes it's summed from
+//(face,vertex)
+//(edge,edge)
+//(vertex,face)
+#[derive(Clone,Copy,Debug,Eq,PartialEq)]
+pub enum MinkowskiVert{
+	VertVert(SubmeshVertId,SubmeshVertId),
+}
+// TODO: remove this
+impl core::ops::Neg for MinkowskiVert{
+	type Output=Self;
+	fn neg(self)->Self::Output{
+		match self{
+			MinkowskiVert::VertVert(v0,v1)=>MinkowskiVert::VertVert(v1,v0),
+		}
+	}
+}
+#[derive(Clone,Copy,Debug)]
+pub enum MinkowskiEdge{
+	VertEdge(SubmeshVertId,SubmeshEdgeId),
+	EdgeVert(SubmeshEdgeId,SubmeshVertId),
+	//EdgeEdge when edges are parallel
+}
+impl UndirectedEdge for MinkowskiEdge{
+	type DirectedEdge=MinkowskiDirectedEdge;
+	fn as_directed(self,parity:bool)->Self::DirectedEdge{
+		match self{
+			MinkowskiEdge::VertEdge(v0,e1)=>MinkowskiDirectedEdge::VertEdge(v0,e1.as_directed(parity)),
+			MinkowskiEdge::EdgeVert(e0,v1)=>MinkowskiDirectedEdge::EdgeVert(e0.as_directed(parity),v1),
+		}
+	}
+}
+#[derive(Clone,Copy,Debug)]
+pub enum MinkowskiDirectedEdge{
+	VertEdge(SubmeshVertId,SubmeshDirectedEdgeId),
+	EdgeVert(SubmeshDirectedEdgeId,SubmeshVertId),
+	//EdgeEdge when edges are parallel
+}
+impl DirectedEdge for MinkowskiDirectedEdge{
+	type UndirectedEdge=MinkowskiEdge;
+	fn as_undirected(self)->Self::UndirectedEdge{
+		match self{
+			MinkowskiDirectedEdge::VertEdge(v0,e1)=>MinkowskiEdge::VertEdge(v0,e1.as_undirected()),
+			MinkowskiDirectedEdge::EdgeVert(e0,v1)=>MinkowskiEdge::EdgeVert(e0.as_undirected(),v1),
+		}
+	}
+	fn parity(&self)->bool{
+		match self{
+			MinkowskiDirectedEdge::VertEdge(_,e)
+			|MinkowskiDirectedEdge::EdgeVert(e,_)=>e.parity(),
+		}
+	}
+}
+#[derive(Clone,Copy,Debug,Hash)]
+pub enum MinkowskiFace{
+	VertFace(SubmeshVertId,SubmeshFaceId),
+	EdgeEdge(SubmeshEdgeId,SubmeshEdgeId,bool),
+	FaceVert(SubmeshFaceId,SubmeshVertId),
+	//EdgeFace
+	//FaceEdge
+	//FaceFace
+}
+
+#[derive(Debug)]
+pub struct MinkowskiMesh<'a>{
+	mesh0:TransformedMesh<'a>,
+	mesh1:TransformedMesh<'a>,
+}
+
+// TODO: remove this
+impl<'a> core::ops::Neg for &MinkowskiMesh<'a>{
+	type Output=MinkowskiMesh<'a>;
+	fn neg(self)->Self::Output{
+		MinkowskiMesh::minkowski_sum(self.mesh1,self.mesh0)
+	}
+}
+
+impl MinkowskiMesh<'_>{
+	pub fn minkowski_sum<'a>(mesh0:TransformedMesh<'a>,mesh1:TransformedMesh<'a>)->MinkowskiMesh<'a>{
+		MinkowskiMesh{
+			mesh0,
+			mesh1,
+		}
+	}
+	pub fn predict_collision_in(&self,trajectory:&Trajectory,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
+		let start_position=match range.start_bound(){
+			Bound::Included(time)=>trajectory.extrapolated_position(*time),
+			Bound::Excluded(time)=>trajectory.extrapolated_position(*time),
+			Bound::Unbounded=>trajectory.position,
+		};
+		let fev=crate::minimum_difference::closest_fev_not_inside(self,start_position)?;
+		//continue forwards along the body parabola
+		fev.crawl(self,trajectory,range.start_bound(),range.end_bound()).hit()
+	}
+	pub fn predict_collision_out(&self,trajectory:&Trajectory,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
+		let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
+		// TODO: handle unbounded collision using infinity fev
+		let start_position=match upper_bound{
+			Bound::Included(time)=>trajectory.extrapolated_position(*time),
+			Bound::Excluded(time)=>trajectory.extrapolated_position(*time),
+			Bound::Unbounded=>trajectory.position,
+		};
+		let fev=crate::minimum_difference::closest_fev_not_inside(self,start_position)?;
+		// swap and negate bounds to do a time inversion
+		let (lower_bound,upper_bound)=(upper_bound.map(|&t|-t),lower_bound.map(|&t|-t));
+		let time_reversed_trajectory=-trajectory;
+		//continue backwards along the body parabola
+		fev.crawl(self,&time_reversed_trajectory,lower_bound.as_ref(),upper_bound.as_ref()).hit()
+			//no need to test -time<time_limit because of the first step
+			.map(|(face,time)|(face,-time))
+	}
+	pub fn predict_collision_face_out(&self,trajectory:&Trajectory,range:impl RangeBounds<Time>,contact_face_id:MinkowskiFace)->Option<(MinkowskiDirectedEdge,GigaTime)>{
+		// TODO: make better
+		use crate::face_crawler::{low,upp};
+		//no algorithm needed, there is only one state and two cases (Edge,None)
+		//determine when it passes an edge ("sliding off" case)
+		let start_time=range.start_bound().map(|&t|(t-trajectory.time).to_ratio());
+		let mut best_time=range.end_bound().map(|&t|into_giga_time(t,trajectory.time));
+		let mut best_edge=None;
+		let face_n=self.face_nd(contact_face_id).0;
+		self.for_each_face_edge(contact_face_id,|directed_edge_id|{
+			let edge_n=self.directed_edge_n(directed_edge_id);
+			//f x e points in
+			let n=face_n.cross(edge_n);
+			let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
+			let d=n.dot(self.vert(v0)+self.vert(v1));
+			//WARNING! d outside of *2
+			//WARNING: truncated precision
+			//wrap for speed
+			for dt in Fixed::<4,128>::zeroes2(((n.dot(trajectory.position))*2-d).wrap_4(),n.dot(trajectory.velocity).wrap_4()*2,n.dot(trajectory.acceleration).wrap_4()){
+				if low(&start_time,&dt)&&upp(&dt,&best_time)&&n.dot(trajectory.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+					best_time=Bound::Included(dt);
+					best_edge=Some((directed_edge_id,dt));
+					break;
+				}
+			}
+		});
+		best_edge
+	}
+	pub fn contains_point(&self,point:Planar64Vec3)->bool{
+		crate::minimum_difference::contains_point(self,point)
+	}
+}
+impl MeshQuery for MinkowskiMesh<'_>{
+	type Direction=Planar64Vec3;
+	type Position=Planar64Vec3;
+	type Normal=Vector3<Fixed<3,96>>;
+	type Offset=Fixed<4,128>;
+	// TODO: relative d
+	fn face_nd(&self,face_id:MinkowskiFace)->(Self::Normal,Self::Offset){
+		match face_id{
+			MinkowskiFace::VertFace(v0,f1)=>{
+				let (n,d)=self.mesh1.face_nd(f1);
+				(-n,d-n.dot(self.mesh0.vert(v0)))
+			},
+			MinkowskiFace::EdgeEdge(e0,e1,parity)=>{
+				let edge0_n=self.mesh0.edge_n(e0);
+				let edge1_n=self.mesh1.edge_n(e1);
+				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).as_ref();
+				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).as_ref();
+				let n=edge0_n.cross(edge1_n);
+				let e0d=n.dot(self.mesh0.vert(e0v0)+self.mesh0.vert(e0v1));
+				let e1d=n.dot(self.mesh1.vert(e1v0)+self.mesh1.vert(e1v1));
+				((n*(parity as i64*4-2)).widen_3(),((e0d-e1d)*(parity as i64*2-1)).widen_4())
+			},
+			MinkowskiFace::FaceVert(f0,v1)=>{
+				let (n,d)=self.mesh0.face_nd(f0);
+				(n,d-n.dot(self.mesh1.vert(v1)))
+			},
+		}
+	}
+	fn vert(&self,vert_id:MinkowskiVert)->Planar64Vec3{
+		match vert_id{
+			MinkowskiVert::VertVert(v0,v1)=>{
+				self.mesh0.vert(v0)-self.mesh1.vert(v1)
+			},
+		}
+	}
+	fn hint_point(&self)->Planar64Vec3{
+		self.mesh0.hint_point()-self.mesh1.hint_point()
+	}
+	fn farthest_vert(&self,dir:Planar64Vec3)->MinkowskiVert{
+		MinkowskiVert::VertVert(self.mesh0.farthest_vert(dir),self.mesh1.farthest_vert(-dir))
+	}
+	fn edge_n(&self,edge_id:Self::Edge)->Self::Direction{
+		let &[v0,v1]=self.edge_verts(edge_id).as_ref();
+		self.vert(v1)-self.vert(v0)
+	}
+	fn directed_edge_n(&self,directed_edge_id:Self::DirectedEdge)->Self::Direction{
+		let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
+		(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
+	}
+}
+impl MeshTopology for MinkowskiMesh<'_>{
+	type Face=MinkowskiFace;
+	type Edge=MinkowskiEdge;
+	type DirectedEdge=MinkowskiDirectedEdge;
+	type Vert=MinkowskiVert;
+	fn for_each_vert_edge(&self,vert_id:Self::Vert,mut f:impl FnMut(Self::DirectedEdge)){
+		match vert_id{
+			MinkowskiVert::VertVert(v0,v1)=>{
+				//detect shared volume when the other mesh is mirrored along a test edge dir
+				let v0f={
+					let mut faces=Vec::new();
+					self.mesh0.for_each_vert_face(v0,|face|faces.push(face));
+					faces
+				};
+				let v1f={
+					let mut faces=Vec::new();
+					self.mesh1.for_each_vert_face(v1,|face|faces.push(face));
+					faces
+				};
+				let v0f_n:Vec<_>=v0f.iter().map(|&face_id|self.mesh0.face_nd(face_id).0).collect();
+				let v1f_n:Vec<_>=v1f.iter().map(|&face_id|self.mesh1.face_nd(face_id).0).collect();
+				// scratch vector
+				let mut face_normals=Vec::with_capacity(v0f.len()+v1f.len());
+				face_normals.clone_from(&v0f_n);
+				self.mesh0.for_each_vert_edge(v0,|directed_edge_id|{
+					let n=self.mesh0.directed_edge_n(directed_edge_id);
+					let nn=n.dot(n);
+					// TODO: there's gotta be a better way to do this
+					// drop faces beyond v0f_n
+					face_normals.truncate(v0f.len());
+					// make a set of faces from mesh0's perspective
+					for face_n in &v1f_n{
+						//add reflected mesh1 faces
+						//wrap for speed
+						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
+					}
+					if is_empty_volume(&face_normals){
+						f(MinkowskiDirectedEdge::EdgeVert(directed_edge_id,v1));
+					}
+				});
+				face_normals.clone_from(&v1f_n);
+				self.mesh1.for_each_vert_edge(v1,|directed_edge_id|{
+					let n=self.mesh1.directed_edge_n(directed_edge_id);
+					let nn=n.dot(n);
+					// drop faces beyond v1f_n
+					face_normals.truncate(v1f.len());
+					// make a set of faces from mesh1's perspective
+					for face_n in &v0f_n{
+						//wrap for speed
+						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
+					}
+					if is_empty_volume(&face_normals){
+						f(MinkowskiDirectedEdge::VertEdge(v0,directed_edge_id));
+					}
+				});
+			},
+		}
+	}
+	fn for_each_vert_face(&self,_vert_id:Self::Vert,_f:impl FnMut(Self::Face)){
+		unimplemented!()
+	}
+	fn edge_faces(&self,edge_id:Self::Edge)->impl AsRef<[Self::Face;2]>{
+		match edge_id{
+			MinkowskiEdge::VertEdge(v0,e1)=>{
+				//faces are listed backwards from the minkowski mesh
+				let v0e={
+					let mut edges=Vec::new();
+					self.mesh0.for_each_vert_edge(v0,|edge|edges.push(edge));
+					edges
+				};
+				let &[e1f0,e1f1]=self.mesh1.edge_faces(e1).as_ref();
+				AsRefHelper([(e1f1,false),(e1f0,true)].map(|(edge_face_id1,face_parity)|{
+					let mut best_edge=None;
+					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
+					let edge_face1_n=self.mesh1.face_nd(edge_face_id1).0;
+					let edge_face1_nn=edge_face1_n.dot(edge_face1_n);
+					for &directed_edge_id0 in &v0e{
+						let edge0_n=self.mesh0.directed_edge_n(directed_edge_id0);
+						//must be behind other face.
+						let d=edge_face1_n.dot(edge0_n);
+						if d.is_negative(){
+							let edge0_nn=edge0_n.dot(edge0_n);
+							// Assume not every number is huge
+							// TODO: revisit this
+							let dd=(d*d)/(edge_face1_nn*edge0_nn);
+							if best_d<dd{
+								best_d=dd;
+								best_edge=Some(directed_edge_id0);
+							}
+						}
+					}
+					best_edge.map_or(
+						MinkowskiFace::VertFace(v0,edge_face_id1),
+						|directed_edge_id0|MinkowskiFace::EdgeEdge(directed_edge_id0.as_undirected(),e1,directed_edge_id0.parity()^face_parity)
+					)
+				}))
+			},
+			MinkowskiEdge::EdgeVert(e0,v1)=>{
+				//tracking index with an external variable because .enumerate() is not available
+				let v1e={
+					let mut edges=Vec::new();
+					self.mesh1.for_each_vert_edge(v1,|edge|edges.push(edge));
+					edges
+				};
+				let &[e0f0,e0f1]=self.mesh0.edge_faces(e0).as_ref();
+				AsRefHelper([(e0f0,true),(e0f1,false)].map(|(edge_face_id0,face_parity)|{
+					let mut best_edge=None;
+					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
+					let edge_face0_n=self.mesh0.face_nd(edge_face_id0).0;
+					let edge_face0_nn=edge_face0_n.dot(edge_face0_n);
+					for &directed_edge_id1 in &v1e{
+						let edge1_n=self.mesh1.directed_edge_n(directed_edge_id1);
+						let d=edge_face0_n.dot(edge1_n);
+						if d.is_negative(){
+							let edge1_nn=edge1_n.dot(edge1_n);
+							let dd=(d*d)/(edge_face0_nn*edge1_nn);
+							if best_d<dd{
+								best_d=dd;
+								best_edge=Some(directed_edge_id1);
+							}
+						}
+					}
+					best_edge.map_or(
+						MinkowskiFace::FaceVert(edge_face_id0,v1),
+						|directed_edge_id1|MinkowskiFace::EdgeEdge(e0,directed_edge_id1.as_undirected(),directed_edge_id1.parity()^face_parity)
+					)
+				}))
+			},
+		}
+	}
+	fn edge_verts(&self,edge_id:Self::Edge)->impl AsRef<[Self::Vert;2]>{
+		AsRefHelper(match edge_id{
+			MinkowskiEdge::VertEdge(v0,e1)=>self.mesh1.edge_verts(e1).as_ref().map(|vert_id1|
+				MinkowskiVert::VertVert(v0,vert_id1)
+			),
+			MinkowskiEdge::EdgeVert(e0,v1)=>self.mesh0.edge_verts(e0).as_ref().map(|vert_id0|
+				MinkowskiVert::VertVert(vert_id0,v1)
+			),
+		})
+	}
+	fn for_each_face_vert(&self,_face_id:Self::Face,_f:impl FnMut(Self::Vert)){
+		unimplemented!()
+	}
+	fn for_each_face_edge(&self,face_id:Self::Face,mut f:impl FnMut(Self::DirectedEdge)){
+		match face_id{
+			MinkowskiFace::VertFace(v0,f1)=>{
+				self.mesh1.for_each_face_edge(f1,|edge_id1|
+					f(MinkowskiDirectedEdge::VertEdge(v0,edge_id1.reverse()))
+				)
+			},
+			MinkowskiFace::EdgeEdge(e0,e1,parity)=>{
+				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).as_ref();
+				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).as_ref();
+				//could sort this if ordered edges are needed
+				//probably just need to reverse this list according to parity
+				f(MinkowskiDirectedEdge::VertEdge(e0v0,e1.as_directed(parity)));
+				f(MinkowskiDirectedEdge::EdgeVert(e0.as_directed(!parity),e1v0));
+				f(MinkowskiDirectedEdge::VertEdge(e0v1,e1.as_directed(!parity)));
+				f(MinkowskiDirectedEdge::EdgeVert(e0.as_directed(parity),e1v1));
+			},
+			MinkowskiFace::FaceVert(f0,v1)=>{
+				self.mesh0.for_each_face_edge(f0,|edge_id0|
+					f(MinkowskiDirectedEdge::EdgeVert(edge_id0,v1))
+				)
+			},
+		}
+	}
+}
+
+fn is_empty_volume(normals:&[Vector3<Fixed<3,96>>])->bool{
+	let len=normals.len();
+	for i in 0..len-1{
+		for j in i+1..len{
+			let n=normals[i].cross(normals[j]);
+			let mut d_comp=None;
+			for k in 0..len{
+				if k!=i&&k!=j{
+					let d=n.dot(normals[k]).is_negative();
+					if let &Some(comp)=&d_comp{
+						// This is testing if d_comp*d < 0
+						if comp^d{
+							return true;
+						}
+					}else{
+						d_comp=Some(d);
+					}
+				}
+			}
+		}
+	}
+	return false;
+}
+
+#[test]
+fn test_is_empty_volume(){
+	use strafesnet_common::integer::vec3;
+	assert!(!is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3()]));
+	assert!(is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3(),vec3::NEG_X.widen_3()]));
+}

engine/physics/src/model.rs

@@ -1,11 +1,9 @@
 use std::collections::{HashSet,HashMap};
-use core::ops::{Bound,RangeBounds};
 use strafesnet_common::integer::vec3::Vector3;
 use strafesnet_common::model::{self,MeshId,PolygonIter};
 use strafesnet_common::integer::{self,vec3,Fixed,Planar64,Planar64Vec3,Ratio};
 use strafesnet_common::physics::Time;
-
-type Body=crate::body::Body<strafesnet_common::physics::TimeInner>;
+use crate::mesh_query::{MeshQuery,MeshTopology,DirectedEdge,UndirectedEdge};
 
 struct AsRefHelper<T>(T);
 impl<T> AsRef<T> for AsRefHelper<T>{
@@ -14,20 +12,6 @@ impl<T> AsRef<T> for AsRefHelper<T>{
 	}
 }
 
-pub trait UndirectedEdge{
-	type DirectedEdge:Copy+DirectedEdge;
-	fn as_directed(&self,parity:bool)->Self::DirectedEdge;
-}
-pub trait DirectedEdge{
-	type UndirectedEdge:Copy+std::fmt::Debug+UndirectedEdge;
-	fn as_undirected(&self)->Self::UndirectedEdge;
-	fn parity(&self)->bool;
-	//this is stupid but may work fine
-	fn reverse(&self)-><<Self as DirectedEdge>::UndirectedEdge as UndirectedEdge>::DirectedEdge{
-		self.as_undirected().as_directed(!self.parity())
-	}
-}
-
 #[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
 pub struct MeshVertId(u32);
 #[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
@@ -45,13 +29,13 @@ pub struct SubmeshFaceId(u32);
 
 impl UndirectedEdge for SubmeshEdgeId{
 	type DirectedEdge=SubmeshDirectedEdgeId;
-	fn as_directed(&self,parity:bool)->SubmeshDirectedEdgeId{
+	fn as_directed(self,parity:bool)->SubmeshDirectedEdgeId{
 		SubmeshDirectedEdgeId(self.0|((parity as u32)<<(u32::BITS-1)))
 	}
 }
 impl DirectedEdge for SubmeshDirectedEdgeId{
 	type UndirectedEdge=SubmeshEdgeId;
-	fn as_undirected(&self)->SubmeshEdgeId{
+	fn as_undirected(self)->SubmeshEdgeId{
 		SubmeshEdgeId(self.0&!(1<<(u32::BITS-1)))
 	}
 	fn parity(&self)->bool{
@@ -59,14 +43,6 @@ impl DirectedEdge for SubmeshDirectedEdgeId{
 	}
 }
 
-//Vertex <-> Edge <-> Face -> Collide
-#[derive(Debug)]
-pub enum FEV<M:MeshQuery>{
-	Face(M::Face),
-	Edge(<M::Edge as DirectedEdge>::UndirectedEdge),
-	Vert(M::Vert),
-}
-
 //use Unit32 #[repr(C)] for map files
 #[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
 struct Face{
@@ -75,32 +51,6 @@ struct Face{
 }
 #[derive(Debug)]
 struct Vert(Planar64Vec3);
-pub trait MeshQuery{
-	type Face:Copy;
-	type Edge:Copy+DirectedEdge;
-	type Vert:Copy;
-	// Vertex must be Planar64Vec3 because it represents an actual position
-	type Normal;
-	type Offset;
-	fn edge_n(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->Planar64Vec3{
-		let &[v0,v1]=self.edge_verts(edge_id).as_ref();
-		self.vert(v1)-self.vert(v0)
-	}
-	fn directed_edge_n(&self,directed_edge_id:Self::Edge)->Planar64Vec3{
-		let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
-		(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
-	}
-	/// This must return a point inside the mesh.
-	#[expect(dead_code)]
-	fn hint_point(&self)->Planar64Vec3;
-	fn vert(&self,vert_id:Self::Vert)->Planar64Vec3;
-	fn face_nd(&self,face_id:Self::Face)->(Self::Normal,Self::Offset);
-	fn face_edges(&self,face_id:Self::Face)->impl AsRef<[Self::Edge]>;
-	fn edge_faces(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->impl AsRef<[Self::Face;2]>;
-	fn edge_verts(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->impl AsRef<[Self::Vert;2]>;
-	fn vert_edges(&self,vert_id:Self::Vert)->impl AsRef<[Self::Edge]>;
-	fn vert_faces(&self,vert_id:Self::Vert)->impl AsRef<[Self::Face]>;
-}
 #[derive(Debug)]
 struct FaceRefs{
 	// I didn't write it down, but I assume the edges are directed
@@ -439,15 +389,14 @@ impl TryFrom<&model::Mesh> for PhysicsMesh{
 	}
 }
 
-#[derive(Debug)]
+#[derive(Debug,Clone,Copy)]
 pub struct PhysicsMeshView<'a>{
 	data:&'a PhysicsMeshData,
 	topology:&'a PhysicsMeshTopology,
 }
 impl MeshQuery for PhysicsMeshView<'_>{
-	type Face=SubmeshFaceId;
-	type Edge=SubmeshDirectedEdgeId;
-	type Vert=SubmeshVertId;
+	type Position=Planar64Vec3;
+	type Direction=Planar64Vec3;
 	type Normal=Planar64Vec3;
 	type Offset=Planar64;
 	fn face_nd(&self,face_id:SubmeshFaceId)->(Planar64Vec3,Planar64){
@@ -458,25 +407,54 @@ impl MeshQuery for PhysicsMeshView<'_>{
 		// invariant: meshes always encompass the origin
 		vec3::zero()
 	}
+	fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
+		//this happens to be well-defined.  there are no virtual virtices
+		SubmeshVertId::new(
+			self.topology.verts.iter()
+			.enumerate()
+			.max_by_key(|&(_,&vert_id)|
+				dir.dot(self.data.verts[vert_id.get() as usize].0)
+			)
+			//assume there is more than zero vertices.
+			.unwrap().0 as u32
+		)
+	}
 	//ideally I never calculate the vertex position, but I have to for the graphical meshes...
 	fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
 		let vert_idx=self.topology.verts[vert_id.get() as usize].get() as usize;
 		self.data.verts[vert_idx].0
 	}
-	fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
-		self.topology.face_topology[face_id.get() as usize].edges.as_slice()
+	fn edge_n(&self,edge_id:Self::Edge)->Self::Direction{
+		let &[v0,v1]=self.edge_verts(edge_id).as_ref();
+		self.vert(v1)-self.vert(v0)
 	}
-	fn edge_faces(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshFaceId;2]>{
+	fn directed_edge_n(&self,directed_edge_id:Self::DirectedEdge)->Self::Direction{
+		let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
+		(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
+	}
+}
+impl MeshTopology for PhysicsMeshView<'_>{
+	type Face=SubmeshFaceId;
+	type Edge=SubmeshEdgeId;
+	type DirectedEdge=SubmeshDirectedEdgeId;
+	type Vert=SubmeshVertId;
+	fn for_each_vert_edge(&self,vert_id:Self::Vert,f:impl FnMut(Self::DirectedEdge)){
+		self.topology.vert_topology[vert_id.get() as usize].edges.iter().copied().for_each(f);
+	}
+	fn for_each_vert_face(&self,vert_id:Self::Vert,f:impl FnMut(Self::Face)){
+		self.topology.vert_topology[vert_id.get() as usize].faces.iter().copied().for_each(f);
+	}
+	fn edge_faces(&self,edge_id:Self::Edge)->impl AsRef<[Self::Face;2]>{
 		AsRefHelper(self.topology.edge_topology[edge_id.get() as usize].faces)
 	}
-	fn edge_verts(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshVertId;2]>{
+	fn edge_verts(&self,edge_id:Self::Edge)->impl AsRef<[Self::Vert;2]>{
 		AsRefHelper(self.topology.edge_topology[edge_id.get() as usize].verts)
 	}
-	fn vert_edges(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshDirectedEdgeId]>{
-		self.topology.vert_topology[vert_id.get() as usize].edges.as_slice()
+	fn for_each_face_vert(&self,_face_id:Self::Face,_f:impl FnMut(Self::Vert)){
+		unimplemented!()
 	}
-	fn vert_faces(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshFaceId]>{
-		self.topology.vert_topology[vert_id.get() as usize].faces.as_slice()
+	fn for_each_face_edge(&self,face_id:Self::Face,f:impl FnMut(Self::DirectedEdge)){
+		self.topology.face_topology[face_id.get() as usize].edges.iter().copied().for_each(f);
 	}
 }
 
@@ -496,7 +474,7 @@ impl PhysicsMeshTransform{
 	}
 }
 
-#[derive(Debug)]
+#[derive(Debug,Clone,Copy)]
 pub struct TransformedMesh<'a>{
 	view:PhysicsMeshView<'a>,
 	transform:&'a PhysicsMeshTransform,
@@ -514,23 +492,10 @@ impl TransformedMesh<'_>{
 	pub fn verts<'a>(&'a self)->impl Iterator<Item=Vector3<Fixed<2,64>>>+'a{
 		self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos))
 	}
-	fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
-		//this happens to be well-defined.  there are no virtual virtices
-		SubmeshVertId::new(
-			self.view.topology.verts.iter()
-			.enumerate()
-			.max_by_key(|&(_,&vert_id)|
-				dir.dot(self.transform.vertex.transform_point3(self.view.data.verts[vert_id.get() as usize].0))
-			)
-			//assume there is more than zero vertices.
-			.unwrap().0 as u32
-		)
-	}
 }
 impl MeshQuery for TransformedMesh<'_>{
-	type Face=SubmeshFaceId;
-	type Edge=SubmeshDirectedEdgeId;
-	type Vert=SubmeshVertId;
+	type Direction=Planar64Vec3;
+	type Position=Planar64Vec3;
 	type Normal=Vector3<Fixed<3,96>>;
 	type Offset=Fixed<4,128>;
 	fn face_nd(&self,face_id:SubmeshFaceId)->(Self::Normal,Self::Offset){
@@ -546,510 +511,59 @@ impl MeshQuery for TransformedMesh<'_>{
 	fn hint_point(&self)->Planar64Vec3{
 		self.transform.vertex.translation
 	}
+	fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
+		//this happens to be well-defined.  there are no virtual virtices
+		SubmeshVertId::new(
+			self.view.topology.verts.iter()
+			.enumerate()
+			.max_by_key(|&(_,&vert_id)|
+				dir.dot(self.transform.vertex.transform_point3(self.view.data.verts[vert_id.get() as usize].0))
+			)
+			//assume there is more than zero vertices.
+			.unwrap().0 as u32
+		)
+	}
+	fn edge_n(&self,edge_id:Self::Edge)->Self::Direction{
+		let &[v0,v1]=self.edge_verts(edge_id).as_ref();
+		self.vert(v1)-self.vert(v0)
+	}
+	fn directed_edge_n(&self,directed_edge_id:Self::DirectedEdge)->Self::Direction{
+		let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
+		(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
+	}
+}
+impl MeshTopology for TransformedMesh<'_>{
+	type Face=SubmeshFaceId;
+	type Edge=SubmeshEdgeId;
+	type DirectedEdge=SubmeshDirectedEdgeId;
+	type Vert=SubmeshVertId;
 	#[inline]
-	fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
-		self.view.face_edges(face_id)
+	fn for_each_vert_edge(&self,vert_id:Self::Vert,f:impl FnMut(Self::DirectedEdge)){
+		self.view.for_each_vert_edge(vert_id,f)
 	}
 	#[inline]
-	fn edge_faces(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshFaceId;2]>{
+	fn for_each_vert_face(&self,vert_id:Self::Vert,f:impl FnMut(Self::Face)){
+		self.view.for_each_vert_face(vert_id,f)
+	}
+	#[inline]
+	fn edge_faces(&self,edge_id:Self::Edge)->impl AsRef<[Self::Face;2]>{
 		self.view.edge_faces(edge_id)
 	}
 	#[inline]
-	fn edge_verts(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshVertId;2]>{
+	fn edge_verts(&self,edge_id:Self::Edge)->impl AsRef<[Self::Vert;2]>{
 		self.view.edge_verts(edge_id)
 	}
-	#[inline]
-	fn vert_edges(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshDirectedEdgeId]>{
-		self.view.vert_edges(vert_id)
+	fn for_each_face_vert(&self,face_id:Self::Face,f:impl FnMut(Self::Vert)){
+		self.view.for_each_face_vert(face_id,f)
 	}
 	#[inline]
-	fn vert_faces(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshFaceId]>{
-		self.view.vert_faces(vert_id)
+	fn for_each_face_edge(&self,face_id:Self::Face,f:impl FnMut(Self::DirectedEdge)){
+		self.view.for_each_face_edge(face_id,f)
 	}
 }
 
-//Note that a face on a minkowski mesh refers to a pair of fevs on the meshes it's summed from
-//(face,vertex)
-//(edge,edge)
-//(vertex,face)
-#[derive(Clone,Copy,Debug)]
-pub enum MinkowskiVert{
-	VertVert(SubmeshVertId,SubmeshVertId),
-}
-#[derive(Clone,Copy,Debug)]
-pub enum MinkowskiEdge{
-	VertEdge(SubmeshVertId,SubmeshEdgeId),
-	EdgeVert(SubmeshEdgeId,SubmeshVertId),
-	//EdgeEdge when edges are parallel
-}
-impl UndirectedEdge for MinkowskiEdge{
-	type DirectedEdge=MinkowskiDirectedEdge;
-	fn as_directed(&self,parity:bool)->Self::DirectedEdge{
-		match self{
-			MinkowskiEdge::VertEdge(v0,e1)=>MinkowskiDirectedEdge::VertEdge(*v0,e1.as_directed(parity)),
-			MinkowskiEdge::EdgeVert(e0,v1)=>MinkowskiDirectedEdge::EdgeVert(e0.as_directed(parity),*v1),
-		}
-	}
-}
-#[derive(Clone,Copy,Debug)]
-pub enum MinkowskiDirectedEdge{
-	VertEdge(SubmeshVertId,SubmeshDirectedEdgeId),
-	EdgeVert(SubmeshDirectedEdgeId,SubmeshVertId),
-	//EdgeEdge when edges are parallel
-}
-impl DirectedEdge for MinkowskiDirectedEdge{
-	type UndirectedEdge=MinkowskiEdge;
-	fn as_undirected(&self)->Self::UndirectedEdge{
-		match self{
-			MinkowskiDirectedEdge::VertEdge(v0,e1)=>MinkowskiEdge::VertEdge(*v0,e1.as_undirected()),
-			MinkowskiDirectedEdge::EdgeVert(e0,v1)=>MinkowskiEdge::EdgeVert(e0.as_undirected(),*v1),
-		}
-	}
-	fn parity(&self)->bool{
-		match self{
-			MinkowskiDirectedEdge::VertEdge(_,e)
-			|MinkowskiDirectedEdge::EdgeVert(e,_)=>e.parity(),
-		}
-	}
-}
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
-pub enum MinkowskiFace{
-	VertFace(SubmeshVertId,SubmeshFaceId),
-	EdgeEdge(SubmeshEdgeId,SubmeshEdgeId,bool),
-	FaceVert(SubmeshFaceId,SubmeshVertId),
-	//EdgeFace
-	//FaceEdge
-	//FaceFace
-}
-
-#[derive(Debug)]
-pub struct MinkowskiMesh<'a>{
-	mesh0:TransformedMesh<'a>,
-	mesh1:TransformedMesh<'a>,
-}
-
-//infinity fev algorithm state transition
-#[derive(Debug)]
-enum Transition{
-	Done,//found closest vert, no edges are better
-	Vert(MinkowskiVert),//transition to vert
-}
-enum EV{
-	Vert(MinkowskiVert),
-	Edge(MinkowskiEdge),
-}
-
 pub type GigaTime=Ratio<Fixed<4,128>,Fixed<4,128>>;
 pub fn into_giga_time(time:Time,relative_to:Time)->GigaTime{
 	let r=(time-relative_to).to_ratio();
 	Ratio::new(r.num.widen_4(),r.den.widen_4())
 }
-
-impl MinkowskiMesh<'_>{
-	pub fn minkowski_sum<'a>(mesh0:TransformedMesh<'a>,mesh1:TransformedMesh<'a>)->MinkowskiMesh<'a>{
-		MinkowskiMesh{
-			mesh0,
-			mesh1,
-		}
-	}
-	fn farthest_vert(&self,dir:Planar64Vec3)->MinkowskiVert{
-		MinkowskiVert::VertVert(self.mesh0.farthest_vert(dir),self.mesh1.farthest_vert(-dir))
-	}
-	fn next_transition_vert(&self,vert_id:MinkowskiVert,best_distance_squared:&mut Fixed<2,64>,infinity_dir:Planar64Vec3,point:Planar64Vec3)->Transition{
-		let mut best_transition=Transition::Done;
-		for &directed_edge_id in self.vert_edges(vert_id).as_ref(){
-			let edge_n=self.directed_edge_n(directed_edge_id);
-			//is boundary uncrossable by a crawl from infinity
-			let edge_verts=self.edge_verts(directed_edge_id.as_undirected());
-			//select opposite vertex
-			let test_vert_id=edge_verts.as_ref()[directed_edge_id.parity() as usize];
-			//test if it's closer
-			let diff=point-self.vert(test_vert_id);
-			if edge_n.dot(infinity_dir).is_zero(){
-				let distance_squared=diff.dot(diff);
-				if distance_squared<*best_distance_squared{
-					best_transition=Transition::Vert(test_vert_id);
-					*best_distance_squared=distance_squared;
-				}
-			}
-		}
-		best_transition
-	}
-	fn final_ev(&self,vert_id:MinkowskiVert,best_distance_squared:&mut Fixed<2,64>,infinity_dir:Planar64Vec3,point:Planar64Vec3)->EV{
-		let mut best_transition=EV::Vert(vert_id);
-		let diff=point-self.vert(vert_id);
-		for &directed_edge_id in self.vert_edges(vert_id).as_ref(){
-			let edge_n=self.directed_edge_n(directed_edge_id);
-			//is boundary uncrossable by a crawl from infinity
-			//check if time of collision is outside Time::MIN..Time::MAX
-			if edge_n.dot(infinity_dir).is_zero(){
-				let d=edge_n.dot(diff);
-				//test the edge
-				let edge_nn=edge_n.dot(edge_n);
-				if !d.is_negative()&&d<=edge_nn{
-					let distance_squared={
-						let c=diff.cross(edge_n);
-						//wrap for speed
-						(c.dot(c)/edge_nn).divide().wrap_2()
-					};
-					if distance_squared<=*best_distance_squared{
-						best_transition=EV::Edge(directed_edge_id.as_undirected());
-						*best_distance_squared=distance_squared;
-					}
-				}
-			}
-		}
-		best_transition
-	}
-	fn crawl_boundaries(&self,mut vert_id:MinkowskiVert,infinity_dir:Planar64Vec3,point:Planar64Vec3)->EV{
-		let mut best_distance_squared={
-			let diff=point-self.vert(vert_id);
-			diff.dot(diff)
-		};
-		loop{
-			match self.next_transition_vert(vert_id,&mut best_distance_squared,infinity_dir,point){
-				Transition::Done=>return self.final_ev(vert_id,&mut best_distance_squared,infinity_dir,point),
-				Transition::Vert(new_vert_id)=>vert_id=new_vert_id,
-			}
-		}
-	}
-	/// This function drops a vertex down to an edge or a face if the path from infinity did not cross any vertex-edge boundaries but the point is supposed to have already crossed a boundary down from a vertex
-	fn infinity_fev(&self,infinity_dir:Planar64Vec3,point:Planar64Vec3)->FEV::<MinkowskiMesh<'_>>{
-		//start on any vertex
-		//cross uncrossable vertex-edge boundaries until you find the closest vertex or edge
-		//cross edge-face boundary if it's uncrossable
-		match self.crawl_boundaries(self.farthest_vert(infinity_dir),infinity_dir,point){
-			//if a vert is returned, it is the closest point to the infinity point
-			EV::Vert(vert_id)=>FEV::Vert(vert_id),
-			EV::Edge(edge_id)=>{
-				//cross to face if the boundary is not crossable and we are on the wrong side
-				let edge_n=self.edge_n(edge_id);
-				// point is multiplied by two because vert_sum sums two vertices.
-				let delta_pos=point*2-{
-					let &[v0,v1]=self.edge_verts(edge_id).as_ref();
-					self.vert(v0)+self.vert(v1)
-				};
-				for (i,&face_id) in self.edge_faces(edge_id).as_ref().iter().enumerate(){
-					let face_n=self.face_nd(face_id).0;
-					//edge-face boundary nd, n facing out of the face towards the edge
-					let boundary_n=face_n.cross(edge_n)*(i as i64*2-1);
-					let boundary_d=boundary_n.dot(delta_pos);
-					//check if time of collision is outside Time::MIN..Time::MAX
-					//infinity_dir can always be treated as a velocity
-					if !boundary_d.is_positive()&&boundary_n.dot(infinity_dir).is_zero(){
-						//both faces cannot pass this condition, return early if one does.
-						return FEV::Face(face_id);
-					}
-				}
-				FEV::Edge(edge_id)
-			},
-		}
-	}
-	// TODO: fundamentally improve this algorithm.
-	// All it needs to do is find the closest point on the mesh
-	// and return the FEV which the point resides on.
-	//
-	// What it actually does is use the above functions to trace a ray in from infinity,
-	// crawling the closest point along the mesh surface until the ray reaches
-	// the starting point to discover the final FEV.
-	//
-	// The actual collision prediction probably does a single test
-	// and then immediately returns with 0 FEV transitions on average,
-	// because of the strict time_limit constraint.
-	//
-	// Most of the calculation time is just calculating the starting point
-	// for the "actual" crawling algorithm below (predict_collision_{in|out}).
-	fn closest_fev_not_inside(&self,mut infinity_body:Body,start_time:Bound<&Time>)->Option<FEV<MinkowskiMesh<'_>>>{
-		infinity_body.infinity_dir().and_then(|dir|{
-			let infinity_fev=self.infinity_fev(-dir,infinity_body.position);
-			//a line is simpler to solve than a parabola
-			infinity_body.velocity=dir;
-			infinity_body.acceleration=vec3::zero();
-			//crawl in from negative infinity along a tangent line to get the closest fev
-			infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,start_time).miss()
-		})
-	}
-	pub fn predict_collision_in(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
-		self.closest_fev_not_inside(*relative_body,range.start_bound()).and_then(|fev|{
-			//continue forwards along the body parabola
-			fev.crawl(self,relative_body,range.start_bound(),range.end_bound()).hit()
-		})
-	}
-	pub fn predict_collision_out(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
-		let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
-		// swap and negate bounds to do a time inversion
-		let (lower_bound,upper_bound)=(upper_bound.map(|&t|-t),lower_bound.map(|&t|-t));
-		let infinity_body=-relative_body;
-		self.closest_fev_not_inside(infinity_body,lower_bound.as_ref()).and_then(|fev|{
-			//continue backwards along the body parabola
-			fev.crawl(self,&infinity_body,lower_bound.as_ref(),upper_bound.as_ref()).hit()
-				//no need to test -time<time_limit because of the first step
-				.map(|(face,time)|(face,-time))
-		})
-	}
-	pub fn predict_collision_face_out(&self,relative_body:&Body,range:impl RangeBounds<Time>,contact_face_id:MinkowskiFace)->Option<(MinkowskiDirectedEdge,GigaTime)>{
-		// TODO: make better
-		use crate::face_crawler::{low,upp};
-		//no algorithm needed, there is only one state and two cases (Edge,None)
-		//determine when it passes an edge ("sliding off" case)
-		let start_time=range.start_bound().map(|&t|(t-relative_body.time).to_ratio());
-		let mut best_time=range.end_bound().map(|&t|into_giga_time(t,relative_body.time));
-		let mut best_edge=None;
-		let face_n=self.face_nd(contact_face_id).0;
-		for &directed_edge_id in self.face_edges(contact_face_id).as_ref(){
-			let edge_n=self.directed_edge_n(directed_edge_id);
-			//f x e points in
-			let n=face_n.cross(edge_n);
-			let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
-			let d=n.dot(self.vert(v0)+self.vert(v1));
-			//WARNING! d outside of *2
-			//WARNING: truncated precision
-			//wrap for speed
-			for dt in Fixed::<4,128>::zeroes2(((n.dot(relative_body.position))*2-d).wrap_4(),n.dot(relative_body.velocity).wrap_4()*2,n.dot(relative_body.acceleration).wrap_4()){
-				if low(&start_time,&dt)&&upp(&dt,&best_time)&&n.dot(relative_body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-					best_time=Bound::Included(dt);
-					best_edge=Some((directed_edge_id,dt));
-					break;
-				}
-			}
-		}
-		best_edge
-	}
-	fn infinity_in(&self,infinity_body:Body)->Option<(MinkowskiFace,GigaTime)>{
-		let infinity_fev=self.infinity_fev(-infinity_body.velocity,infinity_body.position);
-		// Bound::Included means that the surface of the mesh is included in the mesh
-		infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,Bound::Included(&infinity_body.time)).hit()
-	}
-	pub fn is_point_in_mesh(&self,point:Planar64Vec3)->bool{
-		let infinity_body=Body::new(point,vec3::Y,vec3::zero(),Time::ZERO);
-		//movement must escape the mesh forwards and backwards in time,
-		//otherwise the point is not inside the mesh
-		self.infinity_in(infinity_body)
-    	.is_some_and(|_|
-			self.infinity_in(-infinity_body)
-    		.is_some()
-     	)
-	}
-}
-impl MeshQuery for MinkowskiMesh<'_>{
-	type Face=MinkowskiFace;
-	type Edge=MinkowskiDirectedEdge;
-	type Vert=MinkowskiVert;
-	type Normal=Vector3<Fixed<3,96>>;
-	type Offset=Fixed<4,128>;
-	// TODO: relative d
-	fn face_nd(&self,face_id:MinkowskiFace)->(Self::Normal,Self::Offset){
-		match face_id{
-			MinkowskiFace::VertFace(v0,f1)=>{
-				let (n,d)=self.mesh1.face_nd(f1);
-				(-n,d-n.dot(self.mesh0.vert(v0)))
-			},
-			MinkowskiFace::EdgeEdge(e0,e1,parity)=>{
-				let edge0_n=self.mesh0.edge_n(e0);
-				let edge1_n=self.mesh1.edge_n(e1);
-				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).as_ref();
-				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).as_ref();
-				let n=edge0_n.cross(edge1_n);
-				let e0d=n.dot(self.mesh0.vert(e0v0)+self.mesh0.vert(e0v1));
-				let e1d=n.dot(self.mesh1.vert(e1v0)+self.mesh1.vert(e1v1));
-				((n*(parity as i64*4-2)).widen_3(),((e0d-e1d)*(parity as i64*2-1)).widen_4())
-			},
-			MinkowskiFace::FaceVert(f0,v1)=>{
-				let (n,d)=self.mesh0.face_nd(f0);
-				(n,d-n.dot(self.mesh1.vert(v1)))
-			},
-		}
-	}
-	fn vert(&self,vert_id:MinkowskiVert)->Planar64Vec3{
-		match vert_id{
-			MinkowskiVert::VertVert(v0,v1)=>{
-				self.mesh0.vert(v0)-self.mesh1.vert(v1)
-			},
-		}
-	}
-	fn hint_point(&self)->Planar64Vec3{
-		self.mesh1.transform.vertex.translation-
-		self.mesh0.transform.vertex.translation
-	}
-	fn face_edges(&self,face_id:MinkowskiFace)->impl AsRef<[MinkowskiDirectedEdge]>{
-		match face_id{
-			MinkowskiFace::VertFace(v0,f1)=>{
-				self.mesh1.face_edges(f1).as_ref().iter().map(|&edge_id1|
-					MinkowskiDirectedEdge::VertEdge(v0,edge_id1.reverse())
-				).collect()
-			},
-			MinkowskiFace::EdgeEdge(e0,e1,parity)=>{
-				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).as_ref();
-				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).as_ref();
-				//could sort this if ordered edges are needed
-				//probably just need to reverse this list according to parity
-				vec![
-					MinkowskiDirectedEdge::VertEdge(e0v0,e1.as_directed(parity)),
-					MinkowskiDirectedEdge::EdgeVert(e0.as_directed(!parity),e1v0),
-					MinkowskiDirectedEdge::VertEdge(e0v1,e1.as_directed(!parity)),
-					MinkowskiDirectedEdge::EdgeVert(e0.as_directed(parity),e1v1),
-				]
-			},
-			MinkowskiFace::FaceVert(f0,v1)=>{
-				self.mesh0.face_edges(f0).as_ref().iter().map(|&edge_id0|
-					MinkowskiDirectedEdge::EdgeVert(edge_id0,v1)
-				).collect()
-			},
-		}
-	}
-	fn edge_faces(&self,edge_id:MinkowskiEdge)->impl AsRef<[MinkowskiFace;2]>{
-		match edge_id{
-			MinkowskiEdge::VertEdge(v0,e1)=>{
-				//faces are listed backwards from the minkowski mesh
-				let v0e=self.mesh0.vert_edges(v0);
-				let &[e1f0,e1f1]=self.mesh1.edge_faces(e1).as_ref();
-				AsRefHelper([(e1f1,false),(e1f0,true)].map(|(edge_face_id1,face_parity)|{
-					let mut best_edge=None;
-					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
-					let edge_face1_n=self.mesh1.face_nd(edge_face_id1).0;
-					let edge_face1_nn=edge_face1_n.dot(edge_face1_n);
-					for &directed_edge_id0 in v0e.as_ref(){
-						let edge0_n=self.mesh0.directed_edge_n(directed_edge_id0);
-						//must be behind other face.
-						let d=edge_face1_n.dot(edge0_n);
-						if d.is_negative(){
-							let edge0_nn=edge0_n.dot(edge0_n);
-							// Assume not every number is huge
-							// TODO: revisit this
-							let dd=(d*d)/(edge_face1_nn*edge0_nn);
-							if best_d<dd{
-								best_d=dd;
-								best_edge=Some(directed_edge_id0);
-							}
-						}
-					}
-					best_edge.map_or(
-						MinkowskiFace::VertFace(v0,edge_face_id1),
-						|directed_edge_id0|MinkowskiFace::EdgeEdge(directed_edge_id0.as_undirected(),e1,directed_edge_id0.parity()^face_parity)
-					)
-				}))
-			},
-			MinkowskiEdge::EdgeVert(e0,v1)=>{
-				//tracking index with an external variable because .enumerate() is not available
-				let v1e=self.mesh1.vert_edges(v1);
-				let &[e0f0,e0f1]=self.mesh0.edge_faces(e0).as_ref();
-				AsRefHelper([(e0f0,true),(e0f1,false)].map(|(edge_face_id0,face_parity)|{
-					let mut best_edge=None;
-					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
-					let edge_face0_n=self.mesh0.face_nd(edge_face_id0).0;
-					let edge_face0_nn=edge_face0_n.dot(edge_face0_n);
-					for &directed_edge_id1 in v1e.as_ref(){
-						let edge1_n=self.mesh1.directed_edge_n(directed_edge_id1);
-						let d=edge_face0_n.dot(edge1_n);
-						if d.is_negative(){
-							let edge1_nn=edge1_n.dot(edge1_n);
-							let dd=(d*d)/(edge_face0_nn*edge1_nn);
-							if best_d<dd{
-								best_d=dd;
-								best_edge=Some(directed_edge_id1);
-							}
-						}
-					}
-					best_edge.map_or(
-						MinkowskiFace::FaceVert(edge_face_id0,v1),
-						|directed_edge_id1|MinkowskiFace::EdgeEdge(e0,directed_edge_id1.as_undirected(),directed_edge_id1.parity()^face_parity)
-					)
-				}))
-			},
-		}
-	}
-	fn edge_verts(&self,edge_id:MinkowskiEdge)->impl AsRef<[MinkowskiVert;2]>{
-		AsRefHelper(match edge_id{
-			MinkowskiEdge::VertEdge(v0,e1)=>self.mesh1.edge_verts(e1).as_ref().map(|vert_id1|
-				MinkowskiVert::VertVert(v0,vert_id1)
-			),
-			MinkowskiEdge::EdgeVert(e0,v1)=>self.mesh0.edge_verts(e0).as_ref().map(|vert_id0|
-				MinkowskiVert::VertVert(vert_id0,v1)
-			),
-		})
-	}
-	fn vert_edges(&self,vert_id:MinkowskiVert)->impl AsRef<[MinkowskiDirectedEdge]>{
-		match vert_id{
-			MinkowskiVert::VertVert(v0,v1)=>{
-				let mut edges=Vec::new();
-				//detect shared volume when the other mesh is mirrored along a test edge dir
-				let v0f_thing=self.mesh0.vert_faces(v0);
-				let v1f_thing=self.mesh1.vert_faces(v1);
-				let v0f=v0f_thing.as_ref();
-				let v1f=v1f_thing.as_ref();
-				let v0f_n:Vec<_>=v0f.iter().map(|&face_id|self.mesh0.face_nd(face_id).0).collect();
-				let v1f_n:Vec<_>=v1f.iter().map(|&face_id|self.mesh1.face_nd(face_id).0).collect();
-				// scratch vector
-				let mut face_normals=Vec::with_capacity(v0f.len()+v1f.len());
-				face_normals.clone_from(&v0f_n);
-				for &directed_edge_id in self.mesh0.vert_edges(v0).as_ref(){
-					let n=self.mesh0.directed_edge_n(directed_edge_id);
-					let nn=n.dot(n);
-					// TODO: there's gotta be a better way to do this
-					// drop faces beyond v0f_n
-					face_normals.truncate(v0f.len());
-					// make a set of faces from mesh0's perspective
-					for face_n in &v1f_n{
-						//add reflected mesh1 faces
-						//wrap for speed
-						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
-					}
-					if is_empty_volume(&face_normals){
-						edges.push(MinkowskiDirectedEdge::EdgeVert(directed_edge_id,v1));
-					}
-				}
-				face_normals.clone_from(&v1f_n);
-				for &directed_edge_id in self.mesh1.vert_edges(v1).as_ref(){
-					let n=self.mesh1.directed_edge_n(directed_edge_id);
-					let nn=n.dot(n);
-					// drop faces beyond v1f_n
-					face_normals.truncate(v1f.len());
-					// make a set of faces from mesh1's perspective
-					for face_n in &v0f_n{
-						//wrap for speed
-						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
-					}
-					if is_empty_volume(&face_normals){
-						edges.push(MinkowskiDirectedEdge::VertEdge(v0,directed_edge_id));
-					}
-				}
-				edges
-			},
-		}
-	}
-	fn vert_faces(&self,_vert_id:MinkowskiVert)->impl AsRef<[MinkowskiFace]>{
-		unimplemented!();
-		#[expect(unreachable_code)]
-		Vec::new()
-	}
-}
-
-fn is_empty_volume(normals:&[Vector3<Fixed<3,96>>])->bool{
-	let len=normals.len();
-	for i in 0..len-1{
-		for j in i+1..len{
-			let n=normals[i].cross(normals[j]);
-			let mut d_comp=None;
-			for k in 0..len{
-				if k!=i&&k!=j{
-					let d=n.dot(normals[k]).is_negative();
-					if let &Some(comp)=&d_comp{
-						// This is testing if d_comp*d < 0
-						if comp^d{
-							return true;
-						}
-					}else{
-						d_comp=Some(d);
-					}
-				}
-			}
-		}
-	}
-	return false;
-}
-
-#[test]
-fn test_is_empty_volume(){
-	assert!(!is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3()]));
-	assert!(is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3(),vec3::NEG_X.widen_3()]));
-}

engine/physics/src/push_solve.rs

@@ -15,6 +15,7 @@ type Conts<'a>=arrayvec::ArrayVec<&'a Contact,4>;
 const RATIO_ZERO:Ratio<Fixed<1,32>,Fixed<1,32>>=Ratio::new(Fixed::ZERO,Fixed::EPSILON);
 
 /// Information about a contact restriction
+#[derive(Debug,PartialEq)]
 pub struct Contact{
 	pub position:Planar64Vec3,
 	pub velocity:Planar64Vec3,
@@ -281,16 +282,16 @@ fn get_first_touch<'a>(contacts:&'a [Contact],ray:&Ray,conts:&Conts)->Option<(Ra
 		.min_by_key(|&(t,_)|t)
 }
 
-pub fn push_solve(contacts:&[Contact],point:Planar64Vec3)->Planar64Vec3{
+pub fn push_solve(contacts:&[Contact],point:Planar64Vec3)->(Planar64Vec3,Conts<'_>){
 	let (mut ray,mut conts)=get_best_push_ray_and_conts_0(point);
 	loop{
 		let (next_t,next_cont)=match get_first_touch(contacts,&ray,&conts){
 			Some((t,cont))=>(t,cont),
-			None=>return ray.origin,
+			None=>return (ray.origin,conts),
 		};
 
 		if RATIO_ZERO.le_ratio(next_t){
-			return ray.origin;
+			return (ray.origin,conts);
 		}
 
 		//push_front
@@ -306,7 +307,7 @@ pub fn push_solve(contacts:&[Contact],point:Planar64Vec3)->Planar64Vec3{
 		let meet_point=ray.extrapolate(next_t);
 		match get_best_push_ray_and_conts(meet_point,conts.as_slice()){
 			Some((new_ray,new_conts))=>(ray,conts)=(new_ray,new_conts),
-			None=>return meet_point,
+			None=>return (meet_point,conts),
 		}
 	}
 }
@@ -323,9 +324,8 @@ mod tests{
 				normal:vec3::Y,
 			}
 		];
-		assert_eq!(
-			vec3::zero(),
-			push_solve(&contacts,vec3::NEG_Y)
-		);
+		let (point,conts)=push_solve(&contacts,vec3::NEG_Y);
+		assert_eq!(point,vec3::zero());
+		assert_eq!(conts.as_slice(),[&contacts[0]].as_slice());
 	}
 }

engine/session/Cargo.toml

@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-glam = "0.30.0"
+glam.workspace = true
 replace_with = "0.1.7"
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
-strafesnet_physics = { path = "../physics", registry = "strafesnet" }
-strafesnet_settings = { path = "../settings", registry = "strafesnet" }
-strafesnet_snf = { path = "../../lib/snf", registry = "strafesnet" }
+strafesnet_common.workspace = true
+strafesnet_physics.workspace = true
+strafesnet_settings.workspace = true
+strafesnet_snf.workspace = true
 
 [lints]
 workspace = true

engine/session/src/session.rs

@@ -52,16 +52,23 @@ pub enum SessionControlInstruction{
 pub enum SessionPlaybackInstruction{
 	SkipForward,
 	SkipBack,
-	TogglePaused,
 	DecreaseTimescale,
 	IncreaseTimescale,
 }
 
 pub struct FrameState{
-	pub body:physics::Body,
+	pub trajectory:physics::Trajectory,
 	pub camera:physics::PhysicsCamera,
 	pub time:PhysicsTime,
 }
+impl FrameState{
+	pub fn pos(&self)->glam::Vec3{
+		self.trajectory.extrapolated_position(self.time).map(Into::<f32>::into).to_array().into()
+	}
+	pub fn angles(&self)->glam::Vec2{
+		self.camera.simulate_move_angles(glam::IVec2::ZERO)
+	}
+}
 
 pub struct Simulation{
 	timer:Timer<Scaled<SessionTimeInner,PhysicsTimeInner>>,
@@ -77,9 +84,9 @@ impl Simulation{
 			physics,
 		}
 	}
-	pub fn get_frame_state(&self,time:SessionTime)->FrameState{
+	pub fn get_frame_state(&self,time:SessionTime,data:&PhysicsData)->FrameState{
 		FrameState{
-			body:self.physics.camera_body(),
+			trajectory:self.physics.camera_trajectory(data),
 			camera:self.physics.camera(),
 			time:self.timer.time(time),
 		}
@@ -188,9 +195,9 @@ impl Session{
 	}
 	pub fn get_frame_state(&self,time:SessionTime)->Option<FrameState>{
 		match &self.view_state{
-			ViewState::Play=>Some(self.simulation.get_frame_state(time)),
+			ViewState::Play=>Some(self.simulation.get_frame_state(time,&self.geometry_shared)),
 			ViewState::Replay(bot_id)=>self.replays.get(bot_id).map(|replay|
-				replay.simulation.get_frame_state(time)
+				replay.simulation.get_frame_state(time,&self.geometry_shared)
 			),
 		}
 	}
@@ -239,12 +246,16 @@ impl InstructionConsumer<Instruction<'_>> for Session{
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Mode(ModeInstruction::Reset));
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Misc(MiscInstruction::SetSensitivity(self.user_settings().calculate_sensitivity())));
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Mode(ModeInstruction::Restart(mode_id)));
+				// TODO: think about this harder.  This works around a bug where you fall infinitely when you reset.
+				self.simulation.timer.set_time(ins.time,PhysicsTime::ZERO);
 			},
 			Instruction::Input(SessionInputInstruction::Mode(ImplicitModeInstruction::ResetAndSpawn(mode_id,spawn_id)))=>{
 				self.clear_recording();
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Mode(ModeInstruction::Reset));
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Misc(MiscInstruction::SetSensitivity(self.user_settings().calculate_sensitivity())));
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Mode(ModeInstruction::Spawn(mode_id,spawn_id)));
+				// TODO: think about this harder.  This works around a bug where you fall infinitely when you reset.
+				self.simulation.timer.set_time(ins.time,PhysicsTime::ZERO);
 			},
 			Instruction::Input(SessionInputInstruction::Misc(misc_instruction))=>{
 				run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Misc(misc_instruction));
@@ -253,7 +264,14 @@ impl InstructionConsumer<Instruction<'_>> for Session{
 				// don't flush the buffered instructions in the mouse interpolator
 				// until the mouse is confirmed to be not moving at a later time
 				// what if they pause for 5ms lmao
-				_=self.simulation.timer.set_paused(ins.time,paused);
+				match &self.view_state{
+					ViewState::Play=>{
+						_=self.simulation.timer.set_paused(ins.time,paused);
+					},
+					ViewState::Replay(bot_id)=>if let Some(replay)=self.replays.get_mut(bot_id){
+						_=replay.simulation.timer.set_paused(ins.time,paused);
+					},
+				}
 			},
 			Instruction::Control(SessionControlInstruction::CopyRecordingIntoReplayAndSpectate)=> if let ViewState::Play=self.view_state{
 				// Bind: B
@@ -374,14 +392,6 @@ impl InstructionConsumer<Instruction<'_>> for Session{
 					},
 				}
 			},
-			Instruction::Playback(SessionPlaybackInstruction::TogglePaused)=>{
-				match &self.view_state{
-					ViewState::Play=>(),
-					ViewState::Replay(bot_id)=>if let Some(replay)=self.replays.get_mut(bot_id){
-						_=replay.simulation.timer.set_paused(ins.time,!replay.simulation.timer.is_paused());
-					},
-				}
-			}
 			Instruction::ChangeMap(complete_map)=>{
 				self.clear_recording();
 				self.change_map(complete_map);

engine/settings/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2024"
 [dependencies]
 configparser = "3.0.2"
 directories = "6.0.0"
-glam = "0.30.0"
-strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
+glam.workspace = true
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

integration-testing/Cargo.toml

@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-glam = "0.30.0"
-strafesnet_common = { path = "../lib/common", registry = "strafesnet" }
-strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
-strafesnet_snf = { path = "../lib/snf", registry = "strafesnet" }
+glam.workspace = true
+strafesnet_common.workspace = true
+strafesnet_physics.workspace = true
+strafesnet_snf.workspace = true
 # this is just for the primitive constructor
-strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet" }
+strafesnet_rbx_loader.workspace = true
 
 [lints]
 workspace = true

integration-testing/src/main.rs

@@ -71,16 +71,16 @@ fn segment_determinism(bot:strafesnet_snf::bot::Segment,physics_data:&PhysicsDat
 	for (i,ins) in bot.instructions.into_iter().enumerate(){
 		let state_deterministic=physics_deterministic.clone();
 		let state_filtered=physics_filtered.clone();
-		PhysicsContext::run_input_instruction(&mut physics_deterministic,&physics_data,ins.clone());
+		PhysicsContext::run_input_instruction(&mut physics_deterministic,physics_data,ins.clone());
 		match ins{
 			strafesnet_common::instruction::TimedInstruction{instruction:strafesnet_common::physics::Instruction::Idle,..}=>(),
 			other=>{
 				non_idle_count+=1;
 				// run
-				PhysicsContext::run_input_instruction(&mut physics_filtered,&physics_data,other.clone());
+				PhysicsContext::run_input_instruction(&mut physics_filtered,physics_data,other.clone());
 				// check if position matches
-				let b0=physics_deterministic.camera_body();
-				let b1=physics_filtered.camera_body();
+				let b0=physics_deterministic.camera_trajectory(physics_data);
+				let b1=physics_filtered.camera_trajectory(physics_data);
 				if b0.position!=b1.position{
 					let nanoseconds=start.elapsed().as_nanos() as u64;
 					println!("desync at instruction #{}",i);

integration-testing/src/test_scenes.rs

@@ -73,7 +73,6 @@ fn simultaneous_collision(){
 	let body=strafesnet_physics::physics::Body::new(
 		(vec3::int(5+2,0,0)>>1)+vec3::int(1,1,0),
 		vec3::int(-1,-1,0),
-		vec3::int(0,0,0),
 		Time::ZERO,
 	);
 	let mut physics=PhysicsState::new_with_body(body);
@@ -88,7 +87,6 @@ fn simultaneous_collision(){
 	let body=physics.body();
 	assert_eq!(body.position,vec3::int(5,0,0));
 	assert_eq!(body.velocity,vec3::int(0,0,0));
-	assert_eq!(body.acceleration,vec3::int(0,0,0));
 	assert_eq!(body.time,Time::from_secs(1));
 }
 #[test]
@@ -97,7 +95,6 @@ fn bug_3(){
 	let body=strafesnet_physics::physics::Body::new(
 		(vec3::int(5+2,0,0)>>1)+vec3::int(1,2,0),
 		vec3::int(-1,-1,0),
-		vec3::int(0,0,0),
 		Time::ZERO,
 	);
 	let mut physics=PhysicsState::new_with_body(body);
@@ -112,6 +109,5 @@ fn bug_3(){
 	let body=physics.body();
 	assert_eq!(body.position,vec3::int(5+2,0,0)>>1);
 	assert_eq!(body.velocity,vec3::int(0,0,0));
-	assert_eq!(body.acceleration,vec3::int(0,0,0));
 	assert_eq!(body.time,Time::from_secs(2));
 }

integration-testing/src/tests.rs

@@ -22,7 +22,6 @@ fn physics_bug_2()->Result<(),ReplayError>{
 	let body=strafesnet_physics::physics::Body::new(
 		vec3::raw_xyz(555690659654,1490485868773,1277783839382),
 		vec3::int(0,0,0),
-		vec3::int(0,-100,0),
 		Time::ZERO,
 	);
 	let mut physics=PhysicsState::new_with_body(body);
@@ -60,9 +59,12 @@ fn physics_bug_3()->Result<(),ReplayError>{
 		// vec3::raw_xyz(0,-96915585363,1265),
 		// vec3::raw_xyz(0,-429496729600,0),
 		// corner setup before wall hits
-		vec3::raw_xyz(-1392580080675,3325402529458,-2444727738679),
-		vec3::raw_xyz(-30259028820,-22950929553,-71141663007),
-		vec3::raw_xyz(0,-429496729600,0),
+		// vec3::raw_xyz(-1392580080675,3325402529458,-2444727738679),
+		// vec3::raw_xyz(-30259028820,-22950929553,-71141663007),
+		// vec3::raw_xyz(0,-429496729600,0),
+		// Actual bug 3 repro
+		vec3::raw_xyz(-2505538624455,3357963283914,557275711118),
+		vec3::raw_xyz(204188283920,-282280474198,166172785440),
 		Time::ZERO,
 	);
 	let mut physics=PhysicsState::new_with_body(body);

lib/bsp_loader/Cargo.toml

@@ -10,9 +10,9 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-glam = "0.30.0"
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
+glam.workspace = true
+strafesnet_common.workspace = true
+strafesnet_deferred_loader.workspace = true
 vbsp = "0.9.1"
 vbsp-entities-css = "0.6.0"
 vmdl = "0.2.0"

lib/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_common"
-version = "0.7.0"
+version = "0.8.3"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -12,10 +12,10 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 [dependencies]
 arrayvec = "0.7.4"
 bitflags = "2.6.0"
-fixed_wide = { version = "0.2.0", path = "../fixed_wide", registry = "strafesnet", features = ["deferred-division","zeroes","wide-mul"] }
-linear_ops = { version = "0.1.1", path = "../linear_ops", registry = "strafesnet", features = ["deferred-division","named-fields"] }
-ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet" }
-glam = "0.30.0"
+fixed_wide = { workspace = true, features = ["deferred-division","zeroes","wide-mul"] }
+linear_ops = { workspace = true, features = ["deferred-division","named-fields"] }
+ratio_ops = { workspace = true }
+glam.workspace = true
 id = { version = "0.1.0", registry = "strafesnet" }
 
 [lints]

lib/common/src/integer.rs

@@ -149,10 +149,23 @@ impl_time_i64_rhs_operator!(Shr,shr);
 impl_time_i64_rhs_operator!(Shl,shl);
 impl<T> core::ops::Mul<Time<T>> for Planar64{
 	type Output=Ratio<Fixed<2,64>,Planar64>;
+	#[inline]
 	fn mul(self,rhs:Time<T>)->Self::Output{
 		Ratio::new(self*Fixed::raw(rhs.0),Planar64::raw(1_000_000_000))
 	}
 }
+impl<T> From<Time<T>> for f32{
+	#[inline]
+	fn from(value:Time<T>)->Self{
+		value.get() as f32/Time::<T>::ONE_SECOND.get() as f32
+	}
+}
+impl<T> From<Time<T>> for f64{
+	#[inline]
+	fn from(value:Time<T>)->Self{
+		value.get() as f64/Time::<T>::ONE_SECOND.get() as f64
+	}
+}
 #[cfg(test)]
 mod test_time{
 	use super::*;
@@ -214,11 +227,11 @@ impl Ratio64{
 	}
 	#[inline]
 	pub const fn mul_int(&self,rhs:i64)->i64{
-		rhs*self.num/(self.den as i64)
+		(rhs as i128*self.num as i128/self.den as i128) as i64
 	}
 	#[inline]
 	pub const fn rhs_div_int(&self,rhs:i64)->i64{
-		rhs*(self.den as i64)/self.num
+		(rhs as i128*self.den as i128/self.num as i128) as i64
 	}
 	#[inline]
 	pub const fn mul_ref(&self,rhs:&Ratio64)->Ratio64{
@@ -263,7 +276,6 @@ fn integer_decode_f64(f: f64) -> (u64, i16, i8) {
 pub enum Ratio64TryFromFloatError{
 	Nan,
 	Infinite,
-	Subnormal,
 	HighlyNegativeExponent(i16),
 	HighlyPositiveExponent(i16),
 }
@@ -298,8 +310,10 @@ fn ratio64_from_mes((m,e,s):(u64,i16,i8))->Result<Ratio64,Ratio64TryFromFloatErr
 
 		Ok(Ratio64::new(num as i64,den as u64).unwrap())
 	}else if e<0{
+		// simple exact representation
 		Ok(Ratio64::new((m as i64)*(s as i64),1<<-e).unwrap())
 	}else if (64-m.leading_zeros() as i16)+e<64{
+		// integer
 		Ok(Ratio64::new((m as i64)*(s as i64)*(1<<e),1).unwrap())
 	}else{
 		Err(Ratio64TryFromFloatError::HighlyPositiveExponent(e))
@@ -331,6 +345,29 @@ impl TryFrom<f64> for Ratio64{
 		}
 	}
 }
+#[cfg(test)]
+fn req(r0:Ratio64,r1:Ratio64){
+	println!("r0={r0:?} r1={r1:?}");
+	assert_eq!(r0.num(),r1.num(),"Nums not eq");
+	assert_eq!(r0.den(),r1.den(),"Dens not eq");
+}
+#[test]
+fn test_ratio64_from_float(){
+	req(2.0.try_into().unwrap(),Ratio64::new(2,1).unwrap());
+	req(1.0.try_into().unwrap(),Ratio64::new(1,1).unwrap());
+	req(0.5.try_into().unwrap(),Ratio64::new(1,2).unwrap());
+	req(1.1.try_into().unwrap(),Ratio64::new(2476979795053773,2251799813685248).unwrap());
+	req(0.8.try_into().unwrap(),Ratio64::new(3602879701896397,4503599627370496).unwrap());
+	req(0.61.try_into().unwrap(),Ratio64::new(5494391545392005,9007199254740992).unwrap());
+	req(0.01.try_into().unwrap(),Ratio64::new(5764607523034235,576460752303423488).unwrap());
+	req(0.001.try_into().unwrap(),Ratio64::new(1152921504606847,1152921504606846976).unwrap());
+	req(0.00001.try_into().unwrap(),Ratio64::new(89605456633725,8960545663372499267).unwrap());
+	req(0.00000000001.try_into().unwrap(),Ratio64::new(35204848,3520484800000000213).unwrap());
+	req(0.000000000000000001.try_into().unwrap(),Ratio64::new(11,10999999999999999213).unwrap());
+	req(2222222222222.0.try_into().unwrap(),Ratio64::new(2222222222222,1).unwrap());
+	req(core::f64::consts::PI.try_into().unwrap(),Ratio64::new(884279719003555,281474976710656).unwrap());
+}
+
 impl std::ops::Mul<Ratio64> for Ratio64{
 	type Output=Ratio64;
 	#[inline]

lib/common/src/physics.rs

@@ -36,6 +36,7 @@ pub enum SetControlInstruction{
 	SetMoveForward(bool),
 	SetJump(bool),
 	SetZoom(bool),
+	SetSprint(bool),
 }
 #[derive(Clone,Debug)]
 pub enum ModeInstruction{

lib/common/src/run.rs

@@ -53,36 +53,23 @@ impl std::fmt::Display for Error{
 impl std::error::Error for Error{}
 
 #[derive(Clone,Copy,Debug)]
-enum RunState{
+pub enum RunState{
 	Created,
 	Started{timer:TimerFixed<Realtime<PhysicsTimeInner,TimeInner>,Unpaused>},
 	Finished{timer:TimerFixed<Realtime<PhysicsTimeInner,TimeInner>,Paused>},
 }
-
-#[derive(Clone,Copy,Debug)]
-pub struct Run{
-	state:RunState,
-	flagged:Option<FlagReason>,
-}
-
-impl Run{
-	pub fn new()->Self{
-		Self{
-			state:RunState::Created,
-			flagged:None,
-		}
-	}
+impl RunState{
 	pub fn time(&self,time:PhysicsTime)->Time{
-		match &self.state{
+		match &self{
 			RunState::Created=>Time::ZERO,
 			RunState::Started{timer}=>timer.time(time),
 			RunState::Finished{timer}=>timer.time(),
 		}
 	}
 	pub fn start(&mut self,time:PhysicsTime)->Result<(),Error>{
-		match &self.state{
+		match &self{
 			RunState::Created=>{
-				self.state=RunState::Started{
+				*self=RunState::Started{
 					timer:TimerFixed::new(time,Time::ZERO),
 				};
 				Ok(())
@@ -93,10 +80,10 @@ impl Run{
 	}
 	pub fn finish(&mut self,time:PhysicsTime)->Result<(),Error>{
 		//this uses Copy
-		match &self.state{
+		match &self{
 			RunState::Created=>Err(Error::NotStarted),
 			RunState::Started{timer}=>{
-				self.state=RunState::Finished{
+				*self=RunState::Finished{
 					timer:timer.into_paused(time),
 				};
 				Ok(())
@@ -104,12 +91,39 @@ impl Run{
 			RunState::Finished{..}=>Err(Error::AlreadyFinished),
 		}
 	}
+}
+
+#[derive(Clone,Copy,Debug)]
+pub struct Run{
+	state:RunState,
+	flag_reason:Option<FlagReason>,
+}
+
+impl Run{
+	pub fn new()->Self{
+		Self{
+			state:RunState::Created,
+			flag_reason:None,
+		}
+	}
+	pub fn time(&self,time:PhysicsTime)->Time{
+		self.state.time(time)
+	}
+	pub fn start(&mut self,time:PhysicsTime)->Result<(),Error>{
+		self.state.start(time)
+	}
+	pub fn finish(&mut self,time:PhysicsTime)->Result<(),Error>{
+		self.state.finish(time)
+	}
 	pub fn flag(&mut self,flag_reason:FlagReason){
 		//don't replace the first reason the run was flagged
-		if self.flagged.is_none(){
-			self.flagged=Some(flag_reason);
+		if self.flag_reason.is_none(){
+			self.flag_reason=Some(flag_reason);
 		}
 	}
+	pub fn flag_reason(&self)->Option<FlagReason>{
+		self.flag_reason
+	}
 	pub fn get_finish_time(&self)->Option<Time>{
 		match &self.state{
 			RunState::Finished{timer}=>Some(timer.time()),

lib/deferred_loader/Cargo.toml

@@ -10,7 +10,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

lib/fixed_wide/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fixed_wide"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -17,7 +17,7 @@ zeroes=["dep:arrayvec"]
 bnum = "0.13.0"
 arrayvec = { version = "0.7.6", optional = true }
 paste = "1.0.15"
-ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
+ratio_ops = { workspace = true, optional = true }
 
 [lints]
 workspace = true

lib/fixed_wide/src/fixed.rs

@@ -7,7 +7,7 @@ const BNUM_DIGIT_WIDTH:usize=64;
 /// N is the number of u64s to use
 /// F is the number of fractional bits (always N*32 lol)
 pub struct Fixed<const N:usize,const F:usize>{
-	pub(crate)bits:BInt<{N}>,
+	bits:BInt<{N}>,
 }
 
 impl<const N:usize,const F:usize> Fixed<N,F>{
@@ -545,7 +545,7 @@ impl_shift_operator!( Fixed, Shr, shr, Self );
 
 // wide operators.  The result width is the sum of the input widths, i.e. none of the multiplication
 
-#[expect(unused_macros)]
+#[allow(unused_macros)]
 macro_rules! impl_wide_operators{
 	($lhs:expr,$rhs:expr)=>{
 		impl core::ops::Mul<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{

lib/linear_ops/Cargo.toml

@@ -14,12 +14,12 @@ fixed-wide=["dep:fixed_wide","dep:paste"]
 deferred-division=["dep:ratio_ops"]
 
 [dependencies]
-ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
-fixed_wide = { version = "0.2.0", path = "../fixed_wide", registry = "strafesnet", optional = true }
+ratio_ops = { workspace = true, optional = true }
+fixed_wide = { workspace = true, optional = true }
 paste = { version = "1.0.15", optional = true }
 
 [dev-dependencies]
-fixed_wide = { path = "../fixed_wide", registry = "strafesnet", features = ["wide-mul"] }
+fixed_wide = { workspace = true, features = ["wide-mul"] }
 
 [lints]
 workspace = true

lib/rbx_loader/Cargo.toml

@@ -11,13 +11,13 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 bytemuck = "1.14.3"
-glam = "0.30.0"
-regex = { version = "1.11.3", default-features = false }
+glam.workspace = true
+regex = { version = "1.11.3", default-features = false, features = ["unicode-perl"] }
 rbx_mesh = "0.5.0"
 rbxassetid = { version = "0.1.0", path = "../rbxassetid", registry = "strafesnet" }
 roblox_emulator = { version = "0.5.1", path = "../roblox_emulator", default-features = false, registry = "strafesnet" }
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
+strafesnet_common.workspace = true
+strafesnet_deferred_loader.workspace = true
 rbx_binary = "2.0.1"
 rbx_dom_weak = "4.1.0"
 rbx_reflection = "6.1.0"

lib/rbx_loader/src/rbx.rs

@@ -867,6 +867,11 @@ impl PartialMap1<'_>{
 				deferred_model_deferred_attributes.model.mesh,
 				deferred_model_deferred_attributes.render
 			)?;
+			// If the mesh size is zero we can't auto-scale it, throw it out.
+			if mesh_size.x==integer::Fixed::ZERO||mesh_size.y==integer::Fixed::ZERO||mesh_size.z==integer::Fixed::ZERO{
+				print!("[rbx_loader] Mesh with zero size!");
+				return None;
+			}
 			Some(ModelDeferredAttributes{
 				mesh,
 				deferred_attributes:deferred_model_deferred_attributes.model.deferred_attributes,

lib/rbx_loader/src/union.rs

@@ -104,7 +104,7 @@ fn build_mesh2(
 		if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
 			polygon_groups_normal_id[normal_id as usize-1].push(face);
 		}else{
-			panic!("Empty face!");
+			print!("[union] Empty face!");
 		}
 	}
 	Ok(())
@@ -158,7 +158,7 @@ fn build_mesh5(
 		if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
 			polygon_groups_normal_id[normal_id as usize-1].push(face);
 		}else{
-			panic!("Empty face!");
+			print!("[union] Empty face!");
 		}
 	}
 	Ok(())

lib/roblox_emulator/Cargo.toml

@@ -12,7 +12,7 @@ default=["run-service"]
 run-service=[]
 
 [dependencies]
-glam = "0.30.0"
+glam.workspace = true
 mlua = { version = "0.11.3", features = ["luau"] }
 phf = { version = "0.13.1", features = ["macros"] }
 rbx_dom_weak = "4.1.0"

lib/snf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_snf"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,7 +8,7 @@ edition = "2024"
 [dependencies]
 binrw = "0.15.0"
 id = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
+strafesnet_common.workspace = true
 
 [lints]
 workspace = true

lib/snf/src/bot.rs

@@ -81,6 +81,15 @@ pub struct SegmentId(u32);
 pub struct Segment{
 	pub instructions:Vec<TimedPhysicsInstruction>
 }
+impl Segment{
+	fn append<R:BinReaderExt>(&mut self,segment_info:&SegmentInfo,mut data:R)->Result<(),Error>{
+		for _ in 0..segment_info.instruction_count{
+			let instruction:newtypes::physics::TimedInstruction=data.read_le().map_err(Error::InvalidSegment)?;
+			self.instructions.push(instruction.try_into().map_err(Error::SegmentConvert)?);
+		}
+		Ok(())
+	}
+}
 
 #[derive(Clone,Copy,Debug)]
 pub struct SegmentInfo{
@@ -94,14 +103,13 @@ pub struct SegmentInfo{
 	block_id:BlockId,
 }
 
-pub struct StreamableBot<R:BinReaderExt>{
-	file:crate::file::File<R>,
+pub struct StreamableBot{
 	segment_map:Vec<SegmentInfo>,
 }
-impl<R:BinReaderExt> StreamableBot<R>{
-	pub(crate) fn new(mut file:crate::file::File<R>)->Result<Self,Error>{
+impl StreamableBot{
+	pub(crate) fn new<R:BinReaderExt>(mut data:R)->Result<Self,Error>{
 		//assume the file seek is in the right place to start reading header
-		let header:Header=file.data_mut().read_le().map_err(Error::InvalidHeader)?;
+		let header:Header=data.read_le().map_err(Error::InvalidHeader)?;
 		let mut instructions_subtotal=0;
 		let segment_map=header.segments.into_iter().map(|SegmentHeader{time,instruction_count,block_id}|{
 			instructions_subtotal+=instruction_count as u64;
@@ -113,13 +121,12 @@ impl<R:BinReaderExt> StreamableBot<R>{
 			}
 		}).collect();
 		Ok(Self{
-			file,
 			segment_map,
 		})
 	}
 	#[expect(dead_code)]
-	fn get_segment_info(&self,segment_id:SegmentId)->Result<SegmentInfo,Error>{
-		Ok(*self.segment_map.get(segment_id.get() as usize).ok_or(Error::InvalidSegmentId(segment_id))?)
+	fn get_segment_info(&self,segment_id:SegmentId)->Result<&SegmentInfo,Error>{
+		self.segment_map.get(segment_id.get() as usize).ok_or(Error::InvalidSegmentId(segment_id))
 	}
 	pub fn find_segments_instruction_range(&self,start_instruction:u64,end_instruction:u64)->&[SegmentInfo]{
 		let start=self.segment_map.partition_point(|segment_info|segment_info.instructions_subtotal<start_instruction);
@@ -132,28 +139,21 @@ impl<R:BinReaderExt> StreamableBot<R>{
 	// 	let end=self.segment_map.partition_point(|segment_info|segment_info.time<end_time);
 	// 	&self.segment_map[start..=end]
 	// }
-	fn append_to_segment(&mut self,segment_info:SegmentInfo,segment:&mut Segment)->Result<(),Error>{
-		let mut block=self.file.block_reader(segment_info.block_id).map_err(Error::File)?;
-		for _ in 0..segment_info.instruction_count{
-			let instruction:newtypes::physics::TimedInstruction=block.read_le().map_err(Error::InvalidSegment)?;
-			segment.instructions.push(instruction.try_into().map_err(Error::SegmentConvert)?);
-		}
-		Ok(())
-	}
-	pub fn load_segment(&mut self,segment_info:SegmentInfo)->Result<Segment,Error>{
+	pub fn load_segment<R:BinReaderExt>(&self,segment_info:&SegmentInfo,mut data:R)->Result<Segment,Error>{
 		let mut segment=Segment{
 			instructions:Vec::with_capacity(segment_info.instruction_count as usize),
 		};
-		self.append_to_segment(segment_info,&mut segment)?;
+		segment.append(segment_info,data)?;
 		Ok(segment)
 	}
-	pub fn read_all(&mut self)->Result<Segment,Error>{
+	pub fn read_all<R:BinReaderExt>(self,header:&crate::file::Header,mut data:R)->Result<Segment,Error>{
 		let mut segment=Segment{
 			instructions:Vec::new(),
 		};
-		for i in 0..self.segment_map.len(){
-			let segment_info=self.segment_map[i];
-			self.append_to_segment(segment_info,&mut segment)?;
+		for segment_info in &self.segment_map{
+			let block_info=header.block_info(segment_info.block_id).map_err(Error::File)?;
+			let block=block_info.take_seek(&mut data).map_err(Error::IO)?;
+			segment.append(segment_info,block)?;
 		}
 		Ok(segment)
 	}

lib/snf/src/file.rs

@@ -1,6 +1,8 @@
 //file format "sniff"
-
-use binrw::{binrw,BinReaderExt,io::TakeSeekExt};
+use std::io::{SeekFrom,Error as IoError};
+use binrw::binrw;
+use binrw::BinReaderExt;
+use binrw::io::{TakeSeek,TakeSeekExt};
 
 #[derive(Debug)]
 pub enum Error{
@@ -54,65 +56,69 @@ pub(crate) enum FourCC{
 	#[brw(magic=b"SNFB")]
 	Bot,
 }
+
+#[binrw]
+#[brw(little)]
+#[derive(Clone,Copy,Debug,Hash,id::Id,Eq,Ord,PartialEq,PartialOrd)]
+pub struct BlockId(u32);
+#[binrw]
+#[brw(little)]
+#[derive(Debug,Clone)]
+struct BlockPosition(u64);
+
+/// The range of data for a specific Block, relative to the start of the file.
+#[derive(Debug,Clone)]
+pub struct BlockInfo(core::ops::Range<u64>);
+impl BlockInfo{
+	/// Create an adapter which seeks to the block start and reads at most the block length.
+	pub fn take_seek<R:BinReaderExt>(&self,mut data:R)->Result<TakeSeek<R>,IoError>{
+		data.seek(SeekFrom::Start(self.start))?;
+		Ok(data.take_seek(self.end-self.start))
+	}
+}
+impl core::ops::Deref for BlockInfo{
+	type Target=core::ops::Range<u64>;
+	fn deref(&self)->&Self::Target{
+		&self.0
+	}
+}
+
 #[binrw]
 #[brw(little)]
 #[derive(Debug)]
 pub struct Header{
 	/// Type of file
-	pub fourcc:FourCC,
+	fourcc:FourCC,
 	/// File format version
-	pub version:u32,
+	version:u32,
 	/// Minimum data required to know the location of all streamable resources for this specific file
-	pub priming:u64,
+	priming:u64,
 	/// uuid for this file
-	pub resource:u128,
+	resource:u128,
 	//don't need try_calc: the struct will force field initialization anyways and it can be calculated there
-	pub block_count:u32,
+	block_count:u32,
 	#[br(count=block_count+1)]
-	pub block_location:Vec<u64>,
+	block_positions:Vec<BlockPosition>,
 }
 impl Header{
+	pub const fn fourcc(&self)->FourCC{
+		self.fourcc
+	}
 	pub const fn calculate_size(block_count:u32)->usize{
 		4 // fourcc
 		+4 // version
 		+8 // priming
 		+16 // resource
 		+4 // block_count
-		+(block_count as usize+1)*8 // block_location
+		+(block_count as usize+1)*8 // block_positions
 	}
-}
-
-#[binrw]
-#[brw(little)]
-#[derive(Clone,Copy,Debug,Hash,id::Id,Eq,Ord,PartialEq,PartialOrd)]
-pub struct BlockId(u32);
-
-pub(crate) struct File<R:BinReaderExt>{
-	header:Header,
-	//reference to the data
-	data:R,
-}
-
-impl<R:BinReaderExt> File<R>{
-	pub(crate) fn new(mut input:R)->Result<File<R>,Error>{
-		Ok(File{
-			header:input.read_le().map_err(Error::InvalidHeader)?,
-			data:input,
-		})
-	}
-	pub(crate) fn data_mut(&mut self)->&mut R{
-		&mut self.data
-	}
-	pub(crate) fn block_reader(&mut self,block_id:BlockId)->Result<binrw::io::TakeSeek<&mut R>,Error>{
-		if self.header.block_location.len() as u32<=block_id.get(){
+	pub fn block_info(&self,block_id:BlockId)->Result<BlockInfo,Error>{
+		let BlockId(id)=block_id;
+		if self.block_positions.len() as u32<=id{
 			return Err(Error::InvalidBlockId(block_id))
 		}
-		let block_start=self.header.block_location[block_id.get() as usize];
-		let block_end=self.header.block_location[block_id.get() as usize+1];
-		self.data.seek(std::io::SeekFrom::Start(block_start)).map_err(Error::Seek)?;
-		Ok(self.data_mut().take_seek(block_end-block_start))
-	}
-	pub(crate) fn fourcc(&self)->FourCC{
-		self.header.fourcc
+		let BlockPosition(start)=self.block_positions[id as usize];
+		let BlockPosition(end)=self.block_positions[id as usize+1];
+		Ok(BlockInfo(start..end))
 	}
 }

lib/snf/src/lib.rs

@@ -20,31 +20,34 @@ impl std::fmt::Display for Error{
 }
 impl std::error::Error for Error{}
 
-pub enum SNF<R:BinReaderExt>{
-	Map(map::StreamableMap<R>),
-	Bot(bot::StreamableBot<R>),
+pub enum SNF{
+	Map(map::StreamableMap),
+	Bot(bot::StreamableBot),
 }
 
-pub fn read_snf<R:BinReaderExt>(input:R)->Result<SNF<R>,Error>{
-	let file=file::File::new(input).map_err(Error::Header)?;
-	Ok(match file.fourcc(){
-		file::FourCC::Map=>SNF::Map(map::StreamableMap::new(file).map_err(Error::Map)?),
-		file::FourCC::Bot=>SNF::Bot(bot::StreamableBot::new(file).map_err(Error::Bot)?),
-	})
+pub fn read_snf<R:BinReaderExt>(mut input:R)->Result<(file::Header,SNF),Error>{
+	let file:file::Header=input.read_le().map_err(|e|Error::Header(file::Error::InvalidHeader(e)))?;
+	let snf=match file.fourcc(){
+		file::FourCC::Map=>SNF::Map(map::StreamableMap::new(input).map_err(Error::Map)?),
+		file::FourCC::Bot=>SNF::Bot(bot::StreamableBot::new(input).map_err(Error::Bot)?),
+	};
+	Ok((file,snf))
 }
-pub fn read_map<R:BinReaderExt>(input:R)->Result<map::StreamableMap<R>,Error>{
-	let file=file::File::new(input).map_err(Error::Header)?;
-	match file.fourcc(){
-		file::FourCC::Map=>Ok(map::StreamableMap::new(file).map_err(Error::Map)?),
-		_=>Err(Error::UnexpectedFourCC)
-	}
+pub fn read_map<R:BinReaderExt>(mut input:R)->Result<(file::Header,map::StreamableMap),Error>{
+	let file:file::Header=input.read_le().map_err(|e|Error::Header(file::Error::InvalidHeader(e)))?;
+	let map=match file.fourcc(){
+		file::FourCC::Map=>map::StreamableMap::new(input).map_err(Error::Map)?,
+		_=>return Err(Error::UnexpectedFourCC)
+	};
+	Ok((file,map))
 }
-pub fn read_bot<R:BinReaderExt>(input:R)->Result<bot::StreamableBot<R>,Error>{
-	let file=file::File::new(input).map_err(Error::Header)?;
-	match file.fourcc(){
-		file::FourCC::Bot=>Ok(bot::StreamableBot::new(file).map_err(Error::Bot)?),
-		_=>Err(Error::UnexpectedFourCC)
-	}
+pub fn read_bot<R:BinReaderExt>(mut input:R)->Result<(file::Header,bot::StreamableBot),Error>{
+	let file:file::Header=input.read_le().map_err(|e|Error::Header(file::Error::InvalidHeader(e)))?;
+	let bot=match file.fourcc(){
+		file::FourCC::Bot=>bot::StreamableBot::new(input).map_err(Error::Bot)?,
+		_=>return Err(Error::UnexpectedFourCC)
+	};
+	Ok((file,bot))
 }
 
 #[cfg(test)]

lib/snf/src/map.rs

@@ -155,31 +155,27 @@ struct Region{
 }
 
 //code deduplication reused in into_complete_map
-fn read_region<R:BinReaderExt>(file:&mut crate::file::File<R>,block_id:BlockId)->Result<Vec<(model::ModelId,model::Model)>,Error>{
+pub fn read_region<R:BinReaderExt>(mut data:R)->Result<Vec<(model::ModelId,model::Model)>,Error>{
 	//load region from disk
 	//parse the models and determine what resources need to be loaded
 	//load resources into self.resources
 	//return Region
-	let mut block=file.block_reader(block_id).map_err(Error::File)?;
-	let region:Region=block.read_le().map_err(Error::InvalidData)?;
+	let region:Region=data.read_le().map_err(Error::InvalidData)?;
 	Ok(region.models.into_iter().map(|(model_id,model)|
 		(model::ModelId::new(model_id),model.into())
 	).collect())
 }
-fn read_mesh<R:BinReaderExt>(file:&mut crate::file::File<R>,block_id:BlockId)->Result<model::Mesh,Error>{
-	let mut block=file.block_reader(block_id).map_err(Error::File)?;
-	let mesh:newtypes::model::Mesh=block.read_le().map_err(Error::InvalidData)?;
+pub fn read_mesh<R:BinReaderExt>(mut data:R)->Result<model::Mesh,Error>{
+	let mesh:newtypes::model::Mesh=data.read_le().map_err(Error::InvalidData)?;
 	Ok(mesh.into())
 }
-fn read_texture<R:BinReaderExt>(file:&mut crate::file::File<R>,block_id:BlockId)->Result<Vec<u8>,Error>{
-	let mut block=file.block_reader(block_id).map_err(Error::File)?;
+pub fn read_texture<R:BinReaderExt>(mut data:R)->Result<Vec<u8>,Error>{
 	let mut texture=Vec::new();
-	block.read_to_end(&mut texture).map_err(Error::IO)?;
+	data.read_to_end(&mut texture).map_err(Error::IO)?;
 	Ok(texture)
 }
 
-pub struct StreamableMap<R:BinReaderExt>{
-	file:crate::file::File<R>,
+pub struct StreamableMap{
 	//this includes every platform... move the unconstrained datas to their appropriate data block?
 	modes:gameplay_modes::NormalizedModes,
 	//this is every possible attribute... need some sort of streaming system
@@ -192,10 +188,10 @@ pub struct StreamableMap<R:BinReaderExt>{
 	resource_blocks:ResourceMap<BlockId>,
 	//resource_external:ResourceMap<ResourceId>,
 }
-impl<R:BinReaderExt> StreamableMap<R>{
-	pub(crate) fn new(mut file:crate::file::File<R>)->Result<Self,Error>{
+impl StreamableMap{
+	pub(crate) fn new<R:BinReaderExt>(mut data:R)->Result<Self,Error>{
 		//assume the file seek is in the right place to start reading a map header
-		let header:MapHeader=file.data_mut().read_le().map_err(Error::InvalidHeader)?;
+		let header:MapHeader=data.read_le().map_err(Error::InvalidHeader)?;
 		let modes=header.modes.into_iter().map(TryInto::try_into).collect::<Result<_,_>>().map_err(Error::InvalidMode)?;
 		let attributes=header.attributes.into_iter().map(Into::into).collect();
 		let render_configs=header.render_configs.into_iter().map(Into::into).collect();
@@ -222,7 +218,6 @@ impl<R:BinReaderExt> StreamableMap<R>{
 			}
 		}
 		Ok(Self{
-			file,
 			modes:gameplay_modes::NormalizedModes::new(modes),
 			attributes,
 			render_configs,
@@ -236,18 +231,13 @@ impl<R:BinReaderExt> StreamableMap<R>{
 		self.bvh.sample_aabb(aabb,&mut |&block_id|block_ids.push(block_id));
 		block_ids
 	}
-	pub fn load_region(&mut self,block_id:BlockId)->Result<Vec<(model::ModelId,model::Model)>,Error>{
-		read_region(&mut self.file,block_id)
+	pub fn get_mesh_block_id<R:BinReaderExt>(&self,mesh_id:model::MeshId)->Result<&BlockId,Error>{
+		self.resource_blocks.meshes.get(&mesh_id).ok_or(Error::InvalidMeshId(mesh_id))
 	}
-	pub fn load_mesh(&mut self,mesh_id:model::MeshId)->Result<model::Mesh,Error>{
-		let block_id=*self.resource_blocks.meshes.get(&mesh_id).ok_or(Error::InvalidMeshId(mesh_id))?;
-		read_mesh(&mut self.file,block_id)
+	pub fn get_texture_block_id<R:BinReaderExt>(&self,texture_id:model::TextureId)->Result<&BlockId,Error>{
+		self.resource_blocks.textures.get(&texture_id).ok_or(Error::InvalidTextureId(texture_id))
 	}
-	pub fn load_texture(&mut self,texture_id:model::TextureId)->Result<Vec<u8>,Error>{
-		let block_id=*self.resource_blocks.textures.get(&texture_id).ok_or(Error::InvalidTextureId(texture_id))?;
-		read_texture(&mut self.file,block_id)
-	}
-	pub fn into_complete_map(mut self)->Result<strafesnet_common::map::CompleteMap,Error>{
+	pub fn into_complete_map<R:BinReaderExt>(self,header:&crate::file::Header,mut data:R)->Result<strafesnet_common::map::CompleteMap,Error>{
 		let mut block_ids=Vec::new();
 		self.bvh.into_visitor(&mut |block_id|block_ids.push(block_id));
 		//count on reading the file in sequential order being fastest
@@ -255,7 +245,9 @@ impl<R:BinReaderExt> StreamableMap<R>{
 		//load all regions
 		let mut model_pairs=HashMap::new();
 		for block_id in block_ids{
-			model_pairs.extend(read_region(&mut self.file,block_id)?);
+			let block_info=header.block_info(block_id).map_err(Error::File)?;
+			let block=block_info.take_seek(&mut data).map_err(Error::IO)?;
+			model_pairs.extend(read_region(block)?);
 		}
 		let mut models=Vec::with_capacity(model_pairs.len());
 		for model_id in 0..model_pairs.len() as u32{
@@ -267,14 +259,18 @@ impl<R:BinReaderExt> StreamableMap<R>{
 		for mesh_id in 0..self.resource_blocks.meshes.len() as u32{
 			let mesh_id=model::MeshId::new(mesh_id);
 			let block_id=self.resource_blocks.meshes[&mesh_id];
-			meshes.push(read_mesh(&mut self.file,block_id)?);
+			let block_info=header.block_info(block_id).map_err(Error::File)?;
+			let block=block_info.take_seek(&mut data).map_err(Error::IO)?;
+			meshes.push(read_mesh(block)?);
 		};
 		//load all textures
 		let mut textures=Vec::with_capacity(self.resource_blocks.textures.len());
 		for texture_id in 0..self.resource_blocks.textures.len() as u32{
 			let texture_id=model::TextureId::new(texture_id);
 			let block_id=self.resource_blocks.textures[&texture_id];
-			textures.push(read_texture(&mut self.file,block_id)?);
+			let block_info=header.block_info(block_id).map_err(Error::File)?;
+			let block=block_info.take_seek(&mut data).map_err(Error::IO)?;
+			textures.push(read_texture(block)?);
 		}
 		Ok(strafesnet_common::map::CompleteMap{
 			modes:self.modes,

lib/snf/src/newtypes/physics.rs

@@ -88,6 +88,11 @@ pub enum Instruction{
 	PracticeFly,
 	#[brw(magic=14u8)]
 	SetSensitivity(super::integer::Ratio64Vec2),
+	#[brw(magic=15u8)]
+	SetSprint(
+		#[br(map=bool_from_u8)]
+		#[bw(map=bool_into_u8)]
+		bool),
 	#[brw(magic=255u8)]
 	Idle,
 }
@@ -116,6 +121,7 @@ impl TryInto<strafesnet_common::physics::Instruction> for Instruction{
 			Instruction::SetMoveForward(state)=>strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetMoveForward(state.into())),
 			Instruction::SetJump(state)=>strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetJump(state.into())),
 			Instruction::SetZoom(state)=>strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetZoom(state.into())),
+			Instruction::SetSprint(state)=>strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetSprint(state.into())),
 			Instruction::Reset=>strafesnet_common::physics::Instruction::Mode(strafesnet_common::physics::ModeInstruction::Reset),
 			Instruction::Restart(mode_id)=>strafesnet_common::physics::Instruction::Mode(strafesnet_common::physics::ModeInstruction::Restart(strafesnet_common::gameplay_modes::ModeId::new(mode_id))),
 			Instruction::Spawn(mode_id,stage_id)=>strafesnet_common::physics::Instruction::Mode(strafesnet_common::physics::ModeInstruction::Spawn(
@@ -142,6 +148,7 @@ impl TryFrom<strafesnet_common::physics::Instruction> for Instruction{
 			strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetMoveForward(state))=>Ok(Instruction::SetMoveForward(state.into())),
 			strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetJump(state))=>Ok(Instruction::SetJump(state.into())),
 			strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetZoom(state))=>Ok(Instruction::SetZoom(state.into())),
+			strafesnet_common::physics::Instruction::SetControl(strafesnet_common::physics::SetControlInstruction::SetSprint(state))=>Ok(Instruction::SetSprint(state.into())),
 			strafesnet_common::physics::Instruction::Mode(strafesnet_common::physics::ModeInstruction::Reset)=>Ok(Instruction::Reset),
 			strafesnet_common::physics::Instruction::Mode(strafesnet_common::physics::ModeInstruction::Restart(mode_id))=>Ok(Instruction::Restart(mode_id.get())),
 			strafesnet_common::physics::Instruction::Mode(strafesnet_common::physics::ModeInstruction::Spawn(mode_id,stage_id))=>Ok(Instruction::Spawn(

map-tool/Cargo.toml

@@ -18,10 +18,10 @@ rbx_dom_weak = "4.1.0"
 rbx_reflection_database = "2.0.2"
 rbx_xml = "2.0.1"
 rbxassetid = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_bsp_loader = { version = "0.3.1", path = "../lib/bsp_loader", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.1", path = "../lib/deferred_loader", registry = "strafesnet" }
-strafesnet_rbx_loader = { version = "0.7.0", path = "../lib/rbx_loader", registry = "strafesnet" }
-strafesnet_snf = { version = "0.3.1", path = "../lib/snf", registry = "strafesnet" }
+strafesnet_bsp_loader.workspace = true
+strafesnet_deferred_loader.workspace = true
+strafesnet_rbx_loader.workspace = true
+strafesnet_snf.workspace = true
 thiserror = "2.0.11"
 tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread", "fs"] }
 vbsp = "0.9.1"

strafe-client/Cargo.toml

@@ -16,18 +16,18 @@ source = ["dep:strafesnet_deferred_loader", "dep:strafesnet_bsp_loader"]
 roblox = ["dep:strafesnet_deferred_loader", "dep:strafesnet_rbx_loader"]
 
 [dependencies]
-glam = "0.30.0"
+glam.workspace = true
 parking_lot = "0.12.1"
 pollster = "0.4.0"
-strafesnet_bsp_loader = { path = "../lib/bsp_loader", registry = "strafesnet", optional = true }
-strafesnet_common = { path = "../lib/common", registry = "strafesnet" }
-strafesnet_deferred_loader = { path = "../lib/deferred_loader", registry = "strafesnet", optional = true }
-strafesnet_graphics = { path = "../engine/graphics", registry = "strafesnet" }
-strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
-strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet", optional = true }
-strafesnet_session = { path = "../engine/session", registry = "strafesnet" }
-strafesnet_settings = { path = "../engine/settings", registry = "strafesnet" }
-strafesnet_snf = { path = "../lib/snf", registry = "strafesnet", optional = true }
+strafesnet_bsp_loader = { workspace = true, optional = true }
+strafesnet_common.workspace = true
+strafesnet_deferred_loader = { workspace = true, optional = true }
+strafesnet_graphics.workspace = true
+strafesnet_physics.workspace = true
+strafesnet_rbx_loader = { workspace = true, optional = true }
+strafesnet_session.workspace = true
+strafesnet_settings.workspace = true
+strafesnet_snf = { workspace = true, optional = true }
 wgpu = "28.0.0"
 winit = "0.30.7"
 

strafe-client/models/teslacyberv3.0.mtl

@@ -1,62 +0,0 @@
-# Blender MTL File: 'teslacyberv3.0.blend'
-# Material Count: 6
-
-newmtl Material
-Ns 65.476285
-Ka 1.000000 1.000000 1.000000
-Kd 0.411568 0.411568 0.411568
-Ks 0.614679 0.614679 0.614679
-Ke 0.000000 0.000000 0.000000
-Ni 36.750000
-d 1.000000
-illum 3
-
-newmtl Материал
-Ns 323.999994
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2
-
-newmtl Материал.001
-Ns 900.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.026240 0.026240 0.026240
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 1
-
-newmtl Материал.002
-Ns 0.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.031837 0.032429 0.029425
-Ks 0.169725 0.169725 0.169725
-Ke 0.000000 0.000000 0.000000
-Ni 0.000000
-d 1.000000
-illum 2
-
-newmtl Материал.003
-Ns 900.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.023585 0.083235 0.095923
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 45.049999
-d 1.000000
-illum 3
-
-newmtl Материал.004
-Ns 323.999994
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2

strafe-client/src/graphics_worker.rs

@@ -37,7 +37,8 @@ pub fn new(
 				config.width=size.width.max(1);
 				config.height=size.height.max(1);
 				surface.configure(&device,&config);
-				graphics.resize(&device,&config,&user_settings);
+				let fov=user_settings.calculate_fov(1.0,&glam::uvec2(config.width,config.height)).as_vec2();
+				graphics.resize(&device,&config,fov);
 				println!("Resize took {:?}",t0.elapsed());
 			}
 			Instruction::Render(frame_state)=>{
@@ -56,7 +57,7 @@ pub fn new(
 					..wgpu::TextureViewDescriptor::default()
 				});
 
-				graphics.render(&view,&device,&queue,frame_state);
+				graphics.render(&view,&device,&queue,graphics::view_inv(frame_state.pos(),frame_state.angles()));
 
 				frame.present();
 			}

strafe-client/src/main.rs

@@ -9,5 +9,5 @@ mod graphics_worker;
 const TITLE:&'static str=concat!("Strafe Client v",env!("CARGO_PKG_VERSION"));
 
 fn main(){
-	setup::setup_and_start(TITLE);
+	pollster::block_on(setup::setup_and_start(TITLE));
 }

strafe-client/src/setup.rs

@@ -1,199 +1,38 @@
-fn optional_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_ASTC
-	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
-}
-fn required_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_BC
-}
-fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
-	wgpu::DownlevelCapabilities{
-		flags:wgpu::DownlevelFlags::empty(),
-		shader_model:wgpu::ShaderModel::Sm5,
-		..wgpu::DownlevelCapabilities::default()
-	}
-}
+use strafesnet_graphics::setup;
 
-struct SetupContextPartial1{
-	backends:wgpu::Backends,
-	instance:wgpu::Instance,
-}
 fn create_window(title:&str,event_loop:&winit::event_loop::EventLoop<()>)->Result<winit::window::Window,winit::error::OsError>{
 	let mut attr=winit::window::WindowAttributes::default();
 	attr=attr.with_title(title);
 	event_loop.create_window(attr)
 }
-fn create_instance()->SetupContextPartial1{
-	let backends=wgpu::Backends::from_env().unwrap_or_default();
-	SetupContextPartial1{
-		backends,
-		instance:Default::default(),
-	}
-}
-impl SetupContextPartial1{
-	fn create_surface<'a>(self,window:&'a winit::window::Window)->Result<SetupContextPartial2<'a>,wgpu::CreateSurfaceError>{
-		Ok(SetupContextPartial2{
-			backends:self.backends,
-			surface:self.instance.create_surface(window)?,
-			instance:self.instance,
-		})
-	}
-}
-struct SetupContextPartial2<'a>{
-	backends:wgpu::Backends,
-	instance:wgpu::Instance,
-	surface:wgpu::Surface<'a>,
-}
-impl<'a> SetupContextPartial2<'a>{
-	fn pick_adapter(self)->SetupContextPartial3<'a>{
-		let adapter;
 
-		//TODO: prefer adapter that implements optional features
-		//let optional_features=optional_features();
-		let required_features=required_features();
-
-		//no helper function smh gotta write it myself
-		let adapters=pollster::block_on(self.instance.enumerate_adapters(self.backends));
-
-		let mut chosen_adapter=None;
-		let mut chosen_adapter_score=0;
-		for adapter in adapters {
-			if !adapter.is_surface_supported(&self.surface) {
-				continue;
-			}
-
-			let score=match adapter.get_info().device_type{
-				wgpu::DeviceType::IntegratedGpu=>3,
-				wgpu::DeviceType::DiscreteGpu=>4,
-				wgpu::DeviceType::VirtualGpu=>2,
-				wgpu::DeviceType::Other|wgpu::DeviceType::Cpu=>1,
-			};
-
-			let adapter_features=adapter.features();
-			if chosen_adapter_score<score&&adapter_features.contains(required_features) {
-				chosen_adapter_score=score;
-				chosen_adapter=Some(adapter);
-			}
-		}
-
-		if let Some(maybe_chosen_adapter)=chosen_adapter{
-			adapter=maybe_chosen_adapter;
-		}else{
-			panic!("No suitable GPU adapters found on the system!");
-		}
-
-
-		let adapter_info=adapter.get_info();
-		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
-
-		let required_downlevel_capabilities=required_downlevel_capabilities();
-		let downlevel_capabilities=adapter.get_downlevel_capabilities();
-		assert!(
-			downlevel_capabilities.shader_model >= required_downlevel_capabilities.shader_model,
-			"Adapter does not support the minimum shader model required to run this example: {:?}",
-			required_downlevel_capabilities.shader_model
-		);
-		assert!(
-			downlevel_capabilities
-				.flags
-				.contains(required_downlevel_capabilities.flags),
-			"Adapter does not support the downlevel capabilities required to run this example: {:?}",
-			required_downlevel_capabilities.flags - downlevel_capabilities.flags
-		);
-		SetupContextPartial3{
-			surface:self.surface,
-			adapter,
-		}
-	}
-}
-struct SetupContextPartial3<'a>{
-	surface:wgpu::Surface<'a>,
-	adapter:wgpu::Adapter,
-}
-impl<'a> SetupContextPartial3<'a>{
-	fn request_device(self)->SetupContextPartial4<'a>{
-		let optional_features=optional_features();
-		let required_features=required_features();
-
-		// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
-		let needed_limits=strafesnet_graphics::graphics::required_limits().using_resolution(self.adapter.limits());
-
-		let (device, queue)=pollster::block_on(self.adapter
-			.request_device(
-				&wgpu::DeviceDescriptor{
-					label:None,
-					required_features:(optional_features&self.adapter.features())|required_features,
-					required_limits:needed_limits,
-					memory_hints:wgpu::MemoryHints::Performance,
-					trace:wgpu::Trace::Off,
-					experimental_features:wgpu::ExperimentalFeatures::disabled(),
-				},
-			))
-			.expect("Unable to find a suitable GPU adapter!");
-
-		SetupContextPartial4{
-			surface:self.surface,
-			adapter:self.adapter,
-			device,
-			queue,
-		}
-	}
-}
-struct SetupContextPartial4<'a>{
-	surface:wgpu::Surface<'a>,
-	adapter:wgpu::Adapter,
-	device:wgpu::Device,
-	queue:wgpu::Queue,
-}
-impl<'a> SetupContextPartial4<'a>{
-	fn configure_surface(self,size:&'a winit::dpi::PhysicalSize<u32>)->SetupContext<'a>{
-		let mut config=self.surface
-			.get_default_config(&self.adapter, size.width, size.height)
-			.expect("Surface isn't supported by the adapter.");
-		let surface_view_format=config.format.add_srgb_suffix();
-		config.view_formats.push(surface_view_format);
-		config.present_mode=wgpu::PresentMode::AutoNoVsync;
-		self.surface.configure(&self.device, &config);
-
-		SetupContext{
-			surface:self.surface,
-			device:self.device,
-			queue:self.queue,
-			config,
-		}
-	}
-}
-pub struct SetupContext<'a>{
-	pub surface:wgpu::Surface<'a>,
-	pub device:wgpu::Device,
-	pub queue:wgpu::Queue,
-	pub config:wgpu::SurfaceConfiguration,
-}
-
-pub fn setup_and_start(title:&str){
+pub async fn setup_and_start(title:&str){
 	let event_loop=winit::event_loop::EventLoop::new().unwrap();
 
-	println!("Initializing the surface...");
-
-	let partial_1=create_instance();
-
 	let window=create_window(title,&event_loop).unwrap();
 
-	let partial_2=partial_1.create_surface(&window).unwrap();
+	println!("Initializing the surface...");
 
-	let partial_3=partial_2.pick_adapter();
+	let instance=setup::step1::create_instance();
 
-	let partial_4=partial_3.request_device();
+	let surface=setup::step2::create_surface(&instance,&window).unwrap();
+
+	let adapter=setup::step3::pick_adapter(&instance,&surface).await.expect("No suitable GPU adapters found on the system!");
+
+	let (device,queue)=setup::step4::request_device(&adapter).await;
 
 	let size=window.inner_size();
-
-	let setup_context=partial_4.configure_surface(&size);
+	let config=setup::step5::configure_surface(&adapter,&device,&surface,(size.width,size.height));
 
 	//dedicated thread to ping request redraw back and resize the window doesn't seem logical
 
 	//the thread that spawns the physics thread
 	let mut window_thread=crate::window::worker(
 		&window,
-		setup_context,
+		device,
+		queue,
+		surface,
+		config,
 	);
 
 	for arg in std::env::args().skip(1){

strafe-client/src/window.rs

@@ -15,6 +15,7 @@ pub enum Instruction{
 struct WindowContext<'a>{
 	manual_mouse_lock:bool,
 	mouse_pos:glam::DVec2,
+	simulation_paused:bool,
 	screen_size:glam::UVec2,
 	window:&'a winit::window::Window,
 	physics_thread:crate::compat_worker::QNWorker<'a,TimedInstruction<PhysicsWorkerInstruction,SessionTime>>,
@@ -24,6 +25,35 @@ impl WindowContext<'_>{
 	fn get_middle_of_screen(&self)->winit::dpi::PhysicalPosition<u32>{
 		winit::dpi::PhysicalPosition::new(self.screen_size.x/2,self.screen_size.y/2)
 	}
+	fn free_mouse(&mut self){
+		self.manual_mouse_lock=false;
+		match self.window.set_cursor_position(self.get_middle_of_screen()){
+			Ok(())=>(),
+			Err(e)=>println!("Could not set cursor position: {:?}",e),
+		}
+		match self.window.set_cursor_grab(winit::window::CursorGrabMode::None){
+			Ok(())=>(),
+			Err(e)=>println!("Could not release cursor: {:?}",e),
+		}
+		self.window.set_cursor_visible(true);
+	}
+	fn lock_mouse(&mut self){
+		//if cursor is outside window don't lock but apparently there's no get pos function
+		//let pos=window.get_cursor_pos();
+		match self.window.set_cursor_grab(winit::window::CursorGrabMode::Locked){
+			Ok(())=>(),
+			Err(_)=>{
+				match self.window.set_cursor_grab(winit::window::CursorGrabMode::Confined){
+					Ok(())=>(),
+					Err(e)=>{
+						self.manual_mouse_lock=true;
+						println!("Could not confine cursor: {:?}",e)
+					},
+				}
+			}
+		}
+		self.window.set_cursor_visible(false);
+	}
 	fn window_event(&mut self,time:SessionTime,event:winit::event::WindowEvent){
 		match event{
 			winit::event::WindowEvent::DroppedFile(path)=>{
@@ -34,6 +64,10 @@ impl WindowContext<'_>{
 				}
 			},
 			winit::event::WindowEvent::Focused(state)=>{
+				// don't unpause if manually paused
+				if self.simulation_paused{
+					return;
+				}
 				//pause unpause
 				self.physics_thread.send(TimedInstruction{
 					time,
@@ -46,35 +80,8 @@ impl WindowContext<'_>{
 				..
 			}=>{
 				match (logical_key,state){
-					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab),winit::event::ElementState::Pressed)=>{
-						self.manual_mouse_lock=false;
-						match self.window.set_cursor_position(self.get_middle_of_screen()){
-							Ok(())=>(),
-							Err(e)=>println!("Could not set cursor position: {:?}",e),
-						}
-						match self.window.set_cursor_grab(winit::window::CursorGrabMode::None){
-							Ok(())=>(),
-							Err(e)=>println!("Could not release cursor: {:?}",e),
-						}
-						self.window.set_cursor_visible(state.is_pressed());
-					},
-					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab),winit::event::ElementState::Released)=>{
-						//if cursor is outside window don't lock but apparently there's no get pos function
-						//let pos=window.get_cursor_pos();
-						match self.window.set_cursor_grab(winit::window::CursorGrabMode::Locked){
-							Ok(())=>(),
-							Err(_)=>{
-								match self.window.set_cursor_grab(winit::window::CursorGrabMode::Confined){
-									Ok(())=>(),
-									Err(e)=>{
-										self.manual_mouse_lock=true;
-										println!("Could not confine cursor: {:?}",e)
-									},
-								}
-							}
-						}
-						self.window.set_cursor_visible(state.is_pressed());
-					},
+					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab),winit::event::ElementState::Pressed)=>self.free_mouse(),
+					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab),winit::event::ElementState::Released)=>self.lock_mouse(),
 					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::F11),winit::event::ElementState::Pressed)=>{
 						if self.window.fullscreen().is_some(){
 							self.window.set_fullscreen(None);
@@ -131,8 +138,18 @@ impl WindowContext<'_>{
 
 						if let Some(session_instruction)=match keycode{
 							winit::keyboard::Key::Named(winit::keyboard::NamedKey::Space)=>input_ctrl!(SetJump,s),
+							winit::keyboard::Key::Named(winit::keyboard::NamedKey::Shift)=>input_ctrl!(SetSprint,s),
 							// TODO: bind system so playback pausing can use spacebar
-							winit::keyboard::Key::Named(winit::keyboard::NamedKey::Enter)=>session_playback!(TogglePaused,s),
+							winit::keyboard::Key::Named(winit::keyboard::NamedKey::Enter)=>if s{
+								let paused=!self.simulation_paused;
+								self.simulation_paused=paused;
+								if paused{
+									self.free_mouse();
+								}else{
+									self.lock_mouse();
+								}
+								Some(SessionInstructionSubset::Control(SessionControlInstruction::SetPaused(paused)))
+							}else{None},
 							winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowUp)=>session_playback!(IncreaseTimescale,s),
 							winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowDown)=>session_playback!(DecreaseTimescale,s),
 							winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowLeft)=>session_playback!(SkipBack,s),
@@ -222,7 +239,10 @@ impl WindowContext<'_>{
 }
 pub fn worker<'a>(
 	window:&'a winit::window::Window,
-	setup_context:crate::setup::SetupContext<'a>,
+	device:wgpu::Device,
+	queue:wgpu::Queue,
+	surface:wgpu::Surface<'a>,
+	config:wgpu::SurfaceConfiguration,
 )->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction,SessionTime>>{
 	// WindowContextSetup::new
 	#[cfg(feature="user-install")]
@@ -232,15 +252,17 @@ pub fn worker<'a>(
 
 	let user_settings=directories.settings();
 
-	let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&setup_context.device,&setup_context.queue,&setup_context.config);
-	graphics.load_user_settings(&user_settings);
+	let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&device,&queue,&config);
 
 	//WindowContextSetup::into_context
-	let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height);
-	let graphics_thread=crate::graphics_worker::new(graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue);
+	let screen_size=glam::uvec2(config.width,config.height);
+	let fov=user_settings.calculate_fov(1.0,&screen_size).as_vec2();
+	graphics.resize(&device,&config,fov);
+	let graphics_thread=crate::graphics_worker::new(graphics,config,surface,device,queue);
 	let mut window_context=WindowContext{
 		manual_mouse_lock:false,
 		mouse_pos:glam::DVec2::ZERO,
+		simulation_paused:false,
 		//make sure to update this!!!!!
 		screen_size,
 		window,