idea: multiple collisions can happen in the same instant

Cargo.toml

@@ -24,14 +24,3 @@ resolver = "2"
 #lto = true
 strip = true
 codegen-units = 1
-
-[workspace.lints.rust]
-# unsafe_code = "forbid"
-# missing_docs = "warn"
-# missing_debug_implementations = "warn"
-single_use_lifetimes = "warn"
-trivial_casts = "warn"
-unused_lifetimes = "warn"
-unused_qualifications = "warn"
-# variant_size_differences = "warn"
-unexpected_cfgs = "warn"

engine/graphics/Cargo.toml

@@ -11,7 +11,4 @@ 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" }
-wgpu = "27.0.0"
-
-[lints]
-workspace = true
+wgpu = "26.0.1"

engine/graphics/src/graphics.rs

@@ -94,7 +94,7 @@ impl GraphicsCamera{
 		raw
 	}
 }
-impl Default for GraphicsCamera{
+impl std::default::Default for GraphicsCamera{
 	fn default()->Self{
 		Self{
 			screen_size:glam::UVec2::ONE,
@@ -167,7 +167,7 @@ impl GraphicsState{
 	}
 	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)|{
+		let texture_views:HashMap<strafesnet_common::model::TextureId,wgpu::TextureView>=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{
 			let texture_id=model::TextureId::new(texture_id as u32);
 			let image=match ddsfile::Dds::read(std::io::Cursor::new(texture_data)){
 				Ok(image)=>image,
@@ -803,7 +803,7 @@ impl GraphicsState{
 				module:&shader,
 				entry_point:Some("vs_entity_texture"),
 				buffers:&[wgpu::VertexBufferLayout{
-					array_stride:size_of::<GraphicsVertex>() as wgpu::BufferAddress,
+					array_stride:std::mem::size_of::<GraphicsVertex>() as wgpu::BufferAddress,
 					step_mode:wgpu::VertexStepMode::Vertex,
 					attributes:&wgpu::vertex_attr_array![0=>Float32x3,1=>Float32x2,2=>Float32x3,3=>Float32x4],
 				}],

engine/physics/Cargo.toml

@@ -8,6 +8,3 @@ arrayvec = "0.7.6"
 glam = "0.30.0"
 id = { version = "0.1.0", registry = "strafesnet" }
 strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
-
-[lints]
-workspace = true

engine/physics/src/model.rs

@@ -500,7 +500,7 @@ impl TransformedMesh<'_>{
 			transform,
 		}
 	}
-	pub fn verts<'a>(&'a self)->impl Iterator<Item=Vector3<Fixed<2,64>>>+'a{
+	pub fn verts<'a>(&'a self)->impl Iterator<Item=vec3::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{
@@ -752,22 +752,7 @@ impl MinkowskiMesh<'_>{
 			infinity_body.velocity=dir;
 			infinity_body.acceleration=vec3::ZERO;
 			//crawl in from negative infinity along a tangent line to get the closest fev
-			match infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,start_time){
-				// This is the expected case.
-				// We expect to never hit the mesh while setting up for the real crawl
-				// since the algorithm breaks down on the inside of the mesh.
-				crate::face_crawler::CrawlResult::Miss(fev)=>Some(fev),
-				// An exact hit is allowed, it has not crossed the boundary.
-				crate::face_crawler::CrawlResult::Hit(face,ratio)=>match start_time{
-					Bound::Included(_)=>ratio.num.is_zero().then(||FEV::Face(face)),
-					// You are looking for collision events within a range that does not include the start_time.
-					// The boundary is crossed at exactly start_time, so the range is not met.
-					// Therefore, the correct return value is None.
-					Bound::Excluded(_)=>unimplemented!(),
-					// To infinity and beyond!
-					Bound::Unbounded=>None,
-				},
-			}
+			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)>{
@@ -793,7 +778,10 @@ impl MinkowskiMesh<'_>{
 		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 start_time=range.start_bound().map(|&t|{
+			let r=(t-relative_body.time).to_ratio();
+			Ratio::new(r.num,r.den)
+		});
 		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;

engine/physics/src/physics.rs

@@ -23,12 +23,16 @@ use strafesnet_common::physics::{Instruction,MouseInstruction,ModeInstruction,Mi
 
 //internal influence
 //when the physics asks itself what happens next, this is how it's represented
-#[derive(Debug,Clone)]
+#[derive(Debug)]
 pub enum InternalInstruction{
-	CollisionStart(Collision,model_physics::GigaTime),
-	CollisionEnd(Collision,model_physics::GigaTime),
+	// begin accepting touch updates
+	OpenMultiCollision(model_physics::GigaTime),
+	// mutliple touch updates
+	CollisionStart(Collision),
+	CollisionEnd(Collision),
+	// confirm there will be no more touch updates and apply the transaction
+	CloseMultiCollision,
 	StrafeTick,
-	// TODO: add GigaTime to ReachWalkTargetVelocity
 	ReachWalkTargetVelocity,
 	// Water,
 }
@@ -37,7 +41,7 @@ pub enum InternalInstruction{
 pub struct InputState{
 	mouse:MouseState,
 	next_mouse:MouseState,
-	controls:Controls,
+	controls:strafesnet_common::controls_bitflag::Controls,
 }
 impl InputState{
 	fn set_next_mouse(&mut self,next_mouse:MouseState){
@@ -88,7 +92,7 @@ enum JumpDirection{
 impl JumpDirection{
 	fn direction(&self,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,contact:&ContactCollision)->Planar64Vec3{
 		match self{
-			JumpDirection::FromContactNormal=>contact_normal(models,hitbox_mesh,&contact.convex_mesh_id,contact.face_id),
+			JumpDirection::FromContactNormal=>contact_normal(models,hitbox_mesh,contact),
 			&JumpDirection::Exactly(dir)=>dir,
 		}
 	}
@@ -101,6 +105,7 @@ enum TransientAcceleration{
 		time:Time,
 	},
 	//walk target will never be reached
+	#[expect(dead_code)]
 	Unreachable{
 		acceleration:Planar64Vec3,
 	}
@@ -116,10 +121,6 @@ impl TransientAcceleration{
 	fn with_target_diff(target_diff:Planar64Vec3,accel:Planar64,time:Time)->Self{
 		if target_diff==vec3::ZERO{
 			TransientAcceleration::Reached
-		}else if accel==Planar64::ZERO{
-			TransientAcceleration::Unreachable{
-				acceleration:vec3::ZERO
-			}
 		}else{
 			//normal friction acceleration is clippedAcceleration.dot(normal)*friction
 			TransientAcceleration::Reachable{
@@ -164,7 +165,7 @@ impl ContactMoveState{
 	}
 }
 fn ground_things(walk_settings:&gameplay_style::WalkSettings,contact:&ContactCollision,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState)->(Planar64Vec3,Planar64Vec3){
-	let normal=contact_normal(models,hitbox_mesh,&contact.convex_mesh_id,contact.face_id);
+	let normal=contact_normal(models,hitbox_mesh,contact);
 	let gravity=touching.base_acceleration(models,style,camera,input_state);
 	let control_dir=style.get_y_control_dir(camera,input_state.controls);
 	let target_velocity=walk_settings.get_walk_target_velocity(control_dir,normal);
@@ -172,7 +173,7 @@ fn ground_things(walk_settings:&gameplay_style::WalkSettings,contact:&ContactCol
 	(gravity,target_velocity_clipped)
 }
 fn ladder_things(ladder_settings:&gameplay_style::LadderSettings,contact:&ContactCollision,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState)->(Planar64Vec3,Planar64Vec3){
-	let normal=contact_normal(models,hitbox_mesh,&contact.convex_mesh_id,contact.face_id);
+	let normal=contact_normal(models,hitbox_mesh,contact);
 	let gravity=touching.base_acceleration(models,style,camera,input_state);
 	let control_dir=style.get_y_control_dir(camera,input_state.controls);
 	let target_velocity=ladder_settings.get_ladder_target_velocity(control_dir,normal);
@@ -197,7 +198,7 @@ impl PhysicsModels{
 		self.contact_attributes.clear();
 		self.intersect_attributes.clear();
 	}
-	fn mesh(&self,convex_mesh_id:ConvexMeshId<PhysicsModelId>)->TransformedMesh<'_>{
+	fn mesh(&self,convex_mesh_id:ConvexMeshId)->TransformedMesh<'_>{
 		let (mesh_id,transform)=match convex_mesh_id.model_id{
 			PhysicsModelId::Contact(model_id)=>{
 				let model=&self.contact_models[&model_id];
@@ -214,25 +215,25 @@ impl PhysicsModels{
 		)
 	}
 	//it's a bit weird to have three functions, but it's always going to be one of these
-	fn contact_mesh(&self,convex_mesh_id:&ConvexMeshId<ContactModelId>)->TransformedMesh<'_>{
-		let model=&self.contact_models[&convex_mesh_id.model_id];
+	fn contact_mesh(&self,contact:&ContactCollision)->TransformedMesh<'_>{
+		let model=&self.contact_models[&contact.model_id];
 		TransformedMesh::new(
-			self.meshes[&model.mesh_id].submesh_view(convex_mesh_id.submesh_id),
+			self.meshes[&model.mesh_id].submesh_view(contact.submesh_id),
 			&model.transform
 		)
 	}
-	fn intersect_mesh(&self,convex_mesh_id:&ConvexMeshId<IntersectModelId>)->TransformedMesh<'_>{
-		let model=&self.intersect_models[&convex_mesh_id.model_id];
+	fn intersect_mesh(&self,intersect:&IntersectCollision)->TransformedMesh<'_>{
+		let model=&self.intersect_models[&intersect.model_id];
 		TransformedMesh::new(
-			self.meshes[&model.mesh_id].submesh_view(convex_mesh_id.submesh_id),
+			self.meshes[&model.mesh_id].submesh_view(intersect.submesh_id),
 			&model.transform
 		)
 	}
 	fn get_model_transform(&self,model_id:ModelId)->Option<&PhysicsMeshTransform>{
 		//ModelId can possibly be a decoration
-		match self.contact_models.get(&model_id.into()){
+		match self.contact_models.get(&ContactModelId::new(model_id.get())){
 			Some(model)=>Some(&model.transform),
-			None=>self.intersect_models.get(&model_id.into())
+			None=>self.intersect_models.get(&IntersectModelId::new(model_id.get()))
 				.map(|model|&model.transform),
 		}
 	}
@@ -306,7 +307,7 @@ impl PhysicsCamera{
 	}
 }
 
-impl Default for PhysicsCamera{
+impl std::default::Default for PhysicsCamera{
 	fn default()->Self{
 		Self{
 			sensitivity:Ratio64Vec2::ONE*200_000,
@@ -389,7 +390,7 @@ mod gameplay{
 			self.unordered_checkpoints.clear();
 		}
 	}
-	impl Default for ModeState{
+	impl std::default::Default for ModeState{
 		fn default()->Self{
 			Self{
 				mode_id:gameplay_modes::ModeId::MAIN,
@@ -615,7 +616,7 @@ impl MoveState{
 			// TODO: unduplicate this code
 			match self.get_walk_state(){
 				// did you stop touching the thing you were walking on?
-				Some(walk_state)=>if !touching.contacts.contains_key(&walk_state.contact.convex_mesh_id){
+				Some(walk_state)=>if !touching.contacts.contains(&walk_state.contact){
 					self.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
 				}else{
 					// stopped touching something else while walking
@@ -646,9 +647,9 @@ impl TryFrom<&gameplay_attributes::CollisionAttributes> for PhysicsCollisionAttr
 }
 #[derive(Clone,Copy,Hash,id::Id,Eq,PartialEq)]
 struct ContactAttributesId(u32);
-impl From<ContactAttributesId> for CollisionAttributesId{
-	fn from(value:ContactAttributesId)->CollisionAttributesId{
-		CollisionAttributesId::new(value.0)
+impl Into<CollisionAttributesId> for ContactAttributesId{
+	fn into(self)->CollisionAttributesId{
+		CollisionAttributesId::new(self.0)
 	}
 }
 impl From<CollisionAttributesId> for ContactAttributesId{
@@ -658,9 +659,9 @@ impl From<CollisionAttributesId> for ContactAttributesId{
 }
 #[derive(Clone,Copy,Hash,id::Id,Eq,PartialEq)]
 struct IntersectAttributesId(u32);
-impl From<IntersectAttributesId> for CollisionAttributesId{
-	fn from(value:IntersectAttributesId)->CollisionAttributesId{
-		CollisionAttributesId::new(value.0)
+impl Into<CollisionAttributesId> for IntersectAttributesId{
+	fn into(self)->CollisionAttributesId{
+		CollisionAttributesId::new(self.0)
 	}
 }
 impl From<CollisionAttributesId> for IntersectAttributesId{
@@ -670,26 +671,16 @@ impl From<CollisionAttributesId> for IntersectAttributesId{
 }
 #[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
 struct ContactModelId(u32);
-impl From<ContactModelId> for ModelId{
-	fn from(value:ContactModelId)->ModelId{
-		ModelId::new(value.get())
-	}
-}
-impl From<ModelId> for ContactModelId{
-	fn from(other: ModelId)->Self{
-		Self::new(other.get())
+impl Into<ModelId> for ContactModelId{
+	fn into(self)->ModelId{
+		ModelId::new(self.get())
 	}
 }
 #[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
 struct IntersectModelId(u32);
-impl From<IntersectModelId> for ModelId{
-	fn from(value:IntersectModelId)->ModelId{
-		ModelId::new(value.get())
-	}
-}
-impl From<ModelId> for IntersectModelId{
-	fn from(other: ModelId)->Self{
-		Self::new(other.get())
+impl Into<ModelId> for IntersectModelId{
+	fn into(self)->ModelId{
+		ModelId::new(self.get())
 	}
 }
 #[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
@@ -697,9 +688,9 @@ enum PhysicsModelId{
 	Contact(ContactModelId),
 	Intersect(IntersectModelId),
 }
-impl From<PhysicsModelId> for ModelId{
-	fn from(value:PhysicsModelId)->ModelId{
-		ModelId::new(match value{
+impl Into<ModelId> for PhysicsModelId{
+	fn into(self)->ModelId{
+		ModelId::new(match self{
 			PhysicsModelId::Contact(model_id)=>model_id.get(),
 			PhysicsModelId::Intersect(model_id)=>model_id.get(),
 		})
@@ -707,18 +698,10 @@ impl From<PhysicsModelId> for ModelId{
 }
 //unique physics meshes indexed by this
 #[derive(Debug,Clone,Copy,Eq,Hash,PartialEq)]
-struct ConvexMeshId<Id>{
-	model_id:Id,
+struct ConvexMeshId{
+	model_id:PhysicsModelId,
 	submesh_id:PhysicsSubmeshId,
 }
-impl<Id> ConvexMeshId<Id>{
-	fn map<NewId>(self,model_id:NewId)->ConvexMeshId<NewId>{
-		ConvexMeshId{
-			model_id,
-			submesh_id:self.submesh_id,
-		}
-	}
-}
 struct ContactModel{
 	mesh_id:PhysicsMeshId,
 	attr_id:ContactAttributesId,
@@ -732,12 +715,14 @@ struct IntersectModel{
 
 #[derive(Debug,Clone,Copy,Eq,Hash,PartialEq)]
 pub struct ContactCollision{
-	convex_mesh_id:ConvexMeshId<ContactModelId>,
 	face_id:model_physics::MinkowskiFace,
+	model_id:ContactModelId,
+	submesh_id:PhysicsSubmeshId,
 }
 #[derive(Debug,Clone,Copy,Eq,Hash,PartialEq)]
 pub struct IntersectCollision{
-	convex_mesh_id:ConvexMeshId<IntersectModelId>,
+	model_id:IntersectModelId,
+	submesh_id:PhysicsSubmeshId,
 }
 #[derive(Debug,Clone,Eq,Hash,PartialEq)]
 pub enum Collision{
@@ -745,39 +730,33 @@ pub enum Collision{
 	Intersect(IntersectCollision),
 }
 impl Collision{
-	fn new(convex_mesh_id:ConvexMeshId<PhysicsModelId>,face_id:model_physics::MinkowskiFace)->Self{
+	const fn new(convex_mesh_id:ConvexMeshId,face_id:model_physics::MinkowskiFace)->Self{
 		match convex_mesh_id.model_id{
-			PhysicsModelId::Contact(model_id)=>Collision::Contact(ContactCollision{convex_mesh_id:convex_mesh_id.map(model_id),face_id}),
-			PhysicsModelId::Intersect(model_id)=>Collision::Intersect(IntersectCollision{convex_mesh_id:convex_mesh_id.map(model_id)}),
+			PhysicsModelId::Contact(model_id)=>Collision::Contact(ContactCollision{model_id,submesh_id:convex_mesh_id.submesh_id,face_id}),
+			PhysicsModelId::Intersect(model_id)=>Collision::Intersect(IntersectCollision{model_id,submesh_id:convex_mesh_id.submesh_id}),
 		}
 	}
 }
 #[derive(Clone,Debug,Default)]
 struct TouchingState{
-	contacts:HashMap<ConvexMeshId<ContactModelId>,model_physics::MinkowskiFace>,
-	intersects:HashSet<ConvexMeshId<IntersectModelId>>,
+	contacts:HashSet<ContactCollision>,
+	intersects:HashSet<IntersectCollision>,
 }
 impl TouchingState{
 	fn clear(&mut self){
 		self.contacts.clear();
 		self.intersects.clear();
 	}
-	fn insert_contact(&mut self,contact:ContactCollision)->Option<model_physics::MinkowskiFace>{
-		self.contacts.insert(contact.convex_mesh_id,contact.face_id)
+	fn insert(&mut self,collision:Collision)->bool{
+		match collision{
+			Collision::Contact(collision)=>self.contacts.insert(collision),
+			Collision::Intersect(collision)=>self.intersects.insert(collision),
+		}
 	}
-	fn insert_intersect(&mut self,intersect:IntersectCollision)->bool{
-		self.intersects.insert(intersect.convex_mesh_id)
-	}
-	fn remove_contact(&mut self,convex_mesh_id:&ConvexMeshId<ContactModelId>)->Option<model_physics::MinkowskiFace>{
-		self.contacts.remove(convex_mesh_id)
-	}
-	fn remove_intersect(&mut self,convex_mesh_id:&ConvexMeshId<IntersectModelId>)->bool{
-		self.intersects.remove(convex_mesh_id)
-	}
-	fn contains(&self,convex_mesh_id:&ConvexMeshId<PhysicsModelId>)->bool{
-		match convex_mesh_id.model_id{
-			PhysicsModelId::Contact(contact_model_id)=>self.contacts.contains_key(&convex_mesh_id.map(contact_model_id)),
-			PhysicsModelId::Intersect(intersect_model_id)=>self.intersects.contains(&convex_mesh_id.map(intersect_model_id)),
+	fn remove(&mut self,collision:&Collision)->bool{
+		match collision{
+			Collision::Contact(collision)=>self.contacts.remove(collision),
+			Collision::Intersect(collision)=>self.intersects.remove(collision),
 		}
 	}
 	fn base_acceleration(&self,models:&PhysicsModels,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState)->Planar64Vec3{
@@ -786,7 +765,7 @@ impl TouchingState{
 			a+=rocket_settings.acceleration(style.get_propulsion_control_dir(camera,input_state.controls));
 		}
 		//add accelerators
-		for contact in self.contacts.keys(){
+		for contact in &self.contacts{
 			if let Some(accelerator)=&models.contact_attr(contact.model_id).general.accelerator{
 				a+=accelerator.acceleration;
 			}
@@ -800,8 +779,8 @@ impl TouchingState{
 		a
 	}
 	fn constrain_velocity(&self,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,velocity:Planar64Vec3)->Planar64Vec3{
-		let contacts:Vec<_>=self.contacts.iter().map(|(convex_mesh_id,face_id)|{
-			let n=contact_normal(models,hitbox_mesh,convex_mesh_id,*face_id);
+		let contacts:Vec<_>=self.contacts.iter().map(|contact|{
+			let n=contact_normal(models,hitbox_mesh,contact);
 			crate::push_solve::Contact{
 				position:vec3::ZERO,
 				velocity:n,
@@ -811,8 +790,8 @@ impl TouchingState{
 		crate::push_solve::push_solve(&contacts,velocity)
 	}
 	fn constrain_acceleration(&self,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,acceleration:Planar64Vec3)->Planar64Vec3{
-		let contacts:Vec<_>=self.contacts.iter().map(|(convex_mesh_id,face_id)|{
-			let n=contact_normal(models,hitbox_mesh,convex_mesh_id,*face_id);
+		let contacts:Vec<_>=self.contacts.iter().map(|contact|{
+			let n=contact_normal(models,hitbox_mesh,contact);
 			crate::push_solve::Contact{
 				position:vec3::ZERO,
 				velocity:n,
@@ -824,29 +803,29 @@ impl TouchingState{
 	fn predict_collision_end(&self,collector:&mut instruction::InstructionCollector<InternalInstruction,Time>,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,body:&Body,start_time:Time){
 		// let relative_body=body.relative_to(&Body::ZERO);
 		let relative_body=body;
-		for (convex_mesh_id,face_id) in &self.contacts{
+		for contact in &self.contacts{
 			//detect face slide off
-			let model_mesh=models.contact_mesh(convex_mesh_id);
+			let model_mesh=models.contact_mesh(contact);
 			let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,hitbox_mesh.transformed_mesh());
-			collector.collect(minkowski.predict_collision_face_out(&relative_body,start_time..=collector.time(),*face_id).map(|(_face,time)|{
+			collector.collect(minkowski.predict_collision_face_out(&relative_body,start_time..collector.time(),contact.face_id).map(|(_face,time)|{
 				TimedInstruction{
 					time:relative_body.time+time.into(),
 					instruction:InternalInstruction::CollisionEnd(
-						Collision::Contact(ContactCollision{face_id:*face_id,convex_mesh_id:*convex_mesh_id}),
+						Collision::Contact(*contact),
 						time
 					),
 				}
 			}));
 		}
-		for convex_mesh_id in &self.intersects{
+		for intersect in &self.intersects{
 			//detect model collision in reverse
-			let model_mesh=models.intersect_mesh(convex_mesh_id);
+			let model_mesh=models.intersect_mesh(intersect);
 			let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,hitbox_mesh.transformed_mesh());
-			collector.collect(minkowski.predict_collision_out(&relative_body,start_time..=collector.time()).map(|(_face,time)|{
+			collector.collect(minkowski.predict_collision_out(&relative_body,start_time..collector.time()).map(|(_face,time)|{
 				TimedInstruction{
 					time:relative_body.time+time.into(),
 					instruction:InternalInstruction::CollisionEnd(
-						Collision::Intersect(IntersectCollision{convex_mesh_id:*convex_mesh_id}),
+						Collision::Intersect(*intersect),
 						time
 					),
 				}
@@ -915,9 +894,6 @@ impl PhysicsState{
 	pub const fn mode(&self)->gameplay_modes::ModeId{
 		self.mode_state.get_mode_id()
 	}
-	pub const fn style_mut(&mut self)->&mut StyleModifiers{
-		&mut self.style
-	}
 	pub fn get_finish_time(&self)->Option<run::Time>{
 		self.run.get_finish_time()
 	}
@@ -973,7 +949,7 @@ impl PhysicsState{
 // shared geometry for simulations
 pub struct PhysicsData{
 	//permanent map data
-	bvh:bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:bvh::BvhNode<ConvexMeshId>,
 	//transient map/environment data (open world loads/unloads parts of this data)
 	models:PhysicsModels,
 	//semi-transient data
@@ -1059,16 +1035,14 @@ impl PhysicsData{
 			let transform=PhysicsMeshTransform::new(model.transform);
 			match attr_id{
 				PhysicsAttributesId::Contact(attr_id)=>{
-					let contact_model_id=ContactModelId::new(model_id as u32);
-					contact_models.insert(contact_model_id,ContactModel{
+					contact_models.insert(ContactModelId::new(model_id as u32),ContactModel{
 						mesh_id,
 						attr_id,
 						transform,
 					});
 				},
 				PhysicsAttributesId::Intersect(attr_id)=>{
-					let intersect_model_id=IntersectModelId::new(model_id as u32);
-					intersect_models.insert(intersect_model_id,IntersectModel{
+					intersect_models.insert(IntersectModelId::new(model_id as u32),IntersectModel{
 						mesh_id,
 						attr_id,
 						transform,
@@ -1082,23 +1056,12 @@ impl PhysicsData{
 				(PhysicsMeshId::new(mesh_id as u32),mesh)
 			).collect();
 		let convex_mesh_aabb_list=
-		// use the map models iteration order to ensure that the
-		// order that the models are passed into bvh::generate_bvh is consistent
-		map.models.iter().enumerate().filter_map(|(model_id,model)|{
-			match map.attributes.get(model.attributes.get() as usize){
-				None|Some(gameplay_attributes::CollisionAttributes::Decoration)=>None,
-				Some(gameplay_attributes::CollisionAttributes::Contact(_))=>{
-					let model_id=ContactModelId::new(model_id as u32);
-					let model=contact_models.get(&model_id)?;
-					Some((PhysicsModelId::Contact(model_id),&model.mesh_id,&model.transform))
-				},
-				Some(gameplay_attributes::CollisionAttributes::Intersect(_))=>{
-					let model_id=IntersectModelId::new(model_id as u32);
-					let model=intersect_models.get(&model_id)?;
-					Some((PhysicsModelId::Intersect(model_id),&model.mesh_id,&model.transform))
-				},
-			}
-		})
+		//map the two lists into a single type so they can be processed with one closure
+		contact_models.iter().map(|(&model_id,model)|
+			(PhysicsModelId::Contact(model_id),&model.mesh_id,&model.transform)
+		).chain(intersect_models.iter().map(|(&model_id,model)|
+			(PhysicsModelId::Intersect(model_id),&model.mesh_id,&model.transform)
+		))
 		.flat_map(|(model_id,mesh_id,transform)|{
 			meshes[mesh_id].submesh_views()
 			.enumerate().map(move|(submesh_id,view)|{
@@ -1165,7 +1128,7 @@ impl InstructionEmitter<InternalInstruction> for PhysicsContext<'_>{
 		next_instruction_internal(&self.state,&self.data,time_limit)
 	}
 }
-impl<'a> PhysicsContext<'a>{
+impl PhysicsContext<'_>{
 	pub fn run_input_instruction(
 		state:&mut PhysicsState,
 		data:&PhysicsData,
@@ -1175,13 +1138,6 @@ impl<'a> PhysicsContext<'a>{
 		context.process_exhaustive(instruction.time);
 		context.process_instruction(instruction);
 	}
-	pub fn iter_internal(
-		state:&'a mut PhysicsState,
-		data:&'a PhysicsData,
-		time_limit:Time,
-	)->instruction::InstructionIter<InternalInstruction,Time,Self>{
-		PhysicsContext{state,data}.into_iter(time_limit)
-	}
 }
 
 	//this is the one who asks
@@ -1189,7 +1145,7 @@ impl<'a> PhysicsContext<'a>{
 		//JUST POLLING!!! NO MUTATION
 		let mut collector=instruction::InstructionCollector::new(time_limit);
 
-		// collector.collect(state.next_move_instruction());
+		collector.collect(state.next_move_instruction());
 
 		//check for collision ends
 		state.touching.predict_collision_end(&mut collector,&data.models,&data.hitbox_mesh,&state.body,state.time);
@@ -1200,19 +1156,21 @@ impl<'a> PhysicsContext<'a>{
 		//relative to moving platforms
 		//let relative_body=state.body.relative_to(&Body::ZERO);
 		let relative_body=&state.body;
-		data.bvh.sample_aabb(&aabb,&mut |convex_mesh_id|{
-			if state.touching.contains(convex_mesh_id){
-				return;
-			}
+		data.bvh.sample_aabb(&aabb,&mut |&convex_mesh_id|{
 			//no checks are needed because of the time limits.
-			let model_mesh=data.models.mesh(*convex_mesh_id);
+			let model_mesh=data.models.mesh(convex_mesh_id);
 			let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,data.hitbox_mesh.transformed_mesh());
-			collector.collect(minkowski.predict_collision_in(relative_body,state.time..=collector.time())
-				.map(|(face,dt)|
+			collector.collect(minkowski.predict_collision_in(relative_body,state.time..collector.time())
+				//temp (?) code to avoid collision loops
+				.and_then(|(face,dt)|{
+					// this must be rounded to avoid the infinite loop when hitting the start zone
+					let time=relative_body.time+dt.into();
+					(state.time<time).then_some((time,face,dt))
+				}).map(|(time,face,dt)|
 					TimedInstruction{
-						time:relative_body.time+dt.into(),
+						time,
 						instruction:InternalInstruction::CollisionStart(
-							Collision::new(*convex_mesh_id,face),
+							Collision::new(convex_mesh_id,face),
 							dt
 						)
 					}
@@ -1223,17 +1181,12 @@ impl<'a> PhysicsContext<'a>{
 	}
 
 
-fn contact_normal(
-	models:&PhysicsModels,
-	hitbox_mesh:&HitboxMesh,
-	convex_mesh_id:&ConvexMeshId<ContactModelId>,
-    face_id:model_physics::MinkowskiFace,
-)->Planar64Vec3{
-	let model_mesh=models.contact_mesh(convex_mesh_id);
+fn contact_normal(models:&PhysicsModels,hitbox_mesh:&HitboxMesh,contact:&ContactCollision)->Planar64Vec3{
+	let model_mesh=models.contact_mesh(contact);
 	let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,hitbox_mesh.transformed_mesh());
 	// TODO: normalize to i64::MAX>>1
 	// wrap for speed
-	minkowski.face_nd(face_id).0.wrap_1()
+	minkowski.face_nd(contact.face_id).0.wrap_1()
 }
 
 fn recalculate_touching(
@@ -1245,7 +1198,7 @@ fn recalculate_touching(
 	mode:Option<&gameplay_modes::Mode>,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1254,11 +1207,11 @@ fn recalculate_touching(
 	//collision_end all existing contacts
 	//I would have preferred while let Some(contact)=contacts.pop()
 	//but there is no such method
-	while let Some((&convex_mesh_id,_face_id))=touching.contacts.iter().next(){
-		collision_end_contact(move_state,body,touching,models,hitbox_mesh,style,camera,input_state,models.contact_attr(convex_mesh_id.model_id),&convex_mesh_id)
+	while let Some(&contact)=touching.contacts.iter().next(){
+		collision_end_contact(move_state,body,touching,models,hitbox_mesh,style,camera,input_state,models.contact_attr(contact.model_id),contact)
 	}
-	while let Some(&convex_mesh_id)=touching.intersects.iter().next(){
-		collision_end_intersect(move_state,body,touching,models,hitbox_mesh,style,camera,input_state,mode,run,models.intersect_attr(convex_mesh_id.model_id),&convex_mesh_id,time);
+	while let Some(&intersect)=touching.intersects.iter().next(){
+		collision_end_intersect(move_state,body,touching,models,hitbox_mesh,style,camera,input_state,mode,run,models.intersect_attr(intersect.model_id),intersect,time);
 	}
 	//find all models in the teleport region
 	let mut aabb=aabb::Aabb::default();
@@ -1280,7 +1233,8 @@ fn recalculate_touching(
 				collision_start_intersect(move_state,body,mode_state,touching,mode,run,models,hitbox_mesh,bvh,style,camera,input_state,
 					models.intersect_attr(model_id),
 					IntersectCollision{
-						convex_mesh_id:convex_mesh_id.map(model_id),
+						model_id,
+						submesh_id:convex_mesh_id.submesh_id,
 					},
 					time,
 				),
@@ -1298,7 +1252,7 @@ fn set_position(
 	mode:Option<&gameplay_modes::Mode>,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1314,8 +1268,8 @@ fn set_position(
 fn set_velocity_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,v:Planar64Vec3)->bool{
 	//This is not correct but is better than what I have
 	let mut culled=false;
-	touching.contacts.retain(|convex_mesh_id,face_id|{
-		let n=contact_normal(models,hitbox_mesh,convex_mesh_id,*face_id);
+	touching.contacts.retain(|contact|{
+		let n=contact_normal(models,hitbox_mesh,contact);
 		let r=n.dot(v).is_positive();
 		if r{
 			culled=true;
@@ -1332,8 +1286,8 @@ fn set_velocity(body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hit
 fn set_acceleration_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,a:Planar64Vec3)->bool{
 	//This is not correct but is better than what I have
 	let mut culled=false;
-	touching.contacts.retain(|convex_mesh_id,face_id|{
-		let n=contact_normal(models,hitbox_mesh,convex_mesh_id,*face_id);
+	touching.contacts.retain(|contact|{
+		let n=contact_normal(models,hitbox_mesh,contact);
 		let r=n.dot(a).is_positive();
 		if r{
 			culled=true;
@@ -1357,7 +1311,7 @@ fn teleport(
 	mode:Option<&gameplay_modes::Mode>,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1379,7 +1333,7 @@ fn teleport_to_spawn(
 	mode:&gameplay_modes::Mode,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1468,7 +1422,7 @@ fn run_teleport_behaviour(
 	mode_state:&mut ModeState,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1515,7 +1469,7 @@ fn run_teleport_behaviour(
 	}
 }
 
-fn is_not_spawn_at(
+fn not_spawn_at(
 	mode:Option<&gameplay_modes::Mode>,
 	model_id:ModelId,
 )->bool{
@@ -1536,7 +1490,7 @@ fn collision_start_contact(
 	mode:Option<&gameplay_modes::Mode>,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1546,12 +1500,12 @@ fn collision_start_contact(
 ){
 	let incident_velocity=body.velocity;
 	//add to touching
-	touching.insert_contact(contact);
+	touching.insert(Collision::Contact(contact));
 	//clip v
 	set_velocity(body,touching,models,hitbox_mesh,incident_velocity);
 	let mut allow_jump=true;
-	let model_id=contact.convex_mesh_id.model_id.into();
-	let mut allow_run_teleport_behaviour=is_not_spawn_at(mode,model_id);
+	let model_id=contact.model_id.into();
+	let mut allow_run_teleport_behaviour=not_spawn_at(mode,model_id);
 	match &attr.contacting.contact_behaviour{
 		Some(gameplay_attributes::ContactingBehaviour::Surf)=>(),
 		Some(gameplay_attributes::ContactingBehaviour::Cling)=>println!("Unimplemented!"),
@@ -1574,7 +1528,7 @@ fn collision_start_contact(
 		},
 		Some(gameplay_attributes::ContactingBehaviour::NoJump)=>allow_jump=false,
 		None=>if let Some(walk_settings)=&style.walk{
-			if walk_settings.is_slope_walkable(contact_normal(models,hitbox_mesh,&contact.convex_mesh_id,contact.face_id),vec3::Y){
+			if walk_settings.is_slope_walkable(contact_normal(models,hitbox_mesh,&contact),vec3::Y){
 				allow_run_teleport_behaviour=true;
 				//ground
 				let (gravity,target_velocity)=ground_things(walk_settings,&contact,touching,models,hitbox_mesh,style,camera,input_state);
@@ -1639,7 +1593,7 @@ fn collision_start_intersect(
 	run:&mut run::Run,
 	models:&PhysicsModels,
 	hitbox_mesh:&HitboxMesh,
-	bvh:&bvh::BvhNode<ConvexMeshId<PhysicsModelId>>,
+	bvh:&bvh::BvhNode<ConvexMeshId>,
 	style:&StyleModifiers,
 	camera:&PhysicsCamera,
 	input_state:&InputState,
@@ -1648,13 +1602,13 @@ fn collision_start_intersect(
 	time:Time,
 ){
 	//I think that setting the velocity to 0 was preventing surface contacts from entering an infinite loop
-	touching.insert_intersect(intersect);
+	touching.insert(Collision::Intersect(intersect));
 	//insta booster!
 	if let Some(booster)=&attr.general.booster{
 		move_state.cull_velocity(booster.boost(body.velocity),body,touching,models,hitbox_mesh,style,camera,input_state);
 	}
 	if let Some(mode)=mode{
-		let zone=mode.get_zone(intersect.convex_mesh_id.model_id.into());
+		let zone=mode.get_zone(intersect.model_id.into());
 		match zone{
 			Some(gameplay_modes::Zone::Start)=>{
 				println!("@@@@ Starting new run!");
@@ -1671,7 +1625,7 @@ fn collision_start_intersect(
 		}
 	}
 	move_state.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
-	run_teleport_behaviour(intersect.convex_mesh_id.model_id.into(),attr.general.wormhole.as_ref(),mode,move_state,body,touching,run,mode_state,models,hitbox_mesh,bvh,style,camera,input_state,time);
+	run_teleport_behaviour(intersect.model_id.into(),attr.general.wormhole.as_ref(),mode,move_state,body,touching,run,mode_state,models,hitbox_mesh,bvh,style,camera,input_state,time);
 }
 
 fn collision_end_contact(
@@ -1684,17 +1638,15 @@ fn collision_end_contact(
 	camera:&PhysicsCamera,
 	input_state:&InputState,
 	_attr:&gameplay_attributes::ContactAttributes,
-	convex_mesh_id:&ConvexMeshId<ContactModelId>,
+	contact:ContactCollision,
 ){
-	touching.remove_contact(convex_mesh_id);//remove contact before calling contact_constrain_acceleration
+	touching.remove(&Collision::Contact(contact));//remove contact before calling contact_constrain_acceleration
 	//check ground
 	//TODO do better
 	//this is inner code from move_state.cull_velocity
 	match move_state.get_walk_state(){
 		// did you stop touching the thing you were walking on?
-		// This does not check the face! Is that a bad thing? It should be
-		// impossible to stop touching a different face than you started touching...
-		Some(walk_state)=>if &walk_state.contact.convex_mesh_id==convex_mesh_id{
+		Some(walk_state)=>if walk_state.contact==contact{
 			move_state.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
 		}else{
 			// stopped touching something else while walking
@@ -1716,13 +1668,13 @@ fn collision_end_intersect(
 	mode:Option<&gameplay_modes::Mode>,
 	run:&mut run::Run,
 	_attr:&gameplay_attributes::IntersectAttributes,
-	convex_mesh_id:&ConvexMeshId<IntersectModelId>,
+	intersect:IntersectCollision,
 	time:Time,
 ){
-	touching.remove_intersect(convex_mesh_id);
+	touching.remove(&Collision::Intersect(intersect));
 	move_state.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
 	if let Some(mode)=mode{
-		let zone=mode.get_zone(convex_mesh_id.model_id.into());
+		let zone=mode.get_zone(intersect.model_id.into());
 		match zone{
 			Some(gameplay_modes::Zone::Start)=>{
 				match run.start(time){
@@ -1736,14 +1688,17 @@ fn collision_end_intersect(
 }
 fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedInstruction<InternalInstruction,Time>){
 	state.time=ins.time;
-	match ins.instruction{
-		// collisions advance the body precisely
+	let (should_advance_body,goober_time)=match ins.instruction{
 		InternalInstruction::CollisionStart(_,dt)
-		|InternalInstruction::CollisionEnd(_,dt)=>state.body.advance_time_ratio_dt(dt),
-		// this advances imprecisely
-		InternalInstruction::ReachWalkTargetVelocity=>state.body.advance_time(state.time),
-		// strafe tick decides for itself whether to advance the body.
-		InternalInstruction::StrafeTick=>(),
+		|InternalInstruction::CollisionEnd(_,dt)=>(true,Some(dt)),
+		InternalInstruction::StrafeTick
+		|InternalInstruction::ReachWalkTargetVelocity=>(true,None),
+	};
+	if should_advance_body{
+		match goober_time{
+			Some(dt)=>state.body.advance_time_ratio_dt(dt),
+			None=>state.body.advance_time(state.time),
+		}
 	}
 		match ins.instruction{
 			InternalInstruction::CollisionStart(collision,_)=>{
@@ -1753,7 +1708,7 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 						&mut state.move_state,&mut state.body,&mut state.mode_state,&mut state.touching,&mut state.run,
 						mode,
 						&data.models,&data.hitbox_mesh,&data.bvh,&state.style,&state.camera,&state.input_state,
-						data.models.contact_attr(contact.convex_mesh_id.model_id),
+						data.models.contact_attr(contact.model_id),
 						contact,
 						state.time,
 					),
@@ -1761,7 +1716,7 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 						&mut state.move_state,&mut state.body,&mut state.mode_state,&mut state.touching,
 						mode,
 						&mut state.run,&data.models,&data.hitbox_mesh,&data.bvh,&state.style,&state.camera,&state.input_state,
-						data.models.intersect_attr(intersect.convex_mesh_id.model_id),
+						data.models.intersect_attr(intersect.model_id),
 						intersect,
 						state.time,
 					),
@@ -1770,15 +1725,15 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 			InternalInstruction::CollisionEnd(collision,_)=>match collision{
 				Collision::Contact(contact)=>collision_end_contact(
 					&mut state.move_state,&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state,
-					data.models.contact_attr(contact.convex_mesh_id.model_id),
-					&contact.convex_mesh_id
+					data.models.contact_attr(contact.model_id),
+					contact
 				),
 				Collision::Intersect(intersect)=>collision_end_intersect(
 					&mut state.move_state,&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state,
 					data.modes.get_mode(state.mode_state.get_mode_id()),
 					&mut state.run,
-					data.models.intersect_attr(intersect.convex_mesh_id.model_id),
-					&intersect.convex_mesh_id,
+					data.models.intersect_attr(intersect.model_id),
+					intersect,
 					state.time
 				),
 			},
@@ -1790,8 +1745,6 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 						let masked_controls=strafe_settings.mask(controls);
 						let control_dir=state.style.get_control_dir(masked_controls);
 						if control_dir!=vec3::ZERO{
-							// manually advance time
-							state.body.advance_time(state.time);
 							let camera_mat=state.camera.simulate_move_rotation_y(state.input_state.lerp_delta(state.time).x);
 							if let Some(ticked_velocity)=strafe_settings.tick_velocity(state.body.velocity,(camera_mat*control_dir).with_length(Planar64::ONE).divide().wrap_1()){
 								//this is wrong but will work ig
@@ -1878,7 +1831,7 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
 			if let Some(walk_state)=state.move_state.get_walk_state(){
 				if let Some(jump_settings)=&state.style.jump{
 					let jump_dir=walk_state.jump_direction.direction(&data.models,&data.hitbox_mesh,&walk_state.contact);
-					let booster_option=data.models.contact_attr(walk_state.contact.convex_mesh_id.model_id).general.booster.as_ref();
+					let booster_option=data.models.contact_attr(walk_state.contact.model_id).general.booster.as_ref();
 					let jumped_velocity=jump_settings.jumped_velocity(&state.style,jump_dir,state.body.velocity,booster_option);
 					state.cull_velocity(data,jumped_velocity);
 				}
@@ -1970,7 +1923,7 @@ mod test{
 	fn test_collision_rotated(relative_body:Body,expected_collision_time:Option<Time>){
 		let h0=HitboxMesh::new(PhysicsMesh::unit_cube(),
 			integer::Planar64Affine3::new(
-				Planar64Mat3::from_cols([
+				integer::Planar64Mat3::from_cols([
 					int3(5,0,1)>>1,
 					int3(0,1,0)>>1,
 					int3(-1,0,5)>>1,

engine/session/Cargo.toml

@@ -10,6 +10,3 @@ 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" }
-
-[lints]
-workspace = true

engine/session/src/session.rs

@@ -31,7 +31,7 @@ pub enum SessionInputInstruction{
 	Mouse(glam::IVec2),
 	SetControl(strafesnet_common::physics::SetControlInstruction),
 	Mode(ImplicitModeInstruction),
-	Misc(MiscInstruction),
+	Misc(strafesnet_common::physics::MiscInstruction),
 }
 /// Implicit mode instruction are fed separately to session.
 /// Session generates the explicit mode instructions interlaced with a SetSensitivity instruction
@@ -152,10 +152,10 @@ enum ViewState{
 pub struct Session{
 	directories:Directories,
 	user_settings:UserSettings,
-	mouse_interpolator:MouseInterpolator,
+	mouse_interpolator:crate::mouse_interpolator::MouseInterpolator,
 	view_state:ViewState,
 	//gui:GuiState
-	geometry_shared:PhysicsData,
+	geometry_shared:physics::PhysicsData,
 	simulation:Simulation,
 	// below fields not included in lite session
 	recording:Recording,

engine/settings/Cargo.toml

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

integration-testing/Cargo.toml

@@ -10,6 +10,3 @@ strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
 strafesnet_snf = { path = "../lib/snf", registry = "strafesnet" }
 # this is just for the primitive constructor
 strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet" }
-
-[lints]
-workspace = true

integration-testing/src/test_scenes.rs

@@ -1,9 +1,11 @@
-use strafesnet_physics::physics::{InternalInstruction,PhysicsData,PhysicsState,PhysicsContext};
+use strafesnet_physics::physics::{PhysicsData,PhysicsState,PhysicsContext};
 use strafesnet_common::gameplay_modes::NormalizedModes;
 use strafesnet_common::gameplay_attributes::{CollisionAttributes,CollisionAttributesId};
 use strafesnet_common::integer::{vec3,mat3,Planar64Affine3,Time};
 use strafesnet_common::model::{Mesh,Model,MeshId,ModelId,RenderConfigId};
 use strafesnet_common::map::CompleteMap;
+use strafesnet_common::physics::Instruction;
+use strafesnet_common::instruction::TimedInstruction;
 use strafesnet_rbx_loader::primitives::{unit_cube,CubeFaceDescription};
 
 struct TestSceneBuilder{
@@ -71,49 +73,19 @@ fn test_scene()->PhysicsData{
 fn simultaneous_collision(){
 	let physics_data=test_scene();
 	let body=strafesnet_physics::physics::Body::new(
-		(vec3::int(5+2,0,0)>>1)+vec3::int(1,1,0),
+		vec3::int(5+1,1,0),
 		vec3::int(-1,-1,0),
 		vec3::int(0,0,0),
 		Time::ZERO,
 	);
 	let mut physics=PhysicsState::new_with_body(body);
-	physics.style_mut().gravity=vec3::ZERO;
-	let mut phys_iter=PhysicsContext::iter_internal(&mut physics,&physics_data,Time::from_secs(2))
-		.filter(|ins|!matches!(ins.instruction,InternalInstruction::StrafeTick));
-	// the order that they hit does matter, but we aren't currently worrying about that.
-	// See multi-collision branch
-	assert_eq!(phys_iter.next().unwrap().time,Time::from_secs(1));
-	assert_eq!(phys_iter.next().unwrap().time,Time::from_secs(1));
-	assert!(phys_iter.next().is_none());
+	PhysicsContext::run_input_instruction(&mut physics,&physics_data,TimedInstruction{
+		time:Time::from_secs(2),
+		instruction:Instruction::Idle,
+	});
 	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]
-fn bug_3(){
-	let physics_data=test_scene();
-	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);
-	physics.style_mut().gravity=vec3::ZERO;
-	let mut phys_iter=PhysicsContext::iter_internal(&mut physics,&physics_data,Time::from_secs(3))
-		.filter(|ins|!matches!(ins.instruction,InternalInstruction::StrafeTick));
-	// touch side of part at 0,0,0
-	assert_eq!(phys_iter.next().unwrap().time,Time::from_secs(1));
-	// EXPECTED: touch top of part at 5,-5,0
-	// OBSERVED: CollisionEnd part at 0,0,0; clip through part at 5,-5,0
-	assert_eq!(phys_iter.next().unwrap().time,Time::from_secs(2));
-	assert_eq!(phys_iter.next().unwrap().time,Time::from_secs(2));
-	assert!(phys_iter.next().is_none());
-	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));
+	assert_eq!(body.time,Time::ONE_SECOND);
 }

integration-testing/src/tests.rs

@@ -29,7 +29,7 @@ fn physics_bug_2()->Result<(),ReplayError>{
 	// wait one second to activate the bug
 	// hit=Some(ModelId(2262))
 	PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
-		time:Time::from_millis(500),
+		time:strafesnet_common::integer::Time::from_millis(500),
 		instruction:strafesnet_common::physics::Instruction::Idle,
 	});
 
@@ -68,7 +68,7 @@ fn physics_bug_3()->Result<(),ReplayError>{
 	let mut physics=PhysicsState::new_with_body(body);
 	// wait one second to activate the bug
 	PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
-		time:Time::from_millis(500),
+		time:strafesnet_common::integer::Time::from_millis(500),
 		instruction:strafesnet_common::physics::Instruction::Idle,
 	});
 

lib/bsp_loader/Cargo.toml

@@ -17,6 +17,3 @@ vbsp = "0.9.1"
 vbsp-entities-css = "0.6.0"
 vmdl = "0.2.0"
 vpk = "0.3.0"
-
-[lints]
-workspace = true

lib/bsp_loader/src/brush.rs

@@ -7,7 +7,7 @@ use crate::{valve_transform_normal,valve_transform_dist};
 #[derive(Hash,Eq,PartialEq)]
 struct Face{
 	normal:integer::Planar64Vec3,
-	dot:Planar64,
+	dot:integer::Planar64,
 }
 
 #[derive(Debug)]

lib/bsp_loader/src/bsp.rs

@@ -347,7 +347,7 @@ pub struct PartialMap1{
 	modes:NormalizedModes,
 }
 impl PartialMap1{
-	pub fn add_prop_meshes(
+	pub fn add_prop_meshes<'a>(
 		self,
 		prop_meshes:Meshes<model::Mesh>,
 	)->PartialMap2{

lib/bsp_loader/src/loader.rs

@@ -31,7 +31,7 @@ impl Loader for TextureLoader{
 	type Error=TextureError;
 	type Index<'a>=Cow<'a,str>;
 	type Resource=Texture;
-	fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
+	fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
 		let file_name=format!("textures/{}.dds",index);
 		let mut file=std::fs::File::open(file_name)?;
 		let mut data=Vec::new();
@@ -111,7 +111,7 @@ impl ModelLoader<'_,'_>{
 		}
 	}
 }
-impl Loader for ModelLoader<'_,'_>{
+impl<'bsp,'vpk> Loader for ModelLoader<'bsp,'vpk>{
 	type Error=MeshError;
 	type Index<'a>=&'a str where Self:'a;
 	type Resource=vmdl::Model;
@@ -151,7 +151,7 @@ impl MeshLoader<'_,'_,'_,'_>{
 		}
 	}
 }
-impl Loader for MeshLoader<'_,'_,'_,'_>{
+impl<'str,'bsp,'vpk,'load> Loader for MeshLoader<'bsp,'vpk,'load,'str>{
 	type Error=MeshError;
 	type Index<'a>=&'a str where Self:'a;
 	type Resource=Mesh;

lib/bsp_loader/src/mesh.rs

@@ -61,7 +61,7 @@ pub fn convert_mesh(model:vmdl::Model,deferred_loader:&mut RenderConfigDeferredL
 						_=>None,
 					}
 				})
-			}).filter_map(|[v1,v2,v3]|{
+			}).flat_map(|[v1,v2,v3]|{
 				// this should probably be a fatal error :D
 				let v1=model_vertices.get(v1)?;
 				let v2=model_vertices.get(v2)?;

lib/common/Cargo.toml

@@ -17,6 +17,3 @@ linear_ops = { version = "0.1.1", path = "../linear_ops", registry = "strafesnet
 ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet" }
 glam = "0.30.0"
 id = { version = "0.1.0", registry = "strafesnet" }
-
-[lints]
-workspace = true

lib/common/src/aabb.rs

@@ -61,11 +61,11 @@ impl Aabb{
 	pub fn center(&self)->Planar64Vec3{
 		self.min.map_zip(self.max,|(min,max)|min.midpoint(max))
 	}
-	#[inline]
-	pub fn area_weight(&self)->fixed_wide::fixed::Fixed<2,64>{
-		let d=self.max-self.min;
-		d.x*d.y+d.y*d.z+d.z*d.x
-	}
+	//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

lib/common/src/bvh.rs

@@ -245,19 +245,18 @@ pub fn generate_bvh<T>(boxen:Vec<(T,Aabb)>)->BvhNode<T>{
 
 fn generate_bvh_node<T>(boxen:Vec<(T,Aabb)>,force:bool)->BvhNode<T>{
 	let n=boxen.len();
-	const MAX_TERMINAL_BRANCH_LEAF_NODES:usize=20;
-	if force||n<MAX_TERMINAL_BRANCH_LEAF_NODES{
-		let mut aabb_outer=Aabb::default();
-		let nodes=boxen.into_iter().map(|(data,aabb)|{
-			aabb_outer.join(&aabb);
+	if force||n<20{
+		let mut aabb=Aabb::default();
+		let nodes=boxen.into_iter().map(|b|{
+			aabb.join(&b.1);
 			BvhNode{
-				content:RecursiveContent::Leaf(data),
-				aabb,
+				content:RecursiveContent::Leaf(b.0),
+				aabb:b.1,
 			}
 		}).collect();
 		BvhNode{
 			content:RecursiveContent::Branch(nodes),
-			aabb:aabb_outer,
+			aabb,
 		}
 	}else{
 		let mut sort_x=Vec::with_capacity(n);
@@ -273,9 +272,9 @@ fn generate_bvh_node<T>(boxen:Vec<(T,Aabb)>,force:bool)->BvhNode<T>{
 		sort_y.sort_by_key(|&(_,c)|c);
 		sort_z.sort_by_key(|&(_,c)|c);
 		let h=n/2;
-		let (_,median_x)=sort_x[h];
-		let (_,median_y)=sort_y[h];
-		let (_,median_z)=sort_z[h];
+		let median_x=sort_x[h].1;
+		let median_y=sort_y[h].1;
+		let median_z=sort_z[h].1;
 		//locate a run of values equal to the median
 		//partition point gives the first index for which the predicate evaluates to false
 		let first_index_eq_median_x=sort_x.partition_point(|&(_,x)|x<median_x);
@@ -314,10 +313,10 @@ fn generate_bvh_node<T>(boxen:Vec<(T,Aabb)>,force:bool)->BvhNode<T>{
 			};
 			list_list[list_id].push((data,aabb));
 		}
+		let mut aabb=Aabb::default();
 		if list_list.len()==1{
 			generate_bvh_node(list_list.remove(0),true)
 		}else{
-			let mut aabb=Aabb::default();
 			BvhNode{
 				content:RecursiveContent::Branch(
 					list_list.into_iter().map(|b|{

lib/common/src/gameplay_style.rs

@@ -34,7 +34,7 @@ pub struct StyleModifiers{
 	//unused
 	pub mass:Planar64,
 }
-impl Default for StyleModifiers{
+impl std::default::Default for StyleModifiers{
 	fn default()->Self{
 		Self::roblox_bhop()
 	}

lib/common/src/instruction.rs

@@ -34,41 +34,12 @@ pub trait InstructionFeedback<I,T>:InstructionEmitter<I,Time=T>+InstructionConsu
 			self.process_instruction(instruction);
 		}
 	}
-	#[inline]
-	fn into_iter(self,time_limit:T)->InstructionIter<I,T,Self>
-		where
-			Self:Sized
-	{
-		InstructionIter{
-			time_limit,
-			feedback:self,
-			_phantom:core::marker::PhantomData,
-		}
-	}
 }
-impl<I,T,F> InstructionFeedback<I,T> for F
+impl<I,T,X> InstructionFeedback<I,T> for X
 	where
 		T:Copy,
-		F:InstructionEmitter<I,Time=T>+InstructionConsumer<I,Time=T>,
+		X:InstructionEmitter<I,Time=T>+InstructionConsumer<I,Time=T>,
 {}
-pub struct InstructionIter<I,T:Copy,F:InstructionFeedback<I,T>>{
-	time_limit:T,
-	feedback:F,
-	_phantom:core::marker::PhantomData<I>,
-}
-impl<I,T,F> Iterator for InstructionIter<I,T,F>
-	where
-		I:Clone,
-		T:Clone+Copy,
-		F:InstructionFeedback<I,T>,
-{
-	type Item=TimedInstruction<I,T>;
-	fn next(&mut self)->Option<Self::Item>{
-		let instruction=self.feedback.next_instruction(self.time_limit)?;
-		self.feedback.process_instruction(instruction.clone());
-		Some(instruction)
-	}
-}
 
 //PROPER PRIVATE FIELDS!!!
 pub struct InstructionCollector<I,T>{

lib/common/src/integer.rs

@@ -86,7 +86,7 @@ impl<T> std::fmt::Display for Time<T>{
 		write!(f,"{}s+{:09}ns",self.0/Self::ONE_SECOND.0,self.0%Self::ONE_SECOND.0)
 	}
 }
-impl<T> Default for Time<T>{
+impl<T> std::default::Default for Time<T>{
 	fn default()->Self{
 		Self::raw(0)
 	}
@@ -126,7 +126,7 @@ impl_time_additive_assign_operator!(core::ops::AddAssign,add_assign);
 impl_time_additive_assign_operator!(core::ops::SubAssign,sub_assign);
 impl_time_additive_assign_operator!(core::ops::RemAssign,rem_assign);
 impl<T> std::ops::Mul for Time<T>{
-	type Output=Ratio<Fixed<2,64>,Fixed<2,64>>;
+	type Output=Ratio<fixed_wide::fixed::Fixed<2,64>,fixed_wide::fixed::Fixed<2,64>>;
 	#[inline]
 	fn mul(self,rhs:Self)->Self::Output{
 		Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
@@ -156,7 +156,7 @@ impl<T> core::ops::Mul<Time<T>> for Planar64{
 #[cfg(test)]
 mod test_time{
 	use super::*;
-	type Time=AbsoluteTime;
+	type Time=super::AbsoluteTime;
 	#[test]
 	fn time_from_planar64(){
 		let a:Time=Planar64::from(1).into();
@@ -552,7 +552,7 @@ impl TryFrom<[f32;3]> for Unit32Vec3{
 }
 */
 
-pub type Planar64TryFromFloatError=FixedFromFloatError;
+pub type Planar64TryFromFloatError=fixed_wide::fixed::FixedFromFloatError;
 pub type Planar64=fixed_wide::types::I32F32;
 pub type Planar64Vec3=linear_ops::types::Vector3<Planar64>;
 pub type Planar64Mat3=linear_ops::types::Matrix3<Planar64>;
@@ -562,11 +562,11 @@ pub mod vec3{
 	pub const MIN:Planar64Vec3=Planar64Vec3::new([Planar64::MIN;3]);
 	pub const MAX:Planar64Vec3=Planar64Vec3::new([Planar64::MAX;3]);
 	pub const ZERO:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO;3]);
-	pub const ZERO_2:Vector3<Fixed::<2,64>>=Vector3::new([Fixed::<2,64>::ZERO;3]);
-	pub const ZERO_3:Vector3<Fixed::<3,96>>=Vector3::new([Fixed::<3,96>::ZERO;3]);
-	pub const ZERO_4:Vector3<Fixed::<4,128>>=Vector3::new([Fixed::<4,128>::ZERO;3]);
-	pub const ZERO_5:Vector3<Fixed::<5,160>>=Vector3::new([Fixed::<5,160>::ZERO;3]);
-	pub const ZERO_6:Vector3<Fixed::<6,192>>=Vector3::new([Fixed::<6,192>::ZERO;3]);
+	pub const ZERO_2:linear_ops::types::Vector3<Fixed::<2,64>>=linear_ops::types::Vector3::new([Fixed::<2,64>::ZERO;3]);
+	pub const ZERO_3:linear_ops::types::Vector3<Fixed::<3,96>>=linear_ops::types::Vector3::new([Fixed::<3,96>::ZERO;3]);
+	pub const ZERO_4:linear_ops::types::Vector3<Fixed::<4,128>>=linear_ops::types::Vector3::new([Fixed::<4,128>::ZERO;3]);
+	pub const ZERO_5:linear_ops::types::Vector3<Fixed::<5,160>>=linear_ops::types::Vector3::new([Fixed::<5,160>::ZERO;3]);
+	pub const ZERO_6:linear_ops::types::Vector3<Fixed::<6,192>>=linear_ops::types::Vector3::new([Fixed::<6,192>::ZERO;3]);
 	pub const X:Planar64Vec3=Planar64Vec3::new([Planar64::ONE,Planar64::ZERO,Planar64::ZERO]);
 	pub const Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ONE,Planar64::ZERO]);
 	pub const Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::ONE]);

lib/deferred_loader/Cargo.toml

@@ -11,6 +11,3 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
-
-[lints]
-workspace = true

lib/deferred_loader/src/loader.rs

@@ -4,5 +4,5 @@ pub trait Loader{
 	type Error:Error;
 	type Index<'a> where Self:'a;
 	type Resource;
-	fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>;
+	fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>;
 }

lib/fixed_wide/Cargo.toml

@@ -18,6 +18,3 @@ 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 }
-
-[lints]
-workspace = true

lib/fixed_wide/src/fixed.rs

@@ -1,8 +1,6 @@
 use bnum::{BInt,cast::As};
 
-const BNUM_DIGIT_WIDTH:usize=64;
-
-#[derive(Clone,Copy,Default,Hash,PartialEq,Eq,PartialOrd,Ord)]
+#[derive(Clone,Copy,Debug,Default,Hash,PartialEq,Eq,PartialOrd,Ord)]
 /// A Fixed point number for which multiply operations widen the bits in the output. (when the wide-mul feature is enabled)
 /// N is the number of u64s to use
 /// F is the number of fractional bits (always N*32 lol)
@@ -101,6 +99,28 @@ impl_from!(
 	i8,i16,i32,i64,i128,isize
 );
 
+impl<const N:usize,const F:usize,T> PartialEq<T> for Fixed<N,F>
+where
+		T:Copy,
+		BInt::<N>:From<T>,
+{
+	#[inline]
+	fn eq(&self,&other:&T)->bool{
+		self.bits.eq(&other.into())
+	}
+}
+
+impl<const N:usize,const F:usize,T> PartialOrd<T> for Fixed<N,F>
+	where
+		T:Copy,
+		BInt::<N>:From<T>,
+{
+	#[inline]
+	fn partial_cmp(&self,&other:&T)->Option<std::cmp::Ordering>{
+		self.bits.partial_cmp(&other.into())
+	}
+}
+
 impl<const N:usize,const F:usize> std::ops::Neg for Fixed<N,F>{
 	type Output=Self;
 	#[inline]
@@ -266,23 +286,6 @@ macro_rules! impl_from_float {
 impl_from_float!(integer_decode_f32,f32,24);
 impl_from_float!(integer_decode_f64,f64,53);
 
-impl<const N:usize,const F:usize> core::fmt::Debug for Fixed<N,F>{
-	#[inline]
-	fn fmt(&self,f:&mut core::fmt::Formatter)->Result<(),core::fmt::Error>{
-		let integral=self.as_bits().unsigned_abs()>>F;
-		let fractional=self.as_bits().unsigned_abs()&((bnum::BUint::<N>::ONE<<F)-bnum::BUint::<N>::ONE);
-		let leading_zeroes=(fractional.leading_zeros() as usize).saturating_sub(N*BNUM_DIGIT_WIDTH-F)>>2;
-		if self.is_negative(){
-			core::write!(f,"-")?;
-		}
-		if fractional.is_zero(){
-			core::write!(f,"{integral:x}.{}","0".repeat(leading_zeroes))
-		}else{
-			core::write!(f,"{integral:x}.{}{fractional:x}","0".repeat(leading_zeroes))
-		}
-	}
-}
-
 impl<const N:usize,const F:usize> core::fmt::Display for Fixed<N,F>{
 	#[inline]
 	fn fmt(&self,f:&mut core::fmt::Formatter)->Result<(),core::fmt::Error>{
@@ -306,6 +309,16 @@ macro_rules! impl_additive_operator {
 				self.$method(other)
 			}
 		}
+		impl<const N:usize,const F:usize,U> core::ops::$trait<U> for $struct<N,F>
+			where
+				BInt::<N>:From<U>,
+		{
+			type Output = $output;
+			#[inline]
+			fn $method(self, other: U) -> Self::Output {
+				Self::from_bits(self.bits.$method(BInt::<N>::from(other).shl(F as u32)))
+			}
+		}
 	};
 }
 macro_rules! impl_additive_assign_operator {
@@ -316,6 +329,15 @@ macro_rules! impl_additive_assign_operator {
 				self.bits.$method(other.bits);
 			}
 		}
+		impl<const N:usize,const F:usize,U> core::ops::$trait<U> for $struct<N,F>
+		where
+				BInt::<N>:From<U>,
+		{
+			#[inline]
+			fn $method(&mut self, other: U) {
+				self.bits.$method(BInt::<N>::from(other).shl(F as u32));
+			}
+		}
 	};
 }
 

lib/fixed_wide/src/tests.rs

@@ -229,16 +229,3 @@ fn test_zeroes_deferred_division(){
 		])
 	);
 }
-
-#[test]
-fn test_debug(){
-	assert_eq!(format!("{:?}",I32F32::EPSILON),"0.00000001");
-	assert_eq!(format!("{:?}",I32F32::ONE),"1.00000000");
-	assert_eq!(format!("{:?}",I32F32::TWO),"2.00000000");
-	assert_eq!(format!("{:?}",I32F32::MAX),"7fffffff.ffffffff");
-	assert_eq!(format!("{:?}",I32F32::try_from(core::f64::consts::PI).unwrap()),"3.243f6a88");
-	assert_eq!(format!("{:?}",I32F32::NEG_EPSILON),"-0.00000001");
-	assert_eq!(format!("{:?}",I32F32::NEG_ONE),"-1.00000000");
-	assert_eq!(format!("{:?}",I32F32::NEG_TWO),"-2.00000000");
-	assert_eq!(format!("{:?}",I32F32::MIN),"-80000000.00000000");
-}

lib/linear_ops/Cargo.toml

@@ -20,6 +20,3 @@ paste = { version = "1.0.15", optional = true }
 
 [dev-dependencies]
 fixed_wide = { path = "../fixed_wide", registry = "strafesnet", features = ["wide-mul"] }
-
-[lints]
-workspace = true

lib/linear_ops/src/macros/matrix.rs

@@ -205,8 +205,7 @@ macro_rules! impl_matrix_named_fields_shape {
 			#[inline]
 			fn deref(&self)->&Self::Target{
 				// This cast is valid because Matrix has #[repr(transparent)]
-				let ptr:*const [[T;$size_inner];$size_outer]=&self.array;
-				let ptr=ptr as *const Self::Target;
+				let ptr=&self.array as *const [[T;$size_inner];$size_outer] as *const Self::Target;
 				// SAFETY: this pointer is non-null because it comes from a reference
 				unsafe{&*ptr}
 			}
@@ -215,8 +214,7 @@ macro_rules! impl_matrix_named_fields_shape {
 			#[inline]
 			fn deref_mut(&mut self)->&mut Self::Target{
 				// This cast is valid because Matrix has #[repr(transparent)]
-				let ptr:*mut [[T;$size_inner];$size_outer]=&mut self.array;
-				let ptr=ptr as *mut Self::Target;
+				let ptr=&mut self.array as *mut [[T;$size_inner];$size_outer] as *mut Self::Target;
 				// SAFETY: this pointer is non-null because it comes from a reference
 				unsafe{&mut*ptr}
 			}

lib/linear_ops/src/macros/vector.rs

@@ -331,8 +331,7 @@ macro_rules! impl_vector_named_fields {
 			#[inline]
 			fn deref(&self)->&Self::Target{
 				// This cast is valid because Vector has #[repr(transparent)]
-				let ptr:*const [T;$size]=&self.array;
-				let ptr=ptr as *const Self::Target;
+				let ptr=&self.array as *const [T;$size] as *const Self::Target;
 				// SAFETY: this pointer is non-null because it comes from a reference
 				unsafe{&*ptr}
 			}
@@ -341,8 +340,7 @@ macro_rules! impl_vector_named_fields {
 			#[inline]
 			fn deref_mut(&mut self)->&mut Self::Target{
 				// This cast is valid because Vector has #[repr(transparent)]
-				let ptr:*mut [T;$size]=&mut self.array;
-				let ptr=ptr as *mut Self::Target;
+				let ptr=&mut self.array as *mut [T;$size] as *mut Self::Target;
 				// SAFETY: this pointer is non-null because it comes from a reference
 				unsafe{&mut*ptr}
 			}

lib/ratio_ops/Cargo.toml

@@ -8,6 +8,3 @@ description = "Ratio operations using trait bounds for avoiding division like th
 authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
-
-[lints]
-workspace = true

lib/rbx_loader/Cargo.toml

@@ -12,17 +12,14 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 [dependencies]
 bytemuck = "1.14.3"
 glam = "0.30.0"
-regex = { version = "1.11.3", default-features = false }
-rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
-rbx_dom_weak =  { version = "3.0.1-sn5", registry = "strafesnet" }
+lazy-regex = "3.1.0"
+rbx_binary  = { version = "1.1.0-sn4", registry = "strafesnet" }
+rbx_dom_weak =  { version = "3.1.0-sn4", registry = "strafesnet", features = ["instance-userdata"] }
 rbx_mesh = "0.5.0"
 rbx_reflection = "5.0.0"
 rbx_reflection_database = "1.0.0"
-rbx_xml = { version = "1.0.1-sn5", registry = "strafesnet" }
+rbx_xml  = { version = "1.1.0-sn4", registry = "strafesnet" }
 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" }
-
-[lints]
-workspace = true

lib/rbx_loader/src/loader.rs

@@ -50,7 +50,7 @@ impl Loader for TextureLoader{
 	type Error=TextureError;
 	type Index<'a>=&'a str;
 	type Resource=Texture;
-	fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
+	fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
 		let RobloxAssetId(asset_id)=index.parse()?;
 		let file_name=format!("textures/{}.dds",asset_id);
 		let data=read_entire_file(file_name)?;
@@ -157,7 +157,7 @@ impl Loader for MeshLoader{
 	type Error=MeshError;
 	type Index<'a>=MeshIndex<'a>;
 	type Resource=MeshWithSize;
-	fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
+	fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
 		let mesh=match index.mesh_type{
 			MeshType::FileMesh=>{
 				let RobloxAssetId(asset_id)=index.content.parse()?;

lib/rbx_loader/src/mesh.rs

@@ -9,6 +9,7 @@ use crate::loader::MeshWithSize;
 
 #[derive(Debug)]
 pub enum Error{
+	Planar64Vec3(strafesnet_common::integer::Planar64TryFromFloatError),
 	RbxMesh(rbx_mesh::mesh::Error)
 }
 impl std::fmt::Display for Error{
@@ -21,43 +22,41 @@ impl std::error::Error for Error{}
 fn ingest_vertices2(
 	vertices:Vec<Vertex2>,
 	mb:&mut model::MeshBuilder,
-)->HashMap<rbx_mesh::mesh::VertexId2,VertexId>{
+)->Result<HashMap<rbx_mesh::mesh::VertexId2,VertexId>,Error>{
 	//this monster is collecting a map of old_vertices_index -> unique_vertices_index
 	//while also doing the inserting unique entries into lists simultaneously
-	// vertex positions that fail to convert are DROPPED
-	vertices.into_iter().enumerate().filter_map(|(vertex_id,vertex)|Some((
+	Ok(vertices.into_iter().enumerate().map(|(vertex_id,vertex)|Ok((
 		rbx_mesh::mesh::VertexId2(vertex_id as u32),
 		{
 			let vertex=IndexedVertex{
-				pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos).ok()?),
+				pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos)?),
 				tex:mb.acquire_tex_id(glam::Vec2::from_array(vertex.tex)),
-				normal:mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm).ok()?),
-				color:mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32))),
+				normal:mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?),
+				color:mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)))
 			};
 			mb.acquire_vertex_id(vertex)
 		}
-	))).collect()
+	))).collect::<Result<_,_>>().map_err(Error::Planar64Vec3)?)
 }
 fn ingest_vertices_truncated2(
 	vertices:Vec<Vertex2Truncated>,
 	mb:&mut model::MeshBuilder,
 	static_color_id:ColorId,//pick one color and fill everything with it
-)->HashMap<rbx_mesh::mesh::VertexId2,VertexId>{
+)->Result<HashMap<rbx_mesh::mesh::VertexId2,VertexId>,Error>{
 	//this monster is collecting a map of old_vertices_index -> unique_vertices_index
 	//while also doing the inserting unique entries into lists simultaneously
-	// vertex positions that fail to convert are DROPPED
-	vertices.into_iter().enumerate().filter_map(|(vertex_id,vertex)|Some((
+	Ok(vertices.into_iter().enumerate().map(|(vertex_id,vertex)|Ok((
 		rbx_mesh::mesh::VertexId2(vertex_id as u32),
 		{
 			let vertex=IndexedVertex{
-				pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos).ok()?),
+				pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos)?),
 				tex:mb.acquire_tex_id(glam::Vec2::from_array(vertex.tex)),
-				normal:mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm).ok()?),
+				normal:mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?),
 				color:static_color_id,
 			};
 			mb.acquire_vertex_id(vertex)
 		}
-	))).collect()
+	))).collect::<Result<_,_>>().map_err(Error::Planar64Vec3)?)
 }
 
 fn ingest_faces2_lods3(
@@ -68,8 +67,8 @@ fn ingest_faces2_lods3(
 ){
 	//faces have to be split into polygon groups based on lod
 	polygon_groups.extend(lods.windows(2).map(|lod_pair|
-		PolygonGroup::PolygonList(PolygonList::new(faces[lod_pair[0].0 as usize..lod_pair[1].0 as usize].iter().filter_map(|rbx_mesh::mesh::Face2(v0,v1,v2)|
-			Some(vec![*vertex_id_map.get(&v0)?,*vertex_id_map.get(&v1)?,*vertex_id_map.get(&v2)?])
+		PolygonGroup::PolygonList(PolygonList::new(faces[lod_pair[0].0 as usize..lod_pair[1].0 as usize].iter().map(|rbx_mesh::mesh::Face2(v0,v1,v2)|
+			vec![vertex_id_map[&v0],vertex_id_map[&v1],vertex_id_map[&v2]]
 		).collect()))
 	))
 }
@@ -81,18 +80,18 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithS
 	match rbx_mesh::read_versioned(roblox_mesh_bytes.cursor()).map_err(Error::RbxMesh)?{
 		rbx_mesh::mesh::Mesh::V1(mesh)=>{
 			let color_id=mb.acquire_color_id(glam::Vec4::ONE);
-			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.vertices.chunks_exact(3).filter_map(|trip|{
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.vertices.chunks_exact(3).map(|trip|{
 				let mut ingest_vertex1=|vertex:&rbx_mesh::mesh::Vertex1|{
 					let vertex=IndexedVertex{
-						pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos).ok()?),
+						pos:mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos)?),
 						tex:mb.acquire_tex_id(glam::vec2(vertex.tex[0],vertex.tex[1])),
-						normal:mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm).ok()?),
+						normal:mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?),
 						color:color_id,
 					};
-					Some(mb.acquire_vertex_id(vertex))
+					Ok(mb.acquire_vertex_id(vertex))
 				};
-				Some(vec![ingest_vertex1(&trip[0])?,ingest_vertex1(&trip[1])?,ingest_vertex1(&trip[2])?])
-			}).collect())));
+				Ok(vec![ingest_vertex1(&trip[0])?,ingest_vertex1(&trip[1])?,ingest_vertex1(&trip[2])?])
+			}).collect::<Result<_,_>>().map_err(Error::Planar64Vec3)?)));
 		},
 		rbx_mesh::mesh::Mesh::V2(mesh)=>{
 			let vertex_id_map=match mesh.header.sizeof_vertex{
@@ -102,10 +101,10 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithS
 					ingest_vertices_truncated2(mesh.vertices_truncated,&mut mb,color_id)
 				},
 				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut mb),
-			};
+			}?;
 			//one big happy group for all the faces
-			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().filter_map(|face|
-				Some(vec![*vertex_id_map.get(&face.0)?,*vertex_id_map.get(&face.1)?,*vertex_id_map.get(&face.2)?])
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().map(|face|
+				vec![vertex_id_map[&face.0],vertex_id_map[&face.1],vertex_id_map[&face.2]]
 			).collect())));
 		},
 		rbx_mesh::mesh::Mesh::V3(mesh)=>{
@@ -115,15 +114,15 @@ pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithS
 					ingest_vertices_truncated2(mesh.vertices_truncated,&mut mb,color_id)
 				},
 				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut mb),
-			};
+			}?;
 			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
 		},
 		rbx_mesh::mesh::Mesh::V4(mesh)=>{
-			let vertex_id_map=ingest_vertices2(mesh.vertices,&mut mb);
+			let vertex_id_map=ingest_vertices2(mesh.vertices,&mut mb)?;
 			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
 		},
 		rbx_mesh::mesh::Mesh::V5(mesh)=>{
-			let vertex_id_map=ingest_vertices2(mesh.vertices,&mut mb);
+			let vertex_id_map=ingest_vertices2(mesh.vertices,&mut mb)?;
 			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
 		},
 	}

lib/rbx_loader/src/rbx.rs

@@ -18,15 +18,6 @@ fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
 	rbx_dom_weak::ustr(s)
 }
 
-macro_rules! lazy_regex{
-	($r:literal)=>{{
-		use regex::Regex;
-		use std::sync::LazyLock;
-		static RE:LazyLock<Regex>=LazyLock::new(||Regex::new($r).unwrap());
-		&RE
-	}};
-}
-
 fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Result<Planar64Affine3,Planar64TryFromFloatError>{
 	Ok(Planar64Affine3::new(
 		Planar64Mat3::from_cols([
@@ -127,7 +118,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
 			);
 		},
 		other=>{
-			let regman=lazy_regex!(r"^(BonusStart|WormholeOut)(\d+)$");
+			let regman=lazy_regex::regex!(r"^(BonusStart|WormholeOut)(\d+)$");
 			if let Some(captures)=regman.captures(other){
 				match &captures[1]{
 					"BonusStart"=>{
@@ -153,7 +144,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
 					},
 					_=>(),
 				}
-			}else if let Some(captures)=lazy_regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
+			}else if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
 			.captures(other){
 				force_intersecting=true;
 				let stage_id=StageId::new(ParseIntContext::parse(&captures[3]).map_err(GetAttributesError::StageIdParseInt)?);
@@ -194,7 +185,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
 						stage_element,
 					),
 				);
-			}else if let Some(captures)=lazy_regex!(r"^(Jump|WormholeIn)(\d+)$")
+			}else if let Some(captures)=lazy_regex::regex!(r"^(Jump|WormholeIn)(\d+)$")
 			.captures(other){
 				match &captures[1]{
 					"Jump"=>modes_builder.push_mode_update(
@@ -219,7 +210,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
 					},
 					_=>unreachable!("regex2[1] messed up bad"),
 				}
-			}else if let Some(captures)=lazy_regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
+			}else if let Some(captures)=lazy_regex::regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
 			.captures(other){
 				force_can_collide=false;
 				force_intersecting=true;
@@ -344,12 +335,12 @@ pub struct RobloxFaceTextureDescription{
 	pub color:glam::Vec4,
 	pub transform:RobloxTextureTransform,
 }
-impl PartialEq for RobloxFaceTextureDescription{
+impl core::cmp::PartialEq for RobloxFaceTextureDescription{
 	fn eq(&self,other:&Self)->bool{
 		self.to_bits().eq(&other.to_bits())
 	}
 }
-impl Eq for RobloxFaceTextureDescription{}
+impl core::cmp::Eq for RobloxFaceTextureDescription{}
 impl core::hash::Hash for RobloxFaceTextureDescription{
 	fn hash<H:core::hash::Hasher>(&self,state:&mut H){
 		self.to_bits().hash(state);
@@ -775,10 +766,10 @@ struct MeshIdWithSize{
 	mesh:model::MeshId,
 	size:Planar64Vec3,
 }
-fn acquire_mesh_id_from_render_config_id(
+fn acquire_mesh_id_from_render_config_id<'a>(
 	primitive_meshes:&mut Vec<model::Mesh>,
 	mesh_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RenderConfigId,model::MeshId>>,
-	loaded_meshes:&HashMap<model::MeshId,MeshWithSize>,
+	loaded_meshes:&'a HashMap<model::MeshId,MeshWithSize>,
 	old_mesh_id:model::MeshId,
 	render:RenderConfigId,
 )->Option<MeshIdWithSize>{
@@ -798,10 +789,10 @@ fn acquire_mesh_id_from_render_config_id(
 		size,
 	})
 }
-fn acquire_union_id_from_render_config_id(
+fn acquire_union_id_from_render_config_id<'a>(
 	primitive_meshes:&mut Vec<model::Mesh>,
 	union_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RobloxPartDescription,model::MeshId>>,
-	loaded_meshes:&HashMap<model::MeshId,MeshWithSize>,
+	loaded_meshes:&'a HashMap<model::MeshId,MeshWithSize>,
 	old_union_id:model::MeshId,
 	part_texture_description:RobloxPartDescription,
 )->Option<MeshIdWithSize>{

lib/rbxassetid/Cargo.toml

@@ -9,6 +9,3 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 url = "2.5.4"
-
-[lints]
-workspace = true

lib/roblox_emulator/Cargo.toml

@@ -13,12 +13,9 @@ run-service=[]
 
 [dependencies]
 glam = "0.30.0"
-mlua = { version = "0.11.3", features = ["luau"] }
-phf = { version = "0.13.1", features = ["macros"] }
-rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
+mlua = { version = "0.10.1", features = ["luau"] }
+phf = { version = "0.12.1", features = ["macros"] }
+rbx_dom_weak = { version = "3.1.0-sn4", registry = "strafesnet", features = ["instance-userdata"] }
 rbx_reflection = "5.0.0"
 rbx_reflection_database = "1.0.0"
 rbx_types = "2.0.0"
-
-[lints]
-workspace = true

lib/roblox_emulator/src/runner/enum.rs

@@ -8,7 +8,7 @@ impl<'a> EnumItem<'a>{
 		Self{name:Some(name.as_ref()),value}
 	}
 }
-impl From<rbx_types::Enum> for EnumItem<'_>{
+impl<'a> From<rbx_types::Enum> for EnumItem<'a>{
 	fn from(e:rbx_types::Enum)->Self{
 		EnumItem{
 			name:None,
@@ -65,7 +65,7 @@ impl<'a> EnumItems<'a>{
 }
 
 pub enum CoerceEnum<'a>{
-	Integer(i64),
+	Integer(i32),
 	String(mlua::String),
 	Enum(EnumItem<'a>),
 }

lib/roblox_emulator/src/runner/instance/instance.rs

@@ -5,12 +5,12 @@ use rbx_types::Ref;
 use rbx_dom_weak::{Ustr,InstanceBuilder,WeakDom};
 
 use crate::util::static_ustr;
+use crate::runner::vector3::Vector3;
 use crate::runner::number::Number;
 
 pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
 	//class functions store
 	lua.set_app_data(ClassMethodsStore::default());
-	lua.set_app_data(InstanceValueStore::default());
 
 	let table=lua.create_table()?;
 
@@ -43,7 +43,7 @@ pub fn class_is_a(class:&str,superclass:&str)->bool{
 	};
 	db.has_superclass(class,superclass)
 }
-fn get_full_name(dom:&WeakDom,instance:&rbx_dom_weak::Instance)->String{
+fn get_full_name(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->String{
 	let mut full_name=instance.name.clone();
 	let mut pref=instance.parent();
 	while let Some(parent)=dom.get_by_ref(pref){
@@ -65,28 +65,28 @@ pub fn get_name_source(lua:&mlua::Lua,script:Instance)->Result<(String,String),m
 	})
 }
 
-pub fn find_first_child<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
+pub fn find_first_child<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
 	instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.name==name)
 }
-pub fn find_first_descendant<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
+pub fn find_first_descendant<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
 	dom.descendants_of(instance.referent()).find(|&inst|inst.name==name)
 }
 
-pub fn find_first_child_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
+pub fn find_first_child_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
 	instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.class==class)
 }
-pub fn find_first_descendant_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
+pub fn find_first_descendant_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
 	dom.descendants_of(instance.referent()).find(|&inst|inst.class==class)
 }
 
-pub fn find_first_child_which_is_a<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
+pub fn find_first_child_which_is_a<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
 	let db=rbx_reflection_database::get();
 	let superclass_descriptor=db.classes.get(superclass)?;
 	instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|{
 		db.classes.get(inst.class.as_str()).is_some_and(|descriptor|db.has_superclass(descriptor,superclass_descriptor))
 	})
 }
-pub fn find_first_descendant_which_is_a<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
+pub fn find_first_descendant_which_is_a<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
 	let db=rbx_reflection_database::get();
 	let superclass_descriptor=db.classes.get(superclass)?;
 	dom.descendants_of(instance.referent()).find(|inst|{
@@ -325,16 +325,13 @@ impl mlua::UserData for Instance{
 				}
 
 				//find or create an associated userdata object
-				if let Some(value)=instance_value_store_mut(lua,|ivs|{
-					//TODO: walk class tree somehow
-					match ivs.get_or_create_instance_values(&instance){
-						Some(mut instance_values)=>instance_values.get_or_create_value(lua,index_str),
-						None=>Ok(None)
-					}
-				})?{
+				let instance=this.get_mut(dom)?;
+				if let Some(value)=get_or_create_userdata(instance,lua,index_str)?{
 					return value.into_lua(lua);
 				}
+				// drop mutable borrow
 				//find a child with a matching name
+				let instance=this.get(dom)?;
 				find_first_child(dom,instance,index_str)
 				.map(|instance|Instance::new_unchecked(instance.referent()))
 				.into_lua(lua)
@@ -422,7 +419,7 @@ impl mlua::UserData for Instance{
 						rbx_types::Variant::CFrame(typed_value.clone().into())
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::ContentId)=>{
-						let typed_value=value.as_string().ok_or_else(||mlua::Error::runtime("Expected string"))?.to_str()?.to_owned();
+						let typed_value=value.as_str().ok_or_else(||mlua::Error::runtime("Expected string"))?.to_owned();
 						rbx_types::Variant::ContentId(typed_value.into())
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::Ref)=>{
@@ -487,8 +484,8 @@ static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
 		"GetService"=>GET_SERVICE,
 	},
 	"Terrain"=>phf::phf_map!{
-		"FillBall"=>cf!(|_lua,_,_:(crate::runner::vector3::Vector3,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
-		"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,crate::runner::vector3::Vector3,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
+		"FillBall"=>cf!(|_lua,_,_:(Vector3,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
+		"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Vector3,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
 		"FillCylinder"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Number,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
 		"SetMaterialColor"=>cf!(|_lua,_,_:(crate::runner::r#enum::CoerceEnum,crate::runner::color3::Color3)|mlua::Result::Ok(())),
 	},
@@ -609,8 +606,6 @@ fn find_virtual_property(
 }
 
 // lazy-loaded per-instance userdata values
-// This whole thing is a bad idea and a garbage collection nightmare.
-// TODO: recreate rbx_dom_weak with my own instance type that owns this data.
 type CreateUserData=fn(&mlua::Lua)->mlua::Result<mlua::AnyUserData>;
 type LUD=phf::Map<&'static str,// Class name
 	phf::Map<&'static str,// Value name
@@ -643,47 +638,22 @@ static LAZY_USER_DATA:LUD=phf::phf_map!{
 		"MouseClick"=>create_script_signal,
 	},
 };
-#[derive(Default)]
-pub struct InstanceValueStore{
-	values:HashMap<Ref,
-		HashMap<&'static str,
-			mlua::AnyUserData
-		>
-	>,
-}
-pub struct InstanceValues<'a>{
-	named_values:&'static phf::Map<&'static str,CreateUserData>,
-	values:&'a mut HashMap<&'static str,mlua::AnyUserData>,
-}
-impl InstanceValueStore{
-	pub fn get_or_create_instance_values(&mut self,instance:&rbx_dom_weak::Instance)->Option<InstanceValues<'_>>{
-		LAZY_USER_DATA.get(instance.class.as_str())
-			.map(|named_values|
-				InstanceValues{
-					named_values,
-					values:self.values.entry(instance.referent())
-					.or_insert_with(||HashMap::new()),
-				}
-			)
+fn get_or_create_userdata(instance:&mut rbx_dom_weak::Instance,lua:&mlua::Lua,index:&str)->mlua::Result<Option<mlua::AnyUserData>>{
+	use std::collections::hash_map::Entry;
+	let db=rbx_reflection_database::get();
+	let Some(class)=db.classes.get(instance.class.as_str())else{
+		return Ok(None)
+	};
+	if let Some((&static_str,create_userdata))=db.superclasses_iter(class).find_map(|superclass|
+		// find pair (class,index)
+		LAZY_USER_DATA.get(&superclass.name)
+		.and_then(|map|map.get_entry(index))
+	){
+		let index_ustr=static_ustr(static_str);
+		return Ok(Some(match instance.userdata.entry(index_ustr){
+			Entry::Occupied(entry)=>entry.get().clone(),
+			Entry::Vacant(entry)=>entry.insert(create_userdata(lua)?).clone(),
+		}));
 	}
-}
-impl InstanceValues<'_>{
-	pub fn get_or_create_value(&mut self,lua:&mlua::Lua,index:&str)->mlua::Result<Option<mlua::AnyUserData>>{
-		Ok(match self.named_values.get_entry(index){
-			Some((&static_index_str,&function_pointer))=>Some(
-				match self.values.entry(static_index_str){
-					Entry::Occupied(entry)=>entry.get().clone(),
-					Entry::Vacant(entry)=>entry.insert(
-						function_pointer(lua)?
-					).clone(),
-				}
-			),
-			None=>None,
-		})
-	}
-}
-
-pub fn instance_value_store_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut InstanceValueStore)->mlua::Result<T>)->mlua::Result<T>{
-	let mut cf=lua.app_data_mut::<InstanceValueStore>().ok_or_else(||mlua::Error::runtime("InstanceValueStore missing"))?;
-	f(&mut *cf)
+	Ok(None)
 }

lib/roblox_emulator/src/runner/number.rs

@@ -4,7 +4,7 @@
 
 #[derive(Clone,Copy)]
 pub enum Number{
-	Integer(i64),
+	Integer(i32),
 	Number(f64),
 }
 macro_rules! impl_ty{

lib/roblox_emulator/src/runner/runner.rs

@@ -1,4 +1,5 @@
 use crate::context::Context;
+use crate::util::static_ustr;
 #[cfg(feature="run-service")]
 use crate::scheduler::scheduler_mut;
 
@@ -48,11 +49,6 @@ fn init(lua:&mlua::Lua)->mlua::Result<()>{
 	Ok(())
 }
 
-unsafe fn extend_lifetime_mut<'a,T>(src:&mut T)->&'a mut T{
-	let ptr:*mut T=src;
-	unsafe{&mut*ptr}
-}
-
 impl Runner{
 	pub fn new()->Result<Self,Error>{
 		let runner=Self{
@@ -70,7 +66,8 @@ impl Runner{
 		// SAFETY: This is not a &'static mut WeakDom,
 		// but as long as Runnable<'a> holds the lifetime of &'a mut Context
 		// it is a valid unique reference.
-		self.lua.set_app_data::<crate::context::LuaAppData>(unsafe{extend_lifetime_mut(&mut context.dom)});
+		let ptr=&mut context.dom as *mut rbx_dom_weak::WeakDom;
+		self.lua.set_app_data::<crate::context::LuaAppData>(unsafe{&mut*ptr});
 		#[cfg(feature="run-service")]
 		self.lua.set_app_data::<crate::scheduler::Scheduler>(crate::scheduler::Scheduler::default());
 		Ok(Runnable{
@@ -129,20 +126,15 @@ impl Runnable<'_>{
 	}
 	#[cfg(feature="run-service")]
 	pub fn run_service_step(&self)->Result<(),mlua::Error>{
-		let render_stepped=super::instance::instance::dom_mut(&self.lua,|dom|{
+		let render_stepped_signal=super::instance::instance::dom_mut(&self.lua,|dom|{
 			let run_service=super::instance::instance::find_first_child_of_class(dom,dom.root(),"RunService").ok_or_else(||mlua::Error::runtime("RunService missing"))?;
-			super::instance::instance::instance_value_store_mut(&self.lua,|instance_value_store|{
-				//unwrap because I trust my find_first_child_of_class function to
-				let mut instance_values=instance_value_store.get_or_create_instance_values(run_service).ok_or_else(||mlua::Error::runtime("RunService InstanceValues missing"))?;
-				let render_stepped=instance_values.get_or_create_value(&self.lua,"RenderStepped")?;
-				//let stepped=instance_values.get_or_create_value(&self.lua,"Stepped")?;
-				//let heartbeat=instance_values.get_or_create_value(&self.lua,"Heartbeat")?;
-				Ok(render_stepped)
+			Ok(match run_service.userdata.get(&static_ustr("RenderStepped")){
+				Some(render_stepped)=>Some(render_stepped.borrow::<super::script_signal::ScriptSignal>()?.clone()),
+				None=>None
 			})
 		})?;
-		if let Some(render_stepped)=render_stepped{
-			let signal:&super::script_signal::ScriptSignal=&*render_stepped.borrow()?;
-			signal.fire(&mlua::MultiValue::new());
+		if let Some(render_stepped_signal)=render_stepped_signal{
+			render_stepped_signal.fire(&mlua::MultiValue::new());
 		}
 		Ok(())
 	}

lib/roblox_emulator/src/runner/script_signal.rs

@@ -117,7 +117,7 @@ impl mlua::FromLua for ScriptSignal{
 }
 
 impl mlua::UserData for ScriptConnection{
-	fn add_fields<F:UserDataFields<Self>>(fields:&mut F){
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
 		fields.add_field_method_get("Connected",|_,this|{
 			Ok(this.position().is_some())
 		});

lib/roblox_emulator/src/scheduler.rs

@@ -46,8 +46,8 @@ impl Scheduler{
 	}
 }
 
-pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut Scheduler)->mlua::Result<T>)->mlua::Result<T>{
-	let mut scheduler=lua.app_data_mut::<Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
+pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut crate::scheduler::Scheduler)->mlua::Result<T>)->mlua::Result<T>{
+	let mut scheduler=lua.app_data_mut::<crate::scheduler::Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
 	f(&mut *scheduler)
 }
 

lib/snf/Cargo.toml

@@ -9,6 +9,3 @@ edition = "2024"
 binrw = "0.15.0"
 id = { version = "0.1.0", registry = "strafesnet" }
 strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
-
-[lints]
-workspace = true

lib/snf/src/bot.rs

@@ -6,7 +6,7 @@ use strafesnet_common::physics::Time;
 
 const VERSION:u32=0;
 
-type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,Time>;
+type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,strafesnet_common::physics::Time>;
 
 #[derive(Debug)]
 pub enum Error{
@@ -274,7 +274,7 @@ pub fn write_bot<W:BinWriterExt>(mut writer:W,physics_version:u32,instructions:i
 
 	//probe header length
 	let mut bot_header_data=Vec::new();
-	header.write_le(&mut std::io::Cursor::new(&mut bot_header_data)).map_err(Error::InvalidData)?;
+	binrw::BinWrite::write_le(&header,&mut std::io::Cursor::new(&mut bot_header_data)).map_err(Error::InvalidData)?;
 
 	// the first block location is the map header
 	block_location.push(offset);

lib/snf/src/map.rs

@@ -97,8 +97,8 @@ enum ResourceType{
 }
 
 struct ResourceMap<T>{
-	meshes:HashMap<model::MeshId,T>,
-	textures:HashMap<model::TextureId,T>,
+	meshes:HashMap<strafesnet_common::model::MeshId,T>,
+	textures:HashMap<strafesnet_common::model::TextureId,T>,
 }
 impl<T> Default for ResourceMap<T>{
 	fn default()->Self{
@@ -185,7 +185,7 @@ pub struct StreamableMap<R:BinReaderExt>{
 	//this is every possible attribute... need some sort of streaming system
 	attributes:Vec<strafesnet_common::gameplay_attributes::CollisionAttributes>,
 	//this is every possible render configuration... shaders and such... need streaming
-	render_configs:Vec<model::RenderConfig>,
+	render_configs:Vec<strafesnet_common::model::RenderConfig>,
 	//this makes sense to keep in memory for streaming, a map of which blocks occupy what space
 	bvh:BvhNode<BlockId>,
 	//something something resources hashmaps
@@ -223,7 +223,7 @@ impl<R:BinReaderExt> StreamableMap<R>{
 		}
 		Ok(Self{
 			file,
-			modes:gameplay_modes::NormalizedModes::new(modes),
+			modes:strafesnet_common::gameplay_modes::NormalizedModes::new(modes),
 			attributes,
 			render_configs,
 			bvh:strafesnet_common::bvh::generate_bvh(bvh),
@@ -366,12 +366,12 @@ fn collect_spacial_blocks(
 		block_location.push(sequential_block_data.position());
 	}else{
 		match bvh_node.into_content(){
-			RecursiveContent::Branch(bvh_node_list)=>{
+			strafesnet_common::bvh::RecursiveContent::Branch(bvh_node_list)=>{
 				for bvh_node in bvh_node_list{
 					collect_spacial_blocks(block_location,block_headers,sequential_block_data,bvh_node)?;
 				}
 			},
-			RecursiveContent::Leaf(_)=>panic!(),//bvh branches are 20 leaves minimum
+			strafesnet_common::bvh::RecursiveContent::Leaf(_)=>panic!(),//bvh branches are 20 leaves minimum
 		}
 	}
 	Ok(())
@@ -384,13 +384,13 @@ pub fn write_map<W:BinWriterExt>(mut writer:W,map:strafesnet_common::map::Comple
 	let boxen=map.models.into_iter().enumerate().map(|(model_id,model)|{
 		//grow your own aabb
 		let mesh=map.meshes.get(model.mesh.get() as usize).ok_or(Error::InvalidMeshId(model.mesh))?;
-		let mut aabb=Aabb::default();
+		let mut aabb=strafesnet_common::aabb::Aabb::default();
 		for &pos in &mesh.unique_pos{
 			aabb.grow(model.transform.transform_point3(pos).narrow_1().unwrap());
 		}
 		Ok(((model::ModelId::new(model_id as u32),model.into()),aabb))
 	}).collect::<Result<Vec<_>,_>>()?;
-	let bvh=weigh_contents(strafesnet_common::bvh::generate_bvh(boxen),&|_|size_of::<newtypes::model::Model>());
+	let bvh=weigh_contents(strafesnet_common::bvh::generate_bvh(boxen),&|_|std::mem::size_of::<newtypes::model::Model>());
 	//build blocks
 	//block location is initialized with two values
 	//the first value represents the location of the first byte after the file header

lib/snf/src/newtypes/physics.rs

@@ -20,7 +20,7 @@ impl TryInto<TimedPhysicsInstruction> for TimedInstruction{
 	}
 }
 impl TryFrom<TimedPhysicsInstruction> for TimedInstruction{
-	type Error=InstructionConvert;
+	type Error=super::physics::InstructionConvert;
 	fn try_from(value:TimedPhysicsInstruction)->Result<Self,Self::Error>{
 		Ok(Self{
 			time:value.time.get(),

map-tool/Cargo.toml

@@ -12,11 +12,12 @@ flate2 = "1.0.27"
 futures = "0.3.31"
 image = "0.25.2"
 image_dds = "0.7.1"
-rbx_asset = { version = "0.5.0", registry = "strafesnet" }
-rbx_binary  = { version = "1.0.1-sn5", registry = "strafesnet" }
-rbx_dom_weak =  { version = "3.0.1-sn5", registry = "strafesnet" }
+lazy-regex = "3.1.0"
+rbx_asset = { version = "0.4.4", registry = "strafesnet" }
+rbx_binary  = { version = "1.1.0-sn4", registry = "strafesnet" }
+rbx_dom_weak =  { version = "3.1.0-sn4", registry = "strafesnet" }
 rbx_reflection_database = "1.0.0"
-rbx_xml = { version = "1.0.1-sn5", registry = "strafesnet" }
+rbx_xml = { version = "1.1.0-sn4", registry = "strafesnet" }
 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" }
@@ -35,6 +36,3 @@ vtf = "0.3.0"
 #lto = true
 #strip = true
 #codegen-units = 1
-
-[lints]
-workspace = true

map-tool/src/roblox.rs

@@ -465,7 +465,7 @@ fn convert_to_snf(path:&Path,output_folder:PathBuf)->Result<Errors,ConvertError>
 	})
 }
 
-async fn roblox_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf)->AResult<()>{
+async fn roblox_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf)->AResult<()>{
 	let start=std::time::Instant::now();
 
 	let thread_limit=std::thread::available_parallelism()?.get();

map-tool/src/source.rs

@@ -484,7 +484,7 @@ async fn convert_to_snf(path:&Path,vpk_list:&[strafesnet_bsp_loader::Vpk],output
 
 	Ok(())
 }
-async fn source_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf,vpk_paths:Vec<PathBuf>)->AResult<()>{
+async fn source_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf,vpk_paths:Vec<PathBuf>)->AResult<()>{
 	let start=std::time::Instant::now();
 
 	let thread_limit=std::thread::available_parallelism()?.get();

strafe-client/Cargo.toml

@@ -28,12 +28,9 @@ strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet", o
 strafesnet_session = { path = "../engine/session", registry = "strafesnet" }
 strafesnet_settings = { path = "../engine/settings", registry = "strafesnet" }
 strafesnet_snf = { path = "../lib/snf", registry = "strafesnet", optional = true }
-wgpu = "27.0.0"
+wgpu = "26.0.1"
 winit = "0.30.7"
 
 [profile.dev]
 strip = false
 opt-level = 3
-
-[lints]
-workspace = true

strafe-client/src/setup.rs

@@ -119,13 +119,12 @@ impl<'a> SetupContextPartial3<'a>{
 
 		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,
+				&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(),
+					trace: wgpu::Trace::Off,
 				},
 			))
 			.expect("Unable to find a suitable GPU adapter!");

strafe-client/src/window.rs

@@ -188,7 +188,7 @@ impl WindowContext<'_>{
 		}
 	}
 
-	fn device_event(&mut self,time:SessionTime,event:winit::event::DeviceEvent){
+	fn device_event(&mut self,time:SessionTime,event: winit::event::DeviceEvent){
 		match event{
 			winit::event::DeviceEvent::MouseMotion{
 			    delta,