Print Only Horizontal Velocity

The Speed function is unnecessary I forgot to remove it

Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 bytemuck = { version = "1.13.1", features = ["derive"] }
 configparser = "3.0.2"
 ddsfile = "0.5.1"
-glam = "0.24.1"
+glam = "0.25.0"
 lazy-regex = "3.0.2"
 obj = "0.10.2"
 parking_lot = "0.12.1"
@@ -18,8 +18,11 @@ rbx_binary = "0.7.1"
 rbx_dom_weak = "2.5.0"
 rbx_reflection_database = "0.2.7"
 rbx_xml = "0.13.1"
-wgpu = "0.18.0"
-winit = { version = "0.29.2", features = ["rwh_05"] }
+strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "434ca29aef7e3015c9ca1ed45de8fef42e33fdfb" }
+vbsp = "0.5.0"
+vmdl = "0.1.1"
+wgpu = "0.19.0"
+winit = "0.29.2"
 
 #[profile.release]
 #lto = true

LICENSE

@@ -1,5 +1,5 @@
 /*******************************************************
-* Copyright (C) 2023 Rhys Lloyd <krakow20@gmail.com>
+* Copyright (C) 2023-2024 Rhys Lloyd <krakow20@gmail.com>
 *
 * This file is part of the StrafesNET bhop/surf client.
 *

src/aabb.rs

@@ -1,46 +0,0 @@
-use crate::integer::Planar64Vec3;
-
-#[derive(Clone)]
-pub struct Aabb{
-	min:Planar64Vec3,
-	max:Planar64Vec3,
-}
-
-impl Default for Aabb {
-	fn default()->Self {
-		Self{min:Planar64Vec3::MAX,max:Planar64Vec3::MIN}
-	}
-}
-
-impl Aabb{
-	pub fn grow(&mut self,point:Planar64Vec3){
-		self.min=self.min.min(point);
-		self.max=self.max.max(point);
-	}
-	pub fn join(&mut self,aabb:&Aabb){
-		self.min=self.min.min(aabb.min);
-		self.max=self.max.max(aabb.max);
-	}
-	pub fn inflate(&mut self,hs:Planar64Vec3){
-		self.min-=hs;
-		self.max+=hs;
-	}
-	pub fn intersects(&self,aabb:&Aabb)->bool{
-		(self.min.cmplt(aabb.max)&aabb.min.cmplt(self.max)).all()
-	}
-	pub fn size(&self)->Planar64Vec3{
-		self.max-self.min
-	}
-	pub fn center(&self)->Planar64Vec3{
-		self.min.midpoint(self.max)
-	}
-	//probably use floats for area & volume because we don't care about precision
-	// pub fn area_weight(&self)->f32{
-	// 	let d=self.max-self.min;
-	// 	d.x*d.y+d.y*d.z+d.z*d.x
-	// }
-	// pub fn volume(&self)->f32{
-	// 	let d=self.max-self.min;
-	// 	d.x*d.y*d.z
-	// }
-}

src/bvh.rs

@@ -1,123 +0,0 @@
-use crate::aabb::Aabb;
-
-//da algaritum
-//lista boxens
-//sort by {minx,maxx,miny,maxy,minz,maxz} (6 lists)
-//find the sets that minimizes the sum of surface areas
-//splitting is done when the minimum split sum of surface areas is larger than the node's own surface area
-
-//start with bisection into octrees because a bad bvh is still 1000x better than no bvh
-//sort the centerpoints on each axis (3 lists)
-//bv is put into octant based on whether it is upper or lower in each list
-enum BvhNodeContent{
-	Branch(Vec<BvhNode>),
-	Leaf(usize),
-}
-impl Default for BvhNodeContent{
-	fn default()->Self{
-		Self::Branch(Vec::new())
-	}
-}
-#[derive(Default)]
-pub struct BvhNode{
-	content:BvhNodeContent,
-	aabb:Aabb,
-}
-
-impl BvhNode{
-	pub fn the_tester<F:FnMut(usize)>(&self,aabb:&Aabb,f:&mut F){
-		match &self.content{
-			&BvhNodeContent::Leaf(model)=>f(model),
-			BvhNodeContent::Branch(children)=>for child in children{
-				//this test could be moved outside the match statement
-				//but that would test the root node aabb
-				//you're probably not going to spend a lot of time outside the map,
-				//so the test is extra work for nothing
-				if aabb.intersects(&child.aabb){
-					child.the_tester(aabb,f);
-				}
-			},
-		}
-	}
-}
-
-pub fn generate_bvh(boxen:Vec<Aabb>)->BvhNode{
-	generate_bvh_node(boxen.into_iter().enumerate().collect())
-}
-
-fn generate_bvh_node(boxen:Vec<(usize,Aabb)>)->BvhNode{
-	let n=boxen.len();
-	if n<20{
-		let mut aabb=Aabb::default();
-		let nodes=boxen.into_iter().map(|b|{
-			aabb.join(&b.1);
-			BvhNode{
-				content:BvhNodeContent::Leaf(b.0),
-				aabb:b.1,
-			}
-		}).collect();
-		BvhNode{
-			content:BvhNodeContent::Branch(nodes),
-			aabb,
-		}
-	}else{
-		let mut octant=std::collections::HashMap::with_capacity(n);//this ids which octant the boxen is put in
-		let mut sort_x=Vec::with_capacity(n);
-		let mut sort_y=Vec::with_capacity(n);
-		let mut sort_z=Vec::with_capacity(n);
-		for (i,aabb) in boxen.iter(){
-			let center=aabb.center();
-			octant.insert(*i,0);
-			sort_x.push((*i,center.x()));
-			sort_y.push((*i,center.y()));
-			sort_z.push((*i,center.z()));
-		}
-		sort_x.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
-		sort_y.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
-		sort_z.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
-		let h=n/2;
-		let median_x=sort_x[h].1;
-		let median_y=sort_y[h].1;
-		let median_z=sort_z[h].1;
-		for (i,c) in sort_x{
-			if median_x<c{
-				octant.insert(i,octant[&i]+1<<0);
-			}
-		}
-		for (i,c) in sort_y{
-			if median_y<c{
-				octant.insert(i,octant[&i]+1<<1);
-			}
-		}
-		for (i,c) in sort_z{
-			if median_z<c{
-				octant.insert(i,octant[&i]+1<<2);
-			}
-		}
-		//generate lists for unique octant values
-		let mut list_list=Vec::with_capacity(8);
-		let mut octant_list=Vec::with_capacity(8);
-		for (i,aabb) in boxen.into_iter(){
-			let octant_id=octant[&i];
-			let list_id=if let Some(list_id)=octant_list.iter().position(|&id|id==octant_id){
-				list_id
-			}else{
-				let list_id=list_list.len();
-				octant_list.push(octant_id);
-				list_list.push(Vec::new());
-				list_id
-			};
-			list_list[list_id].push((i,aabb));
-		}
-		let mut aabb=Aabb::default();
-		let children=list_list.into_iter().map(|b|{
-			let node=generate_bvh_node(b);
-			aabb.join(&node.aabb);
-			node
-		}).collect();
-		BvhNode{
-			content:BvhNodeContent::Branch(children),
-			aabb,
-		}
-	}
-}

src/face_crawler.rs

@@ -1,7 +1,7 @@
 use crate::physics::Body;
 use crate::model_physics::{FEV,MeshQuery,DirectedEdge};
-use crate::integer::{Time,Planar64};
-use crate::zeroes::zeroes2;
+use strafesnet_common::integer::{Time,Planar64};
+use strafesnet_common::zeroes::zeroes2;
 
 enum Transition<F,E:DirectedEdge,V>{
 	Miss,

src/graphics.rs

@@ -1,4 +1,5 @@
 use std::borrow::Cow;
+use strafesnet_common::integer;
 use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
 use crate::model_graphics::{GraphicsVertex,GraphicsModelColor4,GraphicsModelInstance,GraphicsModelSingleTexture,IndexedGraphicsModelSingleTexture,IndexedGroupFixedTexture};
 
@@ -152,11 +153,14 @@ impl GraphicsState{
 		let mut texture_loading_threads=Vec::new();
 		let num_textures=indexed_models.textures.len();
 		for (i,texture_id) in indexed_models.textures.into_iter().enumerate(){
-			if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",texture_id))){
+			let path=std::path::PathBuf::from(format!("textures/{}.dds",texture_id));
+			if let Ok(mut file) = std::fs::File::open(path.clone()){
 				double_map.insert(i as u32, texture_loading_threads.len() as u32);
 				texture_loading_threads.push((texture_id,std::thread::spawn(move ||{
 					ddsfile::Dds::read(&mut file).unwrap()
 				})));
+			}else{
+				//println!("missing texture path={:?}",path);
 			}
 		}
 
@@ -200,6 +204,7 @@ impl GraphicsState{
 					label: Some(format!("Texture{}",texture_id).as_str()),
 					view_formats: &[],
 				},
+				wgpu::util::TextureDataOrder::LayerMajor,
 				&image.data,
 			);
 			texture.create_view(&wgpu::TextureViewDescriptor {
@@ -216,7 +221,7 @@ impl GraphicsState{
 		for model in indexed_models.models.into_iter(){
 			//convert ModelInstance into GraphicsModelInstance
 			let instances:Vec<GraphicsModelInstance>=model.instances.into_iter().filter_map(|instance|{
-				if instance.color.w==0.0{
+				if instance.color.w==0.0&&!model.groups.iter().any(|g|g.texture.is_some()){
 					None
 				}else{
 					Some(GraphicsModelInstance{
@@ -697,6 +702,7 @@ impl GraphicsState{
 					label: Some("Skybox Texture"),
 					view_formats: &[],
 				},
+				wgpu::util::TextureDataOrder::LayerMajor,
 				&skybox_image.data,
 			);
 
@@ -737,6 +743,7 @@ impl GraphicsState{
 					label: Some("Squid Texture"),
 					view_formats: &[],
 				},
+				wgpu::util::TextureDataOrder::LayerMajor,
 				&image.data,
 			);
 
@@ -827,7 +834,7 @@ impl GraphicsState{
 		});
 
 		let camera=GraphicsCamera::default();
-		let camera_uniforms = camera.to_uniform_data(crate::physics::PhysicsOutputState::default().extrapolate(glam::IVec2::ZERO,crate::integer::Time::ZERO));
+		let camera_uniforms = camera.to_uniform_data(crate::physics::PhysicsOutputState::default().extrapolate(glam::IVec2::ZERO,integer::Time::ZERO));
 		let camera_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
 			label: Some("Camera"),
 			contents: bytemuck::cast_slice(&camera_uniforms),
@@ -896,7 +903,7 @@ impl GraphicsState{
 		device:&wgpu::Device,
 		queue:&wgpu::Queue,
 		physics_output:crate::physics::PhysicsOutputState,
-		predicted_time:crate::integer::Time,
+		predicted_time:integer::Time,
 		mouse_pos:glam::IVec2,
 	) {
 		//TODO: use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input

src/graphics_worker.rs

@@ -1,5 +1,7 @@
+use strafesnet_common::integer;
+
 pub enum Instruction{
-	Render(crate::physics::PhysicsOutputState,crate::integer::Time,glam::IVec2),
+	Render(crate::physics::PhysicsOutputState,integer::Time,glam::IVec2),
 	//UpdateModel(crate::graphics::GraphicsModelUpdate),
 	Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
 	GenerateModels(crate::model::IndexedModelInstances),
@@ -18,7 +20,7 @@ WorkerDescription{
 pub fn new<'a>(
 		mut graphics:crate::graphics::GraphicsState,
 		mut config:wgpu::SurfaceConfiguration,
-		surface:wgpu::Surface,
+		surface:wgpu::Surface<'a>,
 		device:wgpu::Device,
 		queue:wgpu::Queue,
 	)->crate::compat_worker::INWorker<'a,Instruction>{

src/instruction.rs

@@ -1,53 +0,0 @@
-use crate::integer::Time;
-
-#[derive(Debug)]
-pub struct TimedInstruction<I>{
-	pub time:Time,
-	pub instruction:I,
-}
-
-pub trait InstructionEmitter<I>{
-	fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<I>>;
-}
-pub trait InstructionConsumer<I>{
-	fn process_instruction(&mut self, instruction:TimedInstruction<I>);
-}
-
-//PROPER PRIVATE FIELDS!!!
-pub struct InstructionCollector<I>{
-	time:Time,
-	instruction:Option<I>,
-}
-impl<I> InstructionCollector<I>{
-	pub fn new(time:Time)->Self{
-		Self{
-			time,
-			instruction:None
-		}
-	}
-	#[inline]
-	pub fn time(&self)->Time{
-		self.time
-	}
-	pub fn collect(&mut self,instruction:Option<TimedInstruction<I>>){
-		match instruction{
-			Some(unwrap_instruction)=>{
-				if unwrap_instruction.time<self.time {
-					self.time=unwrap_instruction.time;
-					self.instruction=Some(unwrap_instruction.instruction);
-				}
-			},
-			None=>(),
-		}
-	}
-	pub fn instruction(self)->Option<TimedInstruction<I>>{
-		//STEAL INSTRUCTION AND DESTROY INSTRUCTIONCOLLECTOR
-		match self.instruction{
-			Some(instruction)=>Some(TimedInstruction{
-				time:self.time,
-				instruction
-			}),
-			None=>None,
-		}
-	}
-}

src/load_bsp.rs

@@ -0,0 +1,232 @@
+use strafesnet_common::integer;
+
+const VALVE_SCALE:f32=1.0/16.0;
+fn valve_transform(v:[f32;3])->integer::Planar64Vec3{
+	integer::Planar64Vec3::try_from([v[0]*VALVE_SCALE,v[2]*VALVE_SCALE,-v[1]*VALVE_SCALE]).unwrap()
+}
+pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Result<crate::model::IndexedModelInstances,vbsp::BspError>{
+	let mut s=Vec::new();
+
+	match input.read_to_end(&mut s){
+		Ok(_)=>(),
+		Err(e)=>println!("load_bsp::generate_indexed_models read_to_end failed: {:?}",e),
+	}
+
+	match vbsp::Bsp::read(s.as_slice()){
+		Ok(bsp)=>{
+			let mut spawn_point=integer::Planar64Vec3::ZERO;
+
+			let mut name_from_texture_id=Vec::new();
+			let mut texture_id_from_name=std::collections::HashMap::new();
+
+			let mut models=bsp.models().map(|world_model|{
+				//non-deduplicated
+				let mut spam_pos=Vec::new();
+				let mut spam_tex=Vec::new();
+				let mut spam_normal=Vec::new();
+				let mut spam_vertices=Vec::new();
+				let groups=world_model.faces()
+				.filter(|face| face.is_visible())//TODO: look at this
+				.map(|face|{
+					let face_texture=face.texture();
+					let face_texture_data=face_texture.texture_data();
+					let (texture_u,texture_v)=(glam::Vec3A::from_slice(&face_texture.texture_transforms_u[0..3]),glam::Vec3A::from_slice(&face_texture.texture_transforms_v[0..3]));
+					let texture_offset=glam::vec2(face_texture.texture_transforms_u[3],face_texture.texture_transforms_v[3]);
+					let texture_size=glam::vec2(face_texture_data.width as f32,face_texture_data.height as f32);
+
+					//texture
+					let texture_id=if let Some(&texture_id)=texture_id_from_name.get(face_texture_data.name()){
+						texture_id
+					}else{
+						let texture_id=name_from_texture_id.len() as u32;
+						texture_id_from_name.insert(face_texture_data.name().to_string(),texture_id);
+						name_from_texture_id.push(face_texture_data.name().to_string());
+						texture_id
+					};
+
+					//normal
+					let normal=face.normal();
+					let normal_idx=spam_normal.len() as u32;
+					spam_normal.push(valve_transform(<[f32;3]>::from(normal)));
+					let mut vertices:Vec<u32>=face.vertex_positions().map(|vertex_pos|{
+						let vertex_xyz=<[f32;3]>::from(vertex_pos);
+						let pos=glam::Vec3A::from_array(vertex_xyz);
+						let pos_idx=spam_pos.len();
+						spam_pos.push(valve_transform(vertex_xyz));
+
+						//calculate texture coordinates
+						let tex=(glam::vec2(pos.dot(texture_u),pos.dot(texture_v))+texture_offset)/texture_size;
+						let tex_idx=spam_tex.len() as u32;
+						spam_tex.push(tex);
+
+						let i=spam_vertices.len() as u32;
+						spam_vertices.push(crate::model::IndexedVertex{
+							pos: pos_idx as u32,
+							tex: tex_idx as u32,
+							normal: normal_idx,
+							color: 0,
+						});
+						i
+					}).collect();
+					vertices.reverse();
+					crate::model::IndexedGroup{
+						texture:Some(texture_id),
+						polys:vec![crate::model::IndexedPolygon{vertices}],
+					}
+				}).collect();
+				crate::model::IndexedModel{
+					unique_pos:spam_pos,
+					unique_tex:spam_tex,
+					unique_normal:spam_normal,
+					unique_color:vec![glam::Vec4::ONE],
+					unique_vertices:spam_vertices,
+					groups,
+					instances:vec![crate::model::ModelInstance{
+						attributes:crate::model::CollisionAttributes::Decoration,
+						transform:integer::Planar64Affine3::new(
+							integer::Planar64Mat3::default(),
+							valve_transform(<[f32;3]>::from(world_model.origin))
+						),
+						..Default::default()
+					}],
+				}
+			}).collect();
+
+			//dedupe prop models
+			let mut model_dedupe=std::collections::HashSet::new();
+			for prop in bsp.static_props(){
+				model_dedupe.insert(prop.model());
+			}
+
+			//generate unique meshes
+			let mut model_map=std::collections::HashMap::with_capacity(model_dedupe.len());
+			let mut prop_models=Vec::new();
+			for model_name in model_dedupe{
+				let model_name_lower=model_name.to_lowercase();
+				//.mdl, .vvd, .dx90.vtx
+				let mut path=std::path::PathBuf::from(model_name_lower.as_str());
+				let file_name=std::path::PathBuf::from(path.file_stem().unwrap());
+				path.pop();
+				path.push(file_name);
+				let mut vvd_path=path.clone();
+				let mut vtx_path=path.clone();
+				vvd_path.set_extension("vvd");
+				vtx_path.set_extension("dx90.vtx");
+				match (bsp.pack.get(model_name_lower.as_str()),bsp.pack.get(vvd_path.as_os_str().to_str().unwrap()),bsp.pack.get(vtx_path.as_os_str().to_str().unwrap())){
+					(Ok(Some(mdl_file)),Ok(Some(vvd_file)),Ok(Some(vtx_file)))=>{
+						match (vmdl::mdl::Mdl::read(mdl_file.as_ref()),vmdl::vvd::Vvd::read(vvd_file.as_ref()),vmdl::vtx::Vtx::read(vtx_file.as_ref())){
+							(Ok(mdl),Ok(vvd),Ok(vtx))=>{
+								let model=vmdl::Model::from_parts(mdl,vtx,vvd);
+								let texture_paths=model.texture_directories();
+								if texture_paths.len()!=1{
+									println!("WARNING: multiple texture paths");
+								}
+								let skin=model.skin_tables().nth(0).unwrap();
+
+								let mut spam_pos=Vec::with_capacity(model.vertices().len());
+								let mut spam_normal=Vec::with_capacity(model.vertices().len());
+								let mut spam_tex=Vec::with_capacity(model.vertices().len());
+								let mut spam_vertices=Vec::with_capacity(model.vertices().len());
+								for (i,vertex) in model.vertices().iter().enumerate(){
+									spam_pos.push(valve_transform(<[f32;3]>::from(vertex.position)));
+									spam_normal.push(valve_transform(<[f32;3]>::from(vertex.normal)));
+									spam_tex.push(glam::Vec2::from_array(vertex.texture_coordinates));
+									spam_vertices.push(crate::model::IndexedVertex{
+										pos:i as u32,
+										tex:i as u32,
+										normal:i as u32,
+										color:0,
+									});
+								}
+
+								let model_id=prop_models.len();
+								model_map.insert(model_name,model_id);
+								prop_models.push(crate::model::IndexedModel{
+									unique_pos:spam_pos,
+									unique_normal:spam_normal,
+									unique_tex:spam_tex,
+									unique_color:vec![glam::Vec4::ONE],
+									unique_vertices:spam_vertices,
+									groups:model.meshes().map(|mesh|{
+										let texture=if let (Some(texture_path),Some(texture_name))=(texture_paths.get(0),skin.texture(mesh.material_index())){
+											let mut path=std::path::PathBuf::from(texture_path.as_str());
+											path.push(texture_name);
+											let texture_location=path.as_os_str().to_str().unwrap();
+											let texture_id=if let Some(&texture_id)=texture_id_from_name.get(texture_location){
+												texture_id
+											}else{
+												println!("texture! {}",texture_location);
+												let texture_id=name_from_texture_id.len() as u32;
+												texture_id_from_name.insert(texture_location.to_string(),texture_id);
+												name_from_texture_id.push(texture_location.to_string());
+												texture_id
+											};
+											Some(texture_id)
+										}else{
+											None
+										};
+
+										crate::model::IndexedGroup{
+											texture,
+											polys:{
+												//looking at the code, it would seem that the strips are pre-deindexed into triangle lists when calling this function
+												mesh.vertex_strip_indices().map(|strip|{
+													strip.collect::<Vec<usize>>().chunks(3).map(|tri|{
+														crate::model::IndexedPolygon{vertices:vec![tri[0] as u32,tri[1] as u32,tri[2] as u32]}
+													}).collect::<Vec<crate::model::IndexedPolygon>>()
+												}).flatten().collect()
+											},
+										}
+									}).collect(),
+									instances:Vec::new(),
+								});
+							},
+							_=>println!("model_name={} error",model_name),
+						}
+					},
+					_=>println!("no model name={}",model_name),
+				}
+			}
+
+			//generate model instances
+			for prop in bsp.static_props(){
+				let placement=prop.as_prop_placement();
+				if let Some(&model_index)=model_map.get(placement.model){
+					prop_models[model_index].instances.push(crate::model::ModelInstance{
+						transform:integer::Planar64Affine3::new(
+							integer::Planar64Mat3::try_from(
+								glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale))
+								//TODO: figure this out
+								*glam::Mat3A::from_quat(glam::Quat::from_xyzw(
+									placement.rotation.v.x,//b
+									placement.rotation.v.y,//c
+									placement.rotation.v.z,//d
+									placement.rotation.s,//a
+								))
+							).unwrap(),
+							valve_transform(<[f32;3]>::from(placement.origin)),
+						),
+						attributes:crate::model::CollisionAttributes::Decoration,
+						..Default::default()
+					});
+				}else{
+					//println!("model not found {}",placement.model);
+				}
+			}
+
+			//actually add the prop models
+			prop_models.append(&mut models);
+
+			Ok(crate::model::IndexedModelInstances{
+				textures:name_from_texture_id,
+				models:prop_models,
+				spawn_point,
+				modes:Vec::new(),
+			})
+		},
+		Err(e)=>{
+			println!("rotten {:?}",e);
+			Err(e)
+		},
+	}
+}

src/load_roblox.rs

@@ -1,5 +1,5 @@
 use crate::primitives;
-use crate::integer::{Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
+use strafesnet_common::integer::{Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
 
 fn class_is_a(class: &str, superclass: &str) -> bool {
 	if class==superclass {

src/main.rs

@@ -1,16 +1,14 @@
-mod bvh;
-mod aabb;
+use strafesnet_common::integer;
+
 mod model;
 mod setup;
 mod window;
 mod worker;
-mod zeroes;
-mod integer;
 mod physics;
 mod graphics;
 mod settings;
 mod primitives;
-mod instruction;
+mod load_bsp;
 mod load_roblox;
 mod face_crawler;
 mod compat_worker;
@@ -46,7 +44,7 @@ fn load_file(path: std::path::PathBuf)->Option<model::IndexedModelInstances>{
 						},
 					}
 				},
-				//b"VBSP"=>Some(load_bsp::generate_indexed_models(input)),
+				b"VBSP"=>load_bsp::generate_indexed_models(&mut input).ok(),
 				//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
 				//b"SNFB"=>Some(sniffer::load_bot(input)),
 				other=>{
@@ -116,6 +114,5 @@ pub fn default_models()->model::IndexedModelInstances{
 }
 
 fn main(){
-	let context=setup::setup(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")).as_str());
-	context.start();//creates and runs a window context
+	setup::setup_and_start(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")));
 }

src/model.rs

@@ -1,4 +1,4 @@
-use crate::integer::{Time,Planar64,Planar64Vec3,Planar64Affine3};
+use strafesnet_common::integer::{Time,Planar64,Planar64Vec3,Planar64Affine3};
 pub type TextureCoordinate=glam::Vec2;
 pub type Color4=glam::Vec4;
 #[derive(Clone,Hash,PartialEq,Eq)]
@@ -11,33 +11,8 @@ pub struct IndexedVertex{
 pub struct IndexedPolygon{
 	pub vertices:Vec<u32>,
 }
-pub type TextureId=u32;
-pub type ShaderId=u32;
-pub enum ShaderResource{
-	Model,//pass in model attributes
-	Texture(TextureId),
-	Depth,//current draw depth
-	Normal,
-	BehindTexture,//what is drawn behind this pixel
-}
-pub enum RenderType{
-	NoTexture,//simply draw the vertex color or model color or something
-	Texture(TextureId),
-	Material{
-		texture:TextureId,
-		normal:TextureId,
-	},
-	//GUI,
-	Portal{
-		transform:glam::Mat4,
-	},
-	Shader{
-		id:ShaderId,
-		resources:Vec<ShaderResource>,
-	},
-}
 pub struct IndexedGroup{
-	pub texture:Option<u32>,//TODO: RenderType
+	pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
 	pub polys:Vec<IndexedPolygon>,
 }
 pub struct IndexedModel{

src/model_physics.rs

@@ -1,5 +1,6 @@
-use crate::integer::{Planar64,Planar64Vec3};
 use std::borrow::{Borrow,Cow};
+use strafesnet_common::zeroes;
+use strafesnet_common::integer::{self,Planar64,Planar64Vec3};
 
 #[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
 pub struct VertId(usize);
@@ -236,15 +237,15 @@ impl MeshQuery<FaceId,DirectedEdgeId,VertId> for PhysicsMesh{
 
 pub struct TransformedMesh<'a>{
 	mesh:&'a PhysicsMesh,
-	transform:&'a crate::integer::Planar64Affine3,
-	normal_transform:&'a crate::integer::Planar64Mat3,
+	transform:&'a integer::Planar64Affine3,
+	normal_transform:&'a integer::Planar64Mat3,
 	transform_det:Planar64,
 }
 impl TransformedMesh<'_>{
 	pub fn new<'a>(
 		mesh:&'a PhysicsMesh,
-		transform:&'a crate::integer::Planar64Affine3,
-		normal_transform:&'a crate::integer::Planar64Mat3,
+		transform:&'a integer::Planar64Affine3,
+		normal_transform:&'a integer::Planar64Mat3,
 		transform_det:Planar64,
 		)->TransformedMesh<'a>{
 		TransformedMesh{
@@ -389,7 +390,7 @@ impl MinkowskiMesh<'_>{
 			let test_vert_id=edge_verts[directed_edge_id.parity() as usize];
 			//test if it's closer
 			let diff=point-self.vert(test_vert_id);
-			if crate::zeroes::zeroes1(edge_n.dot(diff),edge_n.dot(infinity_dir)).len()==0{
+			if zeroes::zeroes1(edge_n.dot(diff),edge_n.dot(infinity_dir)).len()==0{
 				let distance_squared=diff.dot(diff);
 				if distance_squared<*best_distance_squared{
 					best_transition=Transition::Vert(test_vert_id);
@@ -407,7 +408,7 @@ impl MinkowskiMesh<'_>{
 			//is boundary uncrossable by a crawl from infinity
 			//check if time of collision is outside Time::MIN..Time::MAX
 			let d=edge_n.dot(diff);
-			if crate::zeroes::zeroes1(d,edge_n.dot(infinity_dir)).len()==0{
+			if zeroes::zeroes1(d,edge_n.dot(infinity_dir)).len()==0{
 				//test the edge
 				let edge_nn=edge_n.dot(edge_n);
 				if Planar64::ZERO<=d&&d<=edge_nn{
@@ -459,7 +460,7 @@ impl MinkowskiMesh<'_>{
 					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)<=Planar64::ZERO&&crate::zeroes::zeroes1(boundary_d,boundary_n.dot(infinity_dir)*2).len()==0{
+					if (boundary_d)<=Planar64::ZERO&&zeroes::zeroes1(boundary_d,boundary_n.dot(infinity_dir)*2).len()==0{
 						//both faces cannot pass this condition, return early if one does.
 						return FEV::<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert>::Face(face_id);
 					}
@@ -475,13 +476,13 @@ impl MinkowskiMesh<'_>{
 			infinity_body.velocity=dir;
 			infinity_body.acceleration=Planar64Vec3::ZERO;
 			//crawl in from negative infinity along a tangent line to get the closest fev
-			match crate::face_crawler::crawl_fev(infinity_fev,self,&infinity_body,crate::integer::Time::MIN,infinity_body.time){
+			match crate::face_crawler::crawl_fev(infinity_fev,self,&infinity_body,integer::Time::MIN,infinity_body.time){
 				crate::face_crawler::CrawlResult::Miss(fev)=>Some(fev),
 				crate::face_crawler::CrawlResult::Hit(_,_)=>None,
 			}
 		})
 	}
-	pub fn predict_collision_in(&self,relative_body:&crate::physics::Body,time_limit:crate::integer::Time)->Option<(MinkowskiFace,crate::integer::Time)>{
+	pub fn predict_collision_in(&self,relative_body:&crate::physics::Body,time_limit:integer::Time)->Option<(MinkowskiFace,integer::Time)>{
 		self.closest_fev_not_inside(relative_body.clone()).map_or(None,|fev|{
 			//continue forwards along the body parabola
 			match crate::face_crawler::crawl_fev(fev,self,relative_body,relative_body.time,time_limit){
@@ -490,7 +491,7 @@ impl MinkowskiMesh<'_>{
 			}
 		})
 	}
-	pub fn predict_collision_out(&self,relative_body:&crate::physics::Body,time_limit:crate::integer::Time)->Option<(MinkowskiFace,crate::integer::Time)>{
+	pub fn predict_collision_out(&self,relative_body:&crate::physics::Body,time_limit:integer::Time)->Option<(MinkowskiFace,integer::Time)>{
 		//create an extrapolated body at time_limit
 		let infinity_body=crate::physics::Body::new(
 			relative_body.extrapolated_position(time_limit),
@@ -506,7 +507,7 @@ impl MinkowskiMesh<'_>{
 			}
 		})
 	}
-	pub fn predict_collision_face_out(&self,relative_body:&crate::physics::Body,time_limit:crate::integer::Time,contact_face_id:MinkowskiFace)->Option<(MinkowskiEdge,crate::integer::Time)>{
+	pub fn predict_collision_face_out(&self,relative_body:&crate::physics::Body,time_limit:integer::Time,contact_face_id:MinkowskiFace)->Option<(MinkowskiEdge,integer::Time)>{
 		//no algorithm needed, there is only one state and two cases (Edge,None)
 		//determine when it passes an edge ("sliding off" case)
 		let mut best_time=time_limit;
@@ -519,8 +520,8 @@ impl MinkowskiMesh<'_>{
 			let verts=self.edge_verts(directed_edge_id.as_undirected());
 			let d=n.dot(self.vert(verts[0])+self.vert(verts[1]));
 			//WARNING! d outside of *2
-			for t in crate::zeroes::zeroes2((n.dot(relative_body.position))*2-d,n.dot(relative_body.velocity)*2,n.dot(relative_body.acceleration)){
-				let t=relative_body.time+crate::integer::Time::from(t);
+			for t in zeroes::zeroes2((n.dot(relative_body.position))*2-d,n.dot(relative_body.velocity)*2,n.dot(relative_body.acceleration)){
+				let t=relative_body.time+integer::Time::from(t);
 				if relative_body.time<t&&t<best_time&&n.dot(relative_body.extrapolated_velocity(t))<Planar64::ZERO{
 					best_time=t;
 					best_edge=Some(directed_edge_id);

src/physics.rs

@@ -1,6 +1,8 @@
-use crate::instruction::{InstructionEmitter,InstructionConsumer,TimedInstruction};
-use crate::integer::{Time,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2};
 use crate::model_physics::{PhysicsMesh,TransformedMesh,MeshQuery};
+use strafesnet_common::bvh;
+use strafesnet_common::aabb;
+use strafesnet_common::instruction::{self,InstructionEmitter,InstructionConsumer,TimedInstruction};
+use strafesnet_common::integer::{self,Time,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2};
 
 #[derive(Debug)]
 pub enum PhysicsInstruction {
@@ -186,9 +188,9 @@ impl PhysicsModels{
 		self.attributes.clear();
 		self.model_id_from_wormhole_id.clear();
 	}
-	fn aabb_list(&self)->Vec<crate::aabb::Aabb>{
+	fn aabb_list(&self)->Vec<aabb::Aabb>{
 		self.models.iter().map(|model|{
-			let mut aabb=crate::aabb::Aabb::default();
+			let mut aabb=aabb::Aabb::default();
 			for pos in self.meshes[model.mesh_id].verts(){
 				aabb.grow(model.transform.transform_point3(pos));
 			}
@@ -342,14 +344,14 @@ struct StrafeSettings{
 struct Hitbox{
 	halfsize:Planar64Vec3,
 	mesh:PhysicsMesh,
-	transform:crate::integer::Planar64Affine3,
+	transform:integer::Planar64Affine3,
 	normal_transform:Planar64Mat3,
 	transform_det:Planar64,
 }
 impl Hitbox{
-	fn new(mesh:PhysicsMesh,transform:crate::integer::Planar64Affine3)->Self{
+	fn new(mesh:PhysicsMesh,transform:integer::Planar64Affine3)->Self{
 		//calculate extents
-		let mut aabb=crate::aabb::Aabb::default();
+		let mut aabb=aabb::Aabb::default();
 		for vert in mesh.verts(){
 			aabb.grow(transform.transform_point3(vert));
 		}
@@ -367,7 +369,7 @@ impl Hitbox{
 			halfsize:scale,
 			mesh,
 			normal_transform:matrix3.inverse_times_det().transpose(),
-			transform:crate::integer::Planar64Affine3::new(matrix3,Planar64Vec3::ZERO),
+			transform:integer::Planar64Affine3::new(matrix3,Planar64Vec3::ZERO),
 			transform_det:matrix3.determinant(),//scale.x*scale.y*scale.z but whatever
 		}
 	}
@@ -377,7 +379,7 @@ impl Hitbox{
 			halfsize:scale,
 			mesh,
 			normal_transform:matrix3.inverse_times_det().transpose(),
-			transform:crate::integer::Planar64Affine3::new(matrix3,offset),
+			transform:integer::Planar64Affine3::new(matrix3,offset),
 			transform_det:matrix3.determinant(),
 		}
 	}
@@ -725,7 +727,7 @@ enum MoveState{
 
 pub struct PhysicsState{
 	time:Time,
-	body:Body,
+	pub body:Body,
 	world:WorldState,//currently there is only one state the world can be in
 	game:GameMechanicsState,
 	style:StyleModifiers,
@@ -736,12 +738,14 @@ pub struct PhysicsState{
 	controls:u32,
 	move_state:MoveState,
 	models:PhysicsModels,
-	bvh:crate::bvh::BvhNode,
+	bvh:bvh::BvhNode,
 	
 	modes:Modes,
 	//the spawn point is where you spawn when you load into the map.
 	//This is not the same as Reset which teleports you to Spawn0
 	spawn_point:Planar64Vec3,
+	//lmao lets go
+	start_time:Option<Time>,
 }
 #[derive(Clone,Default)]
 pub struct PhysicsOutputState{
@@ -783,13 +787,13 @@ pub struct PhysicsModel{
 	//in this iteration, all it needs is extents.
 	mesh_id:usize,
 	attr_id:usize,
-	transform:crate::integer::Planar64Affine3,
-	normal_transform:crate::integer::Planar64Mat3,
+	transform:integer::Planar64Affine3,
+	normal_transform:integer::Planar64Mat3,
 	transform_det:Planar64,
 }
 
 impl PhysicsModel{
-	pub fn new(mesh_id:usize,attr_id:usize,transform:crate::integer::Planar64Affine3)->Self{
+	pub fn new(mesh_id:usize,attr_id:usize,transform:integer::Planar64Affine3)->Self{
 		Self{
 			mesh_id,
 			attr_id,
@@ -944,7 +948,7 @@ impl TouchingState{
 		self.constrain_acceleration(models,&style_mesh,&mut a);
 		(move_state,a)
 	}
-	fn predict_collision_end(&self,collector:&mut crate::instruction::InstructionCollector<PhysicsInstruction>,models:&PhysicsModels,style_mesh:&TransformedMesh,body:&Body,time:Time){
+	fn predict_collision_end(&self,collector:&mut instruction::InstructionCollector<PhysicsInstruction>,models:&PhysicsModels,style_mesh:&TransformedMesh,body:&Body,time:Time){
 		let relative_body=VirtualBody::relative(&Body::default(),body).body(time);
 		for contact in &self.contacts{
 			//detect face slide off
@@ -1008,7 +1012,7 @@ impl Body{
 			Some(self.velocity)
 		}
 	}
-	pub fn grow_aabb(&self,aabb:&mut crate::aabb::Aabb,t0:Time,t1:Time){
+	pub fn grow_aabb(&self,aabb:&mut aabb::Aabb,t0:Time,t1:Time){
 		aabb.grow(self.extrapolated_position(t0));
 		aabb.grow(self.extrapolated_position(t1));
 		//v+a*t==0
@@ -1076,7 +1080,7 @@ impl Default for PhysicsState{
 			style:StyleModifiers::default(),
 			touching:TouchingState::default(),
 			models:PhysicsModels::default(),
-			bvh:crate::bvh::BvhNode::default(),
+			bvh:bvh::BvhNode::default(),
 			move_state: MoveState::Air,
 			camera:PhysicsCamera::default(),
 			next_mouse:MouseState::default(),
@@ -1084,6 +1088,7 @@ impl Default for PhysicsState{
 			world:WorldState{},
 			game:GameMechanicsState::default(),
 			modes:Modes::default(),
+			start_time:None,
 		}
 	}
 }
@@ -1093,7 +1098,7 @@ impl PhysicsState {
 		self.models.clear();
 		self.modes.clear();
 		self.touching.clear();
-		self.bvh=crate::bvh::BvhNode::default();
+		self.bvh=bvh::BvhNode::default();
 	}
 
 	pub fn output(&self)->PhysicsOutputState{
@@ -1107,7 +1112,7 @@ impl PhysicsState {
 	pub fn spawn(&mut self,spawn_point:Planar64Vec3){
 		self.game.stage_id=0;
 		self.spawn_point=spawn_point;
-		self.process_instruction(crate::instruction::TimedInstruction{
+		self.process_instruction(instruction::TimedInstruction{
 			time:self.time,
 			instruction: PhysicsInstruction::Input(PhysicsInputInstruction::Reset),
 		});
@@ -1145,7 +1150,7 @@ impl PhysicsState {
 				self.models.push_mesh(PhysicsMesh::from(model));
 			}
 		}
-		self.bvh=crate::bvh::generate_bvh(self.models.aabb_list());
+		self.bvh=bvh::generate_bvh(self.models.aabb_list());
 		//I don't wanna write structs for temporary structures
 		//this code builds ModeDescriptions from the unsorted lists at the top of the function
 		starts.sort_by_key(|tup|tup.1.mode_id);
@@ -1281,11 +1286,11 @@ impl PhysicsState {
 	}
 }
 
-impl crate::instruction::InstructionEmitter<PhysicsInstruction> for PhysicsState{
+impl instruction::InstructionEmitter<PhysicsInstruction> for PhysicsState{
 	//this little next instruction function can cache its return value and invalidate the cached value by watching the State.
 	fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<PhysicsInstruction>>{
 		//JUST POLLING!!! NO MUTATION
-		let mut collector = crate::instruction::InstructionCollector::new(time_limit);
+		let mut collector = instruction::InstructionCollector::new(time_limit);
 
 		collector.collect(self.next_move_instruction());
 
@@ -1293,7 +1298,7 @@ impl crate::instruction::InstructionEmitter<PhysicsInstruction> for PhysicsState
 		//check for collision ends
 		self.touching.predict_collision_end(&mut collector,&self.models,&style_mesh,&self.body,self.time);
 		//check for collision starts
-		let mut aabb=crate::aabb::Aabb::default();
+		let mut aabb=aabb::Aabb::default();
 		self.body.grow_aabb(&mut aabb,self.time,collector.time());
 		aabb.inflate(self.style.hitbox.halfsize);
 		//common body
@@ -1464,7 +1469,7 @@ fn run_teleport_behaviour(teleport_behaviour:&Option<crate::model::TeleportBehav
 	}
 }
 
-impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsState {
+impl instruction::InstructionConsumer<PhysicsInstruction> for PhysicsState {
 	fn process_instruction(&mut self, ins:TimedInstruction<PhysicsInstruction>) {
 		match &ins.instruction{
 			PhysicsInstruction::Input(PhysicsInputInstruction::Idle)
@@ -1567,6 +1572,21 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 						set_acceleration(&mut self.body,&self.touching,&self.models,&self.style.mesh(),a);
 					},
 					(PhysicsCollisionAttributes::Intersect{intersecting: _,general},Collision::Intersect(intersect))=>{
+						//check for mapstart and set start time
+						let model_id=c.model_id();
+						let start_model_id=self.modes.get_mode(0).unwrap().start;
+						if model_id==start_model_id{
+							//object touched is a mapstart
+							println!("Start!");
+							self.start_time=Some(self.time);
+						}
+
+						//check for map finish and print end time
+						if general.zone.as_ref().is_some_and(|zone|zone.behaviour==crate::model::ZoneBehaviour::Finish){
+							if let Some(start_time)=self.start_time.take(){
+								println!("Finish! Time={}",self.time-start_time);
+							}
+						}
 						//I think that setting the velocity to 0 was preventing surface contacts from entering an infinite loop
 						self.touching.insert(c);
 						run_teleport_behaviour(&general.teleport_behaviour,&mut self.game,&self.models,&self.modes,&self.style,&mut self.touching,&mut self.body,model_id);
@@ -1687,8 +1707,8 @@ fn test_collision_axis_aligned(relative_body:Body,expected_collision_time:Option
 #[allow(dead_code)]
 fn test_collision_rotated(relative_body:Body,expected_collision_time:Option<Time>){
 	let h0=Hitbox::new(PhysicsMesh::from(&crate::primitives::unit_cube()),
-		crate::integer::Planar64Affine3::new(
-			crate::integer::Planar64Mat3::from_cols(
+		integer::Planar64Affine3::new(
+			integer::Planar64Mat3::from_cols(
 				Planar64Vec3::int(5,0,1)/2,
 				Planar64Vec3::int(0,1,0)/2,
 				Planar64Vec3::int(-1,0,5)/2,

src/physics_worker.rs

@@ -1,6 +1,8 @@
-use crate::integer::Time;
 use crate::physics::{MouseState,PhysicsInputInstruction};
-use crate::instruction::{TimedInstruction,InstructionConsumer};
+use strafesnet_common::integer::Time;
+use strafesnet_common::instruction::{TimedInstruction,InstructionConsumer};
+use strafesnet_common::integer::{self,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2};
+
 #[derive(Debug)]
 pub enum InputInstruction {
 	MoveMouse(glam::IVec2),
@@ -23,10 +25,35 @@ pub enum Instruction{
 	//Graphics(crate::graphics_worker::Instruction),
 }
 
+pub struct Speed{
+	pub player_vel:Planar64Vec3,
+	pub time:Time
+}
+
+impl std::ops::Neg for Speed{
+	type Output=Self;
+	fn neg(self)->Self::Output{
+		Self{
+			player_vel:self.player_vel,
+			time:self.time
+		}
+	}
+}
+
+impl  Speed{
+	pub fn new(player_vel:Planar64Vec3,time:Time)->Self{
+		Self{
+			player_vel,
+			time,
+		}
+	}
+}
 	pub fn new(mut physics:crate::physics::PhysicsState,mut graphics_worker:crate::compat_worker::INWorker<crate::graphics_worker::Instruction>)->crate::compat_worker::QNWorker<TimedInstruction<Instruction>>{
 		let mut mouse_blocking=true;
 		let mut last_mouse_time=physics.next_mouse.time;
 		let mut timeline=std::collections::VecDeque::new();
+		let mut next_velocity_print=std::time::Instant::now();
+		let mut player_vel = physics.body.velocity.length();
 		crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{
 			if if let Some(phys_input)=match &ins.instruction{
 				Instruction::Input(input_instruction)=>match input_instruction{
@@ -110,6 +137,11 @@ pub enum Instruction{
 						instruction:crate::physics::PhysicsInstruction::Input(instruction.instruction),
 					});
 				}
+				//some random print stuff
+				if 3.0/5.0<next_velocity_print.elapsed().as_secs_f64(){
+					next_velocity_print=next_velocity_print+std::time::Duration::from_secs_f64(1.0/30.0);
+					println!("velocity: {} u/s", (Planar64Vec3::new(physics.body.velocity.x(), Planar64::int(0), physics.body.velocity.z())).length()*(Planar64::int(130)/9));
+				}
 			}
 			match ins.instruction{
 				Instruction::Render=>{

src/primitives.rs

@@ -1,5 +1,5 @@
 use crate::model::{Color4,TextureCoordinate,IndexedModel,IndexedPolygon,IndexedGroup,IndexedVertex};
-use crate::integer::Planar64Vec3;
+use strafesnet_common::integer::Planar64Vec3;
 
 #[derive(Debug)]
 pub enum Primitives{

src/settings.rs

@@ -1,4 +1,4 @@
-use crate::integer::{Ratio64,Ratio64Vec2};
+use strafesnet_common::integer::{Ratio64,Ratio64Vec2};
 #[derive(Clone)]
 struct Ratio{
 	ratio:f64,

src/setup.rs

@@ -1,5 +1,6 @@
-use crate::instruction::TimedInstruction;
 use crate::window::WindowInstruction;
+use strafesnet_common::instruction::TimedInstruction;
+use strafesnet_common::integer;
 
 fn optional_features()->wgpu::Features{
 	wgpu::Features::TEXTURE_COMPRESSION_ASTC
@@ -46,21 +47,21 @@ fn create_instance()->SetupContextPartial1{
 	}
 }
 impl SetupContextPartial1{
-	fn create_surface(self,window:&winit::window::Window)->Result<SetupContextPartial2,wgpu::CreateSurfaceError>{
+	fn create_surface<'a>(self,window:&'a winit::window::Window)->Result<SetupContextPartial2<'a>,wgpu::CreateSurfaceError>{
 		Ok(SetupContextPartial2{
 			backends:self.backends,
-			surface:unsafe{self.instance.create_surface(window)}?,
+			surface:self.instance.create_surface(window)?,
 			instance:self.instance,
 		})
 	}
 }
-struct SetupContextPartial2{
+struct SetupContextPartial2<'a>{
 	backends:wgpu::Backends,
 	instance:wgpu::Instance,
-	surface:wgpu::Surface,
+	surface:wgpu::Surface<'a>,
 }
-impl SetupContextPartial2{
-	fn pick_adapter(self)->SetupContextPartial3{
+impl<'a> SetupContextPartial2<'a>{
+	fn pick_adapter(self)->SetupContextPartial3<'a>{
 		let adapter;
 
 		//TODO: prefer adapter that implements optional features
@@ -122,13 +123,13 @@ impl SetupContextPartial2{
 		}
 	}
 }
-struct SetupContextPartial3{
+struct SetupContextPartial3<'a>{
 	instance:wgpu::Instance,
-	surface:wgpu::Surface,
+	surface:wgpu::Surface<'a>,
 	adapter:wgpu::Adapter,
 }
-impl SetupContextPartial3{
-	fn request_device(self)->SetupContextPartial4{
+impl<'a> SetupContextPartial3<'a>{
+	fn request_device(self)->SetupContextPartial4<'a>{
 		let optional_features=optional_features();
 		let required_features=required_features();
 
@@ -140,8 +141,8 @@ impl SetupContextPartial3{
 			.request_device(
 				&wgpu::DeviceDescriptor {
 					label: None,
-					features: (optional_features & self.adapter.features()) | required_features,
-					limits: needed_limits,
+					required_features: (optional_features & self.adapter.features()) | required_features,
+					required_limits: needed_limits,
 				},
 				trace_dir.ok().as_ref().map(std::path::Path::new),
 			))
@@ -156,15 +157,15 @@ impl SetupContextPartial3{
 		}
 	}
 }
-struct SetupContextPartial4{
+struct SetupContextPartial4<'a>{
 	instance:wgpu::Instance,
-	surface:wgpu::Surface,
+	surface:wgpu::Surface<'a>,
 	adapter:wgpu::Adapter,
 	device:wgpu::Device,
 	queue:wgpu::Queue,
 }
-impl SetupContextPartial4{
-	fn configure_surface(self,size:&winit::dpi::PhysicalSize<u32>)->SetupContext{
+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.");
@@ -182,58 +183,36 @@ impl SetupContextPartial4{
 		}
 	}
 }
-pub struct SetupContext{
+pub struct SetupContext<'a>{
 	pub instance:wgpu::Instance,
-	pub surface:wgpu::Surface,
+	pub surface:wgpu::Surface<'a>,
 	pub device:wgpu::Device,
 	pub queue:wgpu::Queue,
 	pub config:wgpu::SurfaceConfiguration,
 }
 
-pub fn setup(title:&str)->SetupContextSetup{
+pub fn setup_and_start(title:String){
 	let event_loop=winit::event_loop::EventLoop::new().unwrap();
 
-	let window=create_window(title,&event_loop).unwrap();
-
 	println!("Initializing the surface...");
 
 	let partial_1=create_instance();
 
+	let window=create_window(title.as_str(),&event_loop).unwrap();
+
 	let partial_2=partial_1.create_surface(&window).unwrap();
 
 	let partial_3=partial_2.pick_adapter();
 
 	let partial_4=partial_3.request_device();
 
-	SetupContextSetup{
-		window,
-		event_loop,
-		partial_context:partial_4,
-	}
-}
+	let size=window.inner_size();
 
-pub struct SetupContextSetup{
-	window:winit::window::Window,
-	event_loop:winit::event_loop::EventLoop<()>,
-	partial_context:SetupContextPartial4,
-}
-
-impl SetupContextSetup{
-	fn into_split(self)->(winit::window::Window,winit::event_loop::EventLoop<()>,SetupContext){
-		let size=self.window.inner_size();
-		//Steal values and drop self
-		(
-			self.window,
-			self.event_loop,
-			self.partial_context.configure_surface(&size),
-		)
-	}
-	pub fn start(self){
-		let (window,event_loop,setup_context)=self.into_split();
+	let setup_context=partial_4.configure_surface(&size);
 
 	//dedicated thread to ping request redraw back and resize the window doesn't seem logical
 
-		let window=crate::window::WindowContextSetup::new(&setup_context,window);
+	let window=crate::window::WindowContextSetup::new(&setup_context,&window);
 	//the thread that spawns the physics thread
 	let window_thread=window.into_worker(setup_context);
 
@@ -241,7 +220,6 @@ impl SetupContextSetup{
 	let root_time=std::time::Instant::now();
 	run_event_loop(event_loop,window_thread,root_time).unwrap();
 }
-}
 
 fn run_event_loop(
 	event_loop:winit::event_loop::EventLoop<()>,
@@ -249,7 +227,7 @@ fn run_event_loop(
 	root_time:std::time::Instant
 	)->Result<(),winit::error::EventLoopError>{
 		event_loop.run(move |event,elwt|{
-			let time=crate::integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64);
+			let time=integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64);
 			// *control_flow=if cfg!(feature="metal-auto-capture"){
 			// 	winit::event_loop::ControlFlow::Exit
 			// }else{

src/window.rs

@@ -1,5 +1,6 @@
-use crate::instruction::TimedInstruction;
 use crate::physics_worker::InputInstruction;
+use strafesnet_common::integer;
+use strafesnet_common::instruction::TimedInstruction;
 
 pub enum WindowInstruction{
 	Resize(winit::dpi::PhysicalSize<u32>),
@@ -15,7 +16,7 @@ struct WindowContext<'a>{
 	mouse:crate::physics::MouseState,//std::sync::Arc<std::sync::Mutex<>>
 	screen_size:glam::UVec2,
 	user_settings:crate::settings::UserSettings,
-	window:winit::window::Window,
+	window:&'a winit::window::Window,
 	physics_thread:crate::compat_worker::QNWorker<'a, TimedInstruction<crate::physics_worker::Instruction>>,
 }
 
@@ -23,7 +24,7 @@ impl WindowContext<'_>{
 	fn get_middle_of_screen(&self)->winit::dpi::PhysicalPosition<f32>{
 		winit::dpi::PhysicalPosition::new(self.screen_size.x as f32/2.0,self.screen_size.y as f32/2.0)
 	}
-	fn window_event(&mut self,time:crate::integer::Time,event: winit::event::WindowEvent) {
+	fn window_event(&mut self,time:integer::Time,event: winit::event::WindowEvent) {
 		match event {
 			winit::event::WindowEvent::DroppedFile(path)=>{
 				//blocking because it's simpler...
@@ -121,7 +122,7 @@ impl WindowContext<'_>{
 		}
 	}
 
-	fn device_event(&mut self,time:crate::integer::Time,event: winit::event::DeviceEvent) {
+	fn device_event(&mut self,time:integer::Time,event: winit::event::DeviceEvent) {
 		match event {
 			winit::event::DeviceEvent::MouseMotion {
 			    delta,//these (f64,f64) are integers on my machine
@@ -158,15 +159,15 @@ impl WindowContext<'_>{
 	}
 }
 
-pub struct WindowContextSetup{
+pub struct WindowContextSetup<'a>{
 	user_settings:crate::settings::UserSettings,
-	window:winit::window::Window,
+	window:&'a winit::window::Window,
 	physics:crate::physics::PhysicsState,
 	graphics:crate::graphics::GraphicsState,
 }
 
-impl WindowContextSetup{
-	pub fn new(context:&crate::setup::SetupContext,window:winit::window::Window)->Self{
+impl<'a> WindowContextSetup<'a>{
+	pub fn new(context:&crate::setup::SetupContext,window:&'a winit::window::Window)->Self{
 		//wee
 		let user_settings=crate::settings::read_user_settings();
 
@@ -194,7 +195,7 @@ impl WindowContextSetup{
 		}
 	}
 
-	fn into_context<'a>(self,setup_context:crate::setup::SetupContext)->WindowContext<'a>{
+	fn into_context(self,setup_context:crate::setup::SetupContext<'a>)->WindowContext<'a>{
 		let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height);
 		let graphics_thread=crate::graphics_worker::new(self.graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue);
 		WindowContext{
@@ -208,7 +209,7 @@ impl WindowContextSetup{
 		}
 	}
 
-	pub fn into_worker<'a>(self,setup_context:crate::setup::SetupContext)->crate::compat_worker::QNWorker<'a,TimedInstruction<WindowInstruction>>{
+	pub fn into_worker(self,setup_context:crate::setup::SetupContext<'a>)->crate::compat_worker::QNWorker<'a,TimedInstruction<WindowInstruction>>{
 		let mut window_context=self.into_context(setup_context);
 		crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<WindowInstruction>|{
 			match ins.instruction{

src/worker.rs

@@ -183,8 +183,8 @@ fn test_worker() {
 
 	// Send tasks to the worker
 	for _ in 0..5 {
-		let task = crate::instruction::TimedInstruction{
-			time:crate::integer::Time::ZERO,
+		let task = strafesnet_common::instruction::TimedInstruction{
+			time:strafesnet_common::integer::Time::ZERO,
 			instruction:crate::physics::PhysicsInstruction::StrafeTick,
 		};
 		worker.send(task).unwrap();
@@ -197,8 +197,8 @@ fn test_worker() {
 	thread::sleep(std::time::Duration::from_millis(10));
 
 	// Send a new task
-	let task = crate::instruction::TimedInstruction{
-		time:crate::integer::Time::ZERO,
+	let task = strafesnet_common::instruction::TimedInstruction{
+		time:strafesnet_common::integer::Time::ZERO,
 		instruction:crate::physics::PhysicsInstruction::StrafeTick,
 	};
 	worker.send(task).unwrap();

src/zeroes.rs

@@ -1,40 +0,0 @@
-//find roots of polynomials
-use crate::integer::Planar64;
-
-#[inline]
-pub fn zeroes2(a0:Planar64,a1:Planar64,a2:Planar64) -> Vec<Planar64>{
-	if a2==Planar64::ZERO{
-		return zeroes1(a0, a1);
-	}
-	let radicand=a1.get() as i128*a1.get() as i128-a2.get() as i128*a0.get() as i128*4;
-	if 0<radicand {
-		//start with f64 sqrt
-		//failure case: 2^63 < sqrt(2^127)
-		let planar_radicand=Planar64::raw(unsafe{(radicand as f64).sqrt().to_int_unchecked()});
-		//TODO: one or two newtons
-		//sort roots ascending and avoid taking the difference of large numbers
-		match (Planar64::ZERO<a2,Planar64::ZERO<a1){
-			(true, true )=>vec![(-a1-planar_radicand)/(a2*2),(a0*2)/(-a1-planar_radicand)],
-			(true, false)=>vec![(a0*2)/(-a1+planar_radicand),(-a1+planar_radicand)/(a2*2)],
-			(false,true )=>vec![(a0*2)/(-a1-planar_radicand),(-a1-planar_radicand)/(a2*2)],
-			(false,false)=>vec![(-a1+planar_radicand)/(a2*2),(a0*2)/(-a1+planar_radicand)],
-		}
-	} else if radicand==0 {
-		return vec![a1/(a2*-2)];
-	} else {
-		return vec![];
-	}
-}
-#[inline]
-pub fn zeroes1(a0:Planar64,a1:Planar64) -> Vec<Planar64> {
-	if a1==Planar64::ZERO{
-		return vec![];
-	}else{
-		let q=((-a0.get() as i128)<<32)/(a1.get() as i128);
-		if i64::MIN as i128<=q&&q<=i64::MAX as i128{
-			return vec![Planar64::raw(q as i64)];
-		}else{
-			return vec![];
-		}
-	}
-}