sad api

make invalid states unrepresentable!!!

Cargo.lock

@@ -28,7 +28,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"
 dependencies = [
  "jobserver",
  "libc",
@@ -1460,11 +1460,11 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy 0.6.6",
+ "zerocopy",
 ]
 
 [[package]]
@@ -1587,9 +1587,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_dom_weak"
-version = "2.7.0"
+version = "2.9.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "850d0a6c8d22592b125c9a82f8654857a7aba10f061b930cc2b86438e54157f1"
+checksum = "2a6b916687c98aaea36f9c03e80906bfafab057bebee248628c8c04def807f43"
 dependencies = [
  "rbx_types",
  "serde",
@@ -1607,9 +1607,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_reflection"
-version = "4.5.0"
+version = "4.7.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "80d31f6675c27c9f60b2322feb5565f4a4389ccbb75de4e737915e9208f0831f"
+checksum = "c1b43fe592a4ce6fe54eb215fb82735efbb516d2cc045a94e3dc0234ff293620"
 dependencies = [
  "rbx_types",
  "serde",
@@ -1618,9 +1618,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_reflection_database"
-version = "0.2.10+roblox-607"
+version = "0.2.12+roblox-638"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "f4da9f73ca317c158b922b757fe02317f7d3bc31d3f9fdb4a748d48b3951b8b8"
+checksum = "2e772bb9e1bc0ebe65d338f876d1bb1ea22e15a8f9a82e8245028010c2fea3c9"
 dependencies = [
  "lazy_static",
  "rbx_reflection",
@@ -1630,9 +1630,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_types"
-version = "1.8.0"
+version = "1.10.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "6d0d394018a8df53fcd91e990301fe6e47b94e15067edfcb019e6238ae60e8bb"
+checksum = "d7a390c44034fa448c53bd0983dfc2d70d8d6b2f65be4f164d4bec8b6a2a2d09"
 dependencies = [
  "base64",
  "bitflags 1.3.2",
@@ -1787,18 +1787,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.205"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.205"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1880,7 +1880,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafe-client"
-version = "0.10.2"
+version = "0.10.3"
 dependencies = [
  "bytemuck",
  "configparser",
@@ -1900,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_bsp_loader"
-version = "0.1.3"
+version = "0.1.5"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "6d4af68c422b5f57febbaa218f44ba02d413fd25e84afff9e45e557a8caee2ce"
+checksum = "35ee2c534efa039ad17ca41893ba1d75fafff014076353ac676c73fc808b9e44"
 dependencies = [
  "glam",
  "strafesnet_common",
@@ -1912,10 +1912,11 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_common"
-version = "0.2.2"
+version = "0.4.1"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "8d5459f1862aa23c514a6331e8b65cdee1d18b340d003ae03ebbfaa34c82e614"
+checksum = "9a2621612e675a8f804abbbbe3b60caeafe58a2422cccbe453268d6f457df4f3"
 dependencies = [
+ "arrayvec",
  "bitflags 2.6.0",
  "glam",
  "id",
@@ -1923,9 +1924,9 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_deferred_loader"
-version = "0.3.1"
+version = "0.3.3"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "c3891dcbdbc20b03cf561786b810e839ae7c11dd8810fd005f2474805ee9cccc"
+checksum = "596aba6d2747818781336ad95a1ee496e37f70052fd625a299fc7a555a6938d4"
 dependencies = [
  "lazy-regex",
  "strafesnet_common",
@@ -1934,9 +1935,9 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_rbx_loader"
-version = "0.3.2"
+version = "0.3.4"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "21ea93b0170063dd2a063a138c41e6f7a6c14a82c6553fa4ba32df65a26efc6e"
+checksum = "6cd7fb0eca01ccd382067924e5fad15844f55a6bcc7c14c0e57a171298263a3e"
 dependencies = [
  "bytemuck",
  "glam",
@@ -1951,9 +1952,9 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_snf"
-version = "0.1.1"
+version = "0.1.3"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "78479f73437a3f10230efd2304be0f3ef30dff98c54d93613ed1621bfd6a7da6"
+checksum = "a9ae481152d0389be29967e1d5f0377498df8ff9638175d56cd8e2c2e6982bfa"
 dependencies = [
  "binrw 0.14.0",
  "id",
@@ -2103,9 +2104,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
 
 [[package]]
 name = "unicode-ident"
@@ -2527,11 +2528,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2577,6 +2578,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -2757,9 +2767,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.30.4"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4225ddd8ab67b8b59a2fee4b34889ebf13c0460c1c3fa297c58e21eb87801b33"
+checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
 dependencies = [
  "ahash",
  "android-activity",
@@ -2875,19 +2885,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
-
-[[package]]
-name = "zerocopy"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
-dependencies = [
- "byteorder 1.5.0",
- "zerocopy-derive 0.6.6",
-]
+checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
 
 [[package]]
 name = "zerocopy"
@@ -2895,18 +2895,8 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
+ "byteorder 1.5.0",
+ "zerocopy-derive",
 ]
 
 [[package]]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.10.2"
+version = "0.10.3"
 edition = "2021"
 repository = "https://git.itzana.me/StrafesNET/strafe-client"
 license = "Custom"
@@ -23,10 +23,10 @@ id = { version = "0.1.0", registry = "strafesnet" }
 parking_lot = "0.12.1"
 pollster = "0.3.0"
 strafesnet_bsp_loader = { version = "0.1.3", registry = "strafesnet", optional = true }
-strafesnet_common = { version = "0.2.1", registry = "strafesnet" }
+strafesnet_common = { version = "0.4.0", registry = "strafesnet" }
 strafesnet_deferred_loader = { version = "0.3.1", features = ["legacy"], registry = "strafesnet", optional = true }
 strafesnet_rbx_loader = { version = "0.3.2", registry = "strafesnet", optional = true }
-strafesnet_snf = { version = "0.1.0", registry = "strafesnet", optional = true }
+strafesnet_snf = { version = "0.1.2", registry = "strafesnet", optional = true }
 wgpu = "22.0.0"
 winit = "0.30.4"
 

src/bot_worker.rs

@@ -1,31 +0,0 @@
-use strafesnet_snf::bot::BotDebug;
-
-pub enum Instruction{
-	//TODO: pass map id
-	Create,
-	//Delete,
-	Push{
-		ins:strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction>,
-	},
-}
-
-//a new worker is spawned on a thread
-//create opens a new file
-//push pushes an instruction to the file
-
-pub struct Worker{
-	file:BotDebug,
-}
-
-pub fn new<'a>(scope:&'a std::thread::Scope<'a,'_>)->crate::worker::QNWorker<'a,Instruction>{
-	let mut worker=Worker{
-		file:BotDebug::new().unwrap(),
-	};
-	crate::worker::QNWorker::new(scope,move|instruction|{
-		match instruction{
-			Instruction::Create=>worker.file=BotDebug::new().unwrap(),
-			//Instruction::Delete=>worker.file.delete().unwrap(),
-			Instruction::Push{ins}=>worker.file.push(ins).unwrap(),
-		}
-	})
-}

src/file.rs

@@ -66,7 +66,9 @@ pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<strafesnet_common::map::Co
 		#[cfg(feature="snf")]
 		DataStructure::StrafesNET(map)=>Ok(map),
 		#[cfg(feature="roblox")]
-		DataStructure::Roblox(dom)=>{
+		DataStructure::Roblox(mut dom)=>{
+			dom=dom.run_scripts();
+
 			let mut loader=strafesnet_deferred_loader::roblox_legacy();
 
 			let (texture_loader,mesh_loader)=loader.get_inner_mut();

src/graphics.rs

@@ -6,12 +6,6 @@ use strafesnet_common::model::{self, ColorId, NormalId, PolygonIter, PositionId,
 use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
 use crate::model_graphics::{self,IndexedGraphicsMeshOwnedRenderConfig,IndexedGraphicsMeshOwnedRenderConfigId,GraphicsMeshOwnedRenderConfig,GraphicsModelColor4,GraphicsModelOwned,GraphicsVertex};
 
-#[derive(Clone)]
-pub struct GraphicsModelUpdate{
-	transform:Option<glam::Mat4>,
-	color:Option<glam::Vec4>,
-}
-
 struct Indices{
 	count:u32,
 	buf:wgpu::Buffer,
@@ -32,7 +26,6 @@ impl Indices{
 }
 struct GraphicsModel{
 	indices:Indices,
-	model_buf:wgpu::Buffer,
 	vertex_buf:wgpu::Buffer,
 	bind_group:wgpu::BindGroup,
 	instance_count:u32,
@@ -65,12 +58,12 @@ struct GraphicsCamera{
 #[inline]
 fn perspective_rh(fov_x_slope:f32,fov_y_slope:f32,z_near:f32,z_far:f32)->glam::Mat4{
 	//glam_assert!(z_near > 0.0 && z_far > 0.0);
-	let r=z_far / (z_near-z_far);
+	let r=z_far/(z_near-z_far);
 	glam::Mat4::from_cols(
 		glam::Vec4::new(1.0/fov_x_slope,0.0,0.0,0.0),
 		glam::Vec4::new(0.0,1.0/fov_y_slope,0.0,0.0),
 		glam::Vec4::new(0.0,0.0,r,-1.0),
-		glam::Vec4::new(0.0,0.0,r * z_near,0.0),
+		glam::Vec4::new(0.0,0.0,r*z_near,0.0),
 	)
 }
 impl GraphicsCamera{
@@ -79,10 +72,10 @@ impl GraphicsCamera{
 	}
 	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)
+		glam::Mat4::from_translation(pos)*glam::Mat4::from_euler(glam::EulerRot::YXZ,angles.x,angles.y,0f32)
 	}
 
-	pub fn to_uniform_data(&self,(pos,angles):(glam::Vec3,glam::Vec2))->[f32; 16 * 4]{
+	pub fn to_uniform_data(&self,pos:glam::Vec3,angles:glam::Vec2)->[f32;16*4]{
 		let proj=self.proj();
 		let proj_inv=proj.inverse();
 		let view_inv=self.world(pos,angles);
@@ -105,6 +98,12 @@ impl std::default::Default for GraphicsCamera{
 	}
 }
 
+pub struct FrameState{
+	pub body:crate::physics::Body,
+	pub camera:crate::physics::PhysicsCamera,
+	pub time:integer::Time,
+}
+
 pub struct GraphicsState{
 	pipelines:GraphicsPipelines,
 	bind_groups:GraphicsBindGroups,
@@ -507,7 +506,6 @@ impl GraphicsState{
 						model_graphics::Indices::U16(indices)=>Indices::new(device,indices,wgpu::IndexFormat::Uint16),
 					},
 					bind_group,
-					model_buf,
 				});
 			}
 		}
@@ -816,7 +814,7 @@ impl GraphicsState{
 		});
 
 		let camera=GraphicsCamera::default();
-		let camera_uniforms=camera.to_uniform_data(crate::physics::PhysicsOutputState::default().extrapolate(strafesnet_common::mouse::MouseState::default()));
+		let camera_uniforms=camera.to_uniform_data(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),
@@ -884,16 +882,17 @@ impl GraphicsState{
 		view:&wgpu::TextureView,
 		device:&wgpu::Device,
 		queue:&wgpu::Queue,
-		physics_output:crate::physics::PhysicsOutputState,
-		predicted_time:integer::Time,
-		mouse_pos:glam::IVec2,
+		frame_state:FrameState,
 	){
 		//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(physics_output.extrapolate(strafesnet_common::mouse::MouseState{pos:mouse_pos,time:predicted_time}));
+		let camera_uniforms=self.camera.to_uniform_data(
+			frame_state.body.extrapolated_position(frame_state.time).into(),
+			frame_state.camera.simulate_move_angles(glam::IVec2::ZERO)
+		);
 		self.staging_belt
 			.write_buffer(
 				&mut encoder,

src/graphics_worker.rs

@@ -1,7 +1,5 @@
-use strafesnet_common::integer;
-
 pub enum Instruction{
-	Render(crate::physics::PhysicsOutputState,integer::Time,glam::IVec2),
+	Render(crate::graphics::FrameState),
 	//UpdateModel(crate::graphics::GraphicsModelUpdate),
 	Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
 	ChangeMap(strafesnet_common::map::CompleteMap),
@@ -17,12 +15,12 @@ WorkerDescription{
 //up to three frames in flight, dropping new frame requests when all three are busy, and dropping output frames when one renders out of order
 
 pub fn new<'a>(
-		mut graphics:crate::graphics::GraphicsState,
-		mut config:wgpu::SurfaceConfiguration,
-		surface:wgpu::Surface<'a>,
-		device:wgpu::Device,
-		queue:wgpu::Queue,
-	)->crate::compat_worker::INWorker<'a,Instruction>{
+	mut graphics:crate::graphics::GraphicsState,
+	mut config:wgpu::SurfaceConfiguration,
+	surface:wgpu::Surface<'a>,
+	device:wgpu::Device,
+	queue:wgpu::Queue,
+)->crate::compat_worker::INWorker<'a,Instruction>{
 	let mut resize=None;
 	crate::compat_worker::INWorker::new(move |ins:Instruction|{
 		match ins{
@@ -33,18 +31,16 @@ pub fn new<'a>(
 			Instruction::Resize(size,user_settings)=>{
 				resize=Some((size,user_settings));
 			}
-			Instruction::Render(physics_output,predicted_time,mouse_pos)=>{
-				if let Some((size,user_settings))=&resize{
+			Instruction::Render(frame_state)=>{
+				if let Some((size,user_settings))=resize.take(){
 					println!("Resizing to {:?}",size);
 					let t0=std::time::Instant::now();
 					config.width=size.width.max(1);
 					config.height=size.height.max(1);
 					surface.configure(&device,&config);
-					graphics.resize(&device,&config,user_settings);
+					graphics.resize(&device,&config,&user_settings);
 					println!("Resize took {:?}",t0.elapsed());
 				}
-				//clear every time w/e
-				resize=None;
 				//this has to go deeper somehow
 				let frame=match surface.get_current_texture(){
 					Ok(frame)=>frame,
@@ -60,7 +56,7 @@ pub fn new<'a>(
 					..wgpu::TextureViewDescriptor::default()
 				});
 
-				graphics.render(&view,&device,&queue,physics_output,predicted_time,mouse_pos);
+				graphics.render(&view,&device,&queue,frame_state);
 
 				frame.present();
 			}

src/main.rs

@@ -5,7 +5,6 @@ mod worker;
 mod physics;
 mod graphics;
 mod settings;
-mod bot_worker;
 mod face_crawler;
 mod compat_worker;
 mod model_physics;

src/model_physics.rs

@@ -462,7 +462,7 @@ pub struct TransformedMesh<'a>{
 	transform:&'a PhysicsMeshTransform,
 }
 impl TransformedMesh<'_>{
-	pub fn new<'a>(
+	pub const fn new<'a>(
 		view:PhysicsMeshView<'a>,
 		transform:&'a PhysicsMeshTransform,
 	)->TransformedMesh<'a>{
@@ -751,6 +751,23 @@ impl MinkowskiMesh<'_>{
 		}
 		best_edge.map(|e|(e.as_undirected(),best_time))
 	}
+	fn infinity_in(&self,infinity_body:crate::physics::Body)->Option<(MinkowskiFace,integer::Time)>{
+		let infinity_fev=self.infinity_fev(-infinity_body.velocity,infinity_body.position);
+		match crate::face_crawler::crawl_fev(infinity_fev,self,&infinity_body,integer::Time::MIN,infinity_body.time){
+			crate::face_crawler::CrawlResult::Miss(_)=>None,
+			crate::face_crawler::CrawlResult::Hit(face,time)=>Some((face,time)),
+		}
+	}
+	pub fn is_point_in_mesh(&self,point:Planar64Vec3)->bool{
+		let infinity_body=crate::physics::Body::new(point,Planar64Vec3::Y,Planar64Vec3::ZERO,integer::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<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert> for MinkowskiMesh<'_>{
 	fn face_nd(&self,face_id:MinkowskiFace)->(Planar64Vec3,Planar64){

src/physics_worker.rs

@@ -32,32 +32,29 @@ pub enum Instruction{
 mod mouse_interpolator{
 	use super::*;
 	//TODO: move this or tab
-pub struct MouseInterpolator<'a>{
+pub struct MouseInterpolator{
 	//"PlayerController"
+	user_settings:crate::settings::UserSettings,
+	//"MouseInterpolator"
 	timeline:std::collections::VecDeque<TimedInstruction<PhysicsInputInstruction>>,
 	last_mouse_time:Time,//this value is pre-transformed to simulation time
 	mouse_blocking:bool,
-	//????
-	bot_worker:crate::worker::QNWorker<'a,crate::bot_worker::Instruction>,
-	user_settings:crate::settings::UserSettings,
 	//"Simulation"
 	timer:Timer<Scaled>,
 	physics:crate::physics::PhysicsContext,
 
 }
-impl MouseInterpolator<'_>{
-	pub fn new<'a>(
+impl MouseInterpolator{
+	pub fn new(
 		physics:crate::physics::PhysicsContext,
-		bot_worker:crate::worker::QNWorker<'a,crate::bot_worker::Instruction>,
 		user_settings:crate::settings::UserSettings,
-	)->MouseInterpolator<'a>{
+	)->MouseInterpolator{
 		MouseInterpolator{
 			mouse_blocking:true,
 			last_mouse_time:physics.get_next_mouse().time,
 			timeline:std::collections::VecDeque::new(),
 			timer:Timer::from_state(Scaled::identity(),false),
 			physics,
-			bot_worker,
 			user_settings,
 		}
 	}
@@ -174,13 +171,6 @@ impl MouseInterpolator<'_>{
 	}
 	fn empty_queue(&mut self){
 		while let Some(instruction)=self.timeline.pop_front(){
-			//makeshift clone because requiring all TimedInstructions to be Clone is troublesome
-			self.bot_worker.send(crate::bot_worker::Instruction::Push{
-				ins:TimedInstruction{
-					time:instruction.time,
-					instruction:instruction.instruction.clone(),
-				}
-			}).unwrap();
 			self.physics.run_input_instruction(instruction);
 		}
 	}
@@ -190,8 +180,12 @@ impl MouseInterpolator<'_>{
 			self.empty_queue();
 		}
 	}
-	pub fn get_render_stuff(&self,time:Time)->(crate::physics::PhysicsOutputState,Time,glam::IVec2){
-		(self.physics.output(),self.timer.time(time),self.physics.get_next_mouse().pos)
+	pub fn get_frame_state(&self,time:Time)->crate::graphics::FrameState{
+		crate::graphics::FrameState{
+			body:self.physics.camera_body(),
+			camera:self.physics.camera(),
+			time:self.timer.time(time),
+		}
 	}
 	pub fn change_map(&mut self,time:Time,map:&strafesnet_common::map::CompleteMap){
 		//dump any pending interpolation state
@@ -220,17 +214,19 @@ impl MouseInterpolator<'_>{
 
 pub fn new<'a>(
 	mut graphics_worker:crate::compat_worker::INWorker<'a,crate::graphics_worker::Instruction>,
-	bot_worker:crate::worker::QNWorker<'a,crate::bot_worker::Instruction>,
 	user_settings:crate::settings::UserSettings,
 )->crate::compat_worker::QNWorker<'a,TimedInstruction<Instruction>>{
 	let physics=crate::physics::PhysicsContext::default();
-	let mut interpolator=MouseInterpolator::new(physics,bot_worker,user_settings);
+	let mut interpolator=MouseInterpolator::new(
+		physics,
+		user_settings
+	);
 	crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{
 		interpolator.handle_instruction(&ins);
 		match ins.instruction{
 			Instruction::Render=>{
-				let (physics_output,time,mouse_pos)=interpolator.get_render_stuff(ins.time);
-				graphics_worker.send(crate::graphics_worker::Instruction::Render(physics_output,time,mouse_pos)).unwrap();
+				let frame_state=interpolator.get_frame_state(ins.time);
+				graphics_worker.send(crate::graphics_worker::Instruction::Render(frame_state)).unwrap();
 			},
 			Instruction::Resize(size)=>{
 				graphics_worker.send(crate::graphics_worker::Instruction::Resize(size,interpolator.user_settings().clone())).unwrap();

src/setup.rs

@@ -213,22 +213,23 @@ pub fn setup_and_start(title:String){
 
 	//dedicated thread to ping request redraw back and resize the window doesn't seem logical
 
-	std::thread::scope(|scope|{
-		//the thread that spawns the physics thread
-		let mut window_thread=crate::window::worker(&window,setup_context,scope);
+	//the thread that spawns the physics thread
+	let mut window_thread=crate::window::worker(
+		&window,
+		setup_context,
+	);
 
-		if let Some(arg)=std::env::args().nth(1){
-			let path=std::path::PathBuf::from(arg);
-			window_thread.send(TimedInstruction{
-				time:integer::Time::ZERO,
-				instruction:WindowInstruction::WindowEvent(winit::event::WindowEvent::DroppedFile(path)),
-			}).unwrap();
-		};
+	if let Some(arg)=std::env::args().nth(1){
+		let path=std::path::PathBuf::from(arg);
+		window_thread.send(TimedInstruction{
+			time:integer::Time::ZERO,
+			instruction:WindowInstruction::WindowEvent(winit::event::WindowEvent::DroppedFile(path)),
+		}).unwrap();
+	};
 
-		println!("Entering event loop...");
-		let root_time=std::time::Instant::now();
-		run_event_loop(event_loop,window_thread,root_time).unwrap();
-	});
+	println!("Entering event loop...");
+	let root_time=std::time::Instant::now();
+	run_event_loop(event_loop,window_thread,root_time).unwrap();
 }
 
 fn run_event_loop(

src/window.rs

@@ -165,7 +165,10 @@ impl WindowContext<'_>{
 		}
 	}
 }
-pub fn worker<'a>(window:&'a winit::window::Window,setup_context:crate::setup::SetupContext<'a>,scope:&'a std::thread::Scope<'a,'_>)->crate::compat_worker::QNWorker<'a,TimedInstruction<WindowInstruction>>{
+pub fn worker<'a>(
+	window:&'a winit::window::Window,
+	setup_context:crate::setup::SetupContext<'a>,
+)->crate::compat_worker::QNWorker<'a,TimedInstruction<WindowInstruction>>{
 	// WindowContextSetup::new
 		let user_settings=crate::settings::read_user_settings();
 
@@ -175,15 +178,16 @@ pub fn worker<'a>(window:&'a winit::window::Window,setup_context:crate::setup::S
 	//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);
-		//this obviously doesn't belong here, do something about it pls
-		let bot_thread=crate::bot_worker::new(scope);
 		let mut window_context=WindowContext{
 			manual_mouse_lock:false,
 			mouse:strafesnet_common::mouse::MouseState::default(),
 			//make sure to update this!!!!!
 			screen_size,
 			window,
-			physics_thread:crate::physics_worker::new(graphics_thread,bot_thread,user_settings),
+			physics_thread:crate::physics_worker::new(
+				graphics_thread,
+				user_settings,
+			),
 		};
 
 	//WindowContextSetup::into_worker