print advance_time

The physics algorithm expects vertices to align exactly with faces.  Since the face normal is calculated via the cross product of vertex positions, this allows the face normals to be exact with respect to the vertex positions.

engine/graphics/Cargo.toml

@@ -11,4 +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 = "24.0.0"
+wgpu = "26.0.1"

engine/graphics/src/graphics.rs

@@ -103,6 +103,26 @@ impl std::default::Default for GraphicsCamera{
 	}
 }
 
+const MODEL_BUFFER_SIZE:usize=4*4 + 12 + 4;//let size=std::mem::size_of::<ModelInstance>();
+const MODEL_BUFFER_SIZE_BYTES:usize=MODEL_BUFFER_SIZE*4;
+fn get_instances_buffer_data(instances:&[GraphicsModelOwned])->Vec<f32>{
+	let mut raw=Vec::with_capacity(MODEL_BUFFER_SIZE*instances.len());
+	for mi in instances{
+		//model transform
+		raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
+		//normal transform
+		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.x_axis));
+		raw.extend_from_slice(&[0.0]);
+		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.y_axis));
+		raw.extend_from_slice(&[0.0]);
+		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.z_axis));
+		raw.extend_from_slice(&[0.0]);
+		//color
+		raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color.get()));
+	}
+	raw
+}
+
 pub struct GraphicsState{
 	pipelines:GraphicsPipelines,
 	bind_groups:GraphicsBindGroups,
@@ -933,6 +953,7 @@ impl GraphicsState{
 						}),
 						store:wgpu::StoreOp::Store,
 					},
+					depth_slice:None,
 				})],
 				depth_stencil_attachment:Some(wgpu::RenderPassDepthStencilAttachment{
 					view:&self.depth_view,
@@ -967,22 +988,3 @@ impl GraphicsState{
 		self.staging_belt.recall();
 	}
 }
-const MODEL_BUFFER_SIZE:usize=4*4 + 12 + 4;//let size=std::mem::size_of::<ModelInstance>();
-const MODEL_BUFFER_SIZE_BYTES:usize=MODEL_BUFFER_SIZE*4;
-fn get_instances_buffer_data(instances:&[GraphicsModelOwned])->Vec<f32>{
-	let mut raw=Vec::with_capacity(MODEL_BUFFER_SIZE*instances.len());
-	for mi in instances{
-		//model transform
-		raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
-		//normal transform
-		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.x_axis));
-		raw.extend_from_slice(&[0.0]);
-		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.y_axis));
-		raw.extend_from_slice(&[0.0]);
-		raw.extend_from_slice(AsRef::<[f32; 3]>::as_ref(&mi.normal_transform.z_axis));
-		raw.extend_from_slice(&[0.0]);
-		//color
-		raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color.get()));
-	}
-	raw
-}

engine/physics/src/body.rs

@@ -18,6 +18,17 @@ impl<T> std::ops::Neg for Body<T>{
 		}
 	}
 }
+impl<T:Copy> std::ops::Neg for &Body<T>{
+	type Output=Body<T>;
+	fn neg(self)->Self::Output{
+		Body{
+			position:self.position,
+			velocity:-self.velocity,
+			acceleration:self.acceleration,
+			time:-self.time,
+		}
+	}
+}
 
 impl<T> Body<T>
 	where Time<T>:Copy,
@@ -42,14 +53,15 @@ impl<T> Body<T>
 	pub fn extrapolated_position(&self,time:Time<T>)->Planar64Vec3{
 		let dt=time-self.time;
 		self.position
-		+(self.velocity*dt).map(|elem|elem.divide().fix_1())
-		+self.acceleration.map(|elem|(dt*dt*elem/2).divide().fix_1())
+		+(self.velocity*dt).map(|elem|elem.divide().clamp_1())
+		+self.acceleration.map(|elem|(dt*dt*elem/2).divide().clamp_1())
 	}
 	pub fn extrapolated_velocity(&self,time:Time<T>)->Planar64Vec3{
 		let dt=time-self.time;
-		self.velocity+(self.acceleration*dt).map(|elem|elem.divide().fix_1())
+		self.velocity+(self.acceleration*dt).map(|elem|elem.divide().clamp_1())
 	}
 	pub fn advance_time(&mut self,time:Time<T>){
+		println!("advance_time");
 		self.position=self.extrapolated_position(time);
 		self.velocity=self.extrapolated_velocity(time);
 		self.time=time;
@@ -71,12 +83,12 @@ impl<T> Body<T>
 			D2:Copy,
 			Planar64:core::ops::Mul<D2,Output=N4>,
 			N4:integer::Divide<D2,Output=T1>,
-			T1:integer::Fix<Planar64>,
+			T1:integer::Clamp<Planar64>,
 	{
 		// a*dt^2/2 + v*dt + p
 		// (a*dt/2+v)*dt+p
 		(self.acceleration.map(|elem|dt*elem/2)+self.velocity).map(|elem|dt.mul_ratio(elem))
-		.map(|elem|elem.divide().fix())+self.position
+		.map(|elem|elem.divide().clamp())+self.position
 	}
 	pub fn extrapolated_velocity_ratio_dt<Num,Den,N1,T1>(&self,dt:integer::Ratio<Num,Den>)->Planar64Vec3
 		where
@@ -85,12 +97,13 @@ impl<T> Body<T>
 			Num:core::ops::Mul<Planar64,Output=N1>,
 			Planar64:core::ops::Mul<Den,Output=N1>,
 			N1:integer::Divide<Den,Output=T1>,
-			T1:integer::Fix<Planar64>,
+			T1:integer::Clamp<Planar64>,
 	{
 		// a*dt + v
-		self.acceleration.map(|elem|(dt*elem).divide().fix())+self.velocity
+		self.acceleration.map(|elem|(dt*elem).divide().clamp())+self.velocity
 	}
 	pub fn advance_time_ratio_dt(&mut self,dt:crate::model::GigaTime){
+		println!("advance_time_ratio_dt");
 		self.position=self.extrapolated_position_ratio_dt(dt);
 		self.velocity=self.extrapolated_velocity_ratio_dt(dt);
 		self.time+=dt.into();

engine/physics/src/face_crawler.rs

@@ -1,7 +1,10 @@
-use crate::model::{GigaTime,FEV,MeshQuery,DirectedEdge};
+use crate::model::{into_giga_time,GigaTime,FEV,MeshQuery,DirectedEdge};
 use strafesnet_common::integer::{Fixed,Ratio,vec3::Vector3};
 use crate::physics::{Time,Body};
 
+use core::ops::Bound;
+
+#[derive(Debug)]
 enum Transition<M:MeshQuery>{
 	Miss,
 	Next(FEV<M>,GigaTime),
@@ -27,17 +30,60 @@ impl<M:MeshQuery> CrawlResult<M>{
 	}
 }
 
+// TODO: move predict_collision_face_out algorithm in here or something
+
+/// check_lower_bound
+pub fn low<LhsNum,LhsDen,RhsNum,RhsDen,T>(lower_bound:&Bound<Ratio<LhsNum,LhsDen>>,dt:&Ratio<RhsNum,RhsDen>)->bool
+where
+	RhsNum:Copy,
+	RhsDen:Copy,
+	LhsNum:Copy,
+	LhsDen:Copy,
+	LhsDen:strafesnet_common::integer::Parity,
+	RhsDen:strafesnet_common::integer::Parity,
+	LhsNum:core::ops::Mul<RhsDen,Output=T>,
+	LhsDen:core::ops::Mul<RhsNum,Output=T>,
+	T:Ord+Copy,
+{
+	match lower_bound{
+		Bound::Included(time)=>time.le_ratio(*dt),
+		Bound::Excluded(time)=>time.lt_ratio(*dt),
+		Bound::Unbounded=>true,
+	}
+}
+/// check_upper_bound
+pub fn upp<LhsNum,LhsDen,RhsNum,RhsDen,T>(dt:&Ratio<LhsNum,LhsDen>,upper_bound:&Bound<Ratio<RhsNum,RhsDen>>)->bool
+where
+	RhsNum:Copy,
+	RhsDen:Copy,
+	LhsNum:Copy,
+	LhsDen:Copy,
+	LhsDen:strafesnet_common::integer::Parity,
+	RhsDen:strafesnet_common::integer::Parity,
+	LhsNum:core::ops::Mul<RhsDen,Output=T>,
+	LhsDen:core::ops::Mul<RhsNum,Output=T>,
+	T:Ord+Copy,
+{
+	match upper_bound{
+		Bound::Included(time)=>dt.le_ratio(*time),
+		Bound::Excluded(time)=>dt.lt_ratio(*time),
+		Bound::Unbounded=>true,
+	}
+}
+
 impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 	where
 		// This is hardcoded for MinkowskiMesh lol
 		M::Face:Copy,
 		M::Edge:Copy,
 		M::Vert:Copy,
+		M:std::fmt::Debug,
+		F:std::fmt::Display,
 		F:core::ops::Mul<Fixed<1,32>,Output=Fixed<4,128>>,
 		<F as core::ops::Mul<Fixed<1,32>>>::Output:core::iter::Sum,
-		<M as MeshQuery>::Offset:core::ops::Sub<<F as std::ops::Mul<Fixed<1,32>>>::Output>,
+		M::Offset:core::ops::Sub<<F as std::ops::Mul<Fixed<1,32>>>::Output>,
 {
-	fn next_transition(&self,body_time:GigaTime,mesh:&M,body:&Body,mut best_time:GigaTime)->Transition<M>{
+	fn next_transition(&self,mesh:&M,body:&Body,lower_bound:Bound<GigaTime>,mut upper_bound:Bound<GigaTime>)->Transition<M>{
 		//conflicting derivative means it crosses in the wrong direction.
 		//if the transition time is equal to an already tested transition, do not replace the current best.
 		let mut best_transition=Transition::Miss;
@@ -47,25 +93,31 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 				//n=face.normal d=face.dot
 				//n.a t^2+n.v t+n.p-d==0
 				let (n,d)=mesh.face_nd(face_id);
+				println!("Face n={} d={}",n,d);
 				//TODO: use higher precision d value?
 				//use the mesh transform translation instead of baking it into the d value.
 				for dt in Fixed::<4,128>::zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
-					if body_time.le_ratio(dt)&&dt.lt_ratio(best_time)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-						best_time=dt;
+					let low=low(&lower_bound,&dt);
+					let upp=upp(&dt,&upper_bound);
+					let into=n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative();
+					println!("dt={} low={low} upp={upp} into={into}",dt.divide());
+					if low&&upp&&into{
+						upper_bound=Bound::Included(dt);
 						best_transition=Transition::Hit(face_id,dt);
 						break;
 					}
 				}
 				//test each edge collision time, ignoring roots with zero or conflicting derivative
-				for &directed_edge_id in mesh.face_edges(face_id).iter(){
+				for &directed_edge_id in mesh.face_edges(face_id).as_ref(){
 					let edge_n=mesh.directed_edge_n(directed_edge_id);
 					let n=n.cross(edge_n);
-					let verts=mesh.edge_verts(directed_edge_id.as_undirected());
+					let &[v0,v1]=mesh.edge_verts(directed_edge_id.as_undirected()).as_ref();
 					//WARNING: d is moved out of the *2 block because of adding two vertices!
 					//WARNING: precision is swept under the rug!
-					for dt in Fixed::<4,128>::zeroes2(n.dot(body.position*2-(mesh.vert(verts[0])+mesh.vert(verts[1]))).fix_4(),n.dot(body.velocity).fix_4()*2,n.dot(body.acceleration).fix_4()){
-						if body_time.le_ratio(dt)&&dt.lt_ratio(best_time)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-							best_time=dt;
+					//wrap for speed
+					for dt in Fixed::<4,128>::zeroes2(n.dot(body.position*2-(mesh.vert(v0)+mesh.vert(v1))).wrap_4(),n.dot(body.velocity).wrap_4()*2,n.dot(body.acceleration).wrap_4()){
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Edge(directed_edge_id.as_undirected()),dt);
 							break;
 						}
@@ -75,30 +127,39 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 			},
 			&FEV::Edge(edge_id)=>{
 				//test each face collision time, ignoring roots with zero or conflicting derivative
-				let edge_n=mesh.edge_n(edge_id);
 				let edge_verts=mesh.edge_verts(edge_id);
-				let delta_pos=body.position*2-(mesh.vert(edge_verts[0])+mesh.vert(edge_verts[1]));
-				for (i,&edge_face_id) in mesh.edge_faces(edge_id).iter().enumerate(){
+				let &[ev0,ev1]=edge_verts.as_ref();
+				let (v0,v1)=(mesh.vert(ev0),mesh.vert(ev1));
+				let edge_n=v1-v0;
+				let delta_pos=body.position*2-(v0+v1);
+				for (i,&edge_face_id) in mesh.edge_faces(edge_id).as_ref().iter().enumerate(){
 					let face_n=mesh.face_nd(edge_face_id).0;
 					//edge_n gets parity from the order of edge_faces
 					let n=face_n.cross(edge_n)*((i as i64)*2-1);
+					let d=n.dot(delta_pos).wrap_4();
+					println!("Edge Face={:?} boundary_n={} boundary_d={}",edge_face_id,n,d>>1);
 					//WARNING yada yada d *2
-					for dt in Fixed::<4,128>::zeroes2(n.dot(delta_pos).fix_4(),n.dot(body.velocity).fix_4()*2,n.dot(body.acceleration).fix_4()){
-						if body_time.le_ratio(dt)&&dt.lt_ratio(best_time)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-							best_time=dt;
+					//wrap for speed
+					for dt in Fixed::<4,128>::zeroes2(d,n.dot(body.velocity).wrap_4()*2,n.dot(body.acceleration).wrap_4()){
+						let low=low(&lower_bound,&dt);
+						let upp=upp(&dt,&upper_bound);
+						let into=n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative();
+						println!("dt={} low={low} upp={upp} into={into}",dt.divide());
+						if low&&upp&&into{
+							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Face(edge_face_id),dt);
 							break;
 						}
 					}
 				}
 				//test each vertex collision time, ignoring roots with zero or conflicting derivative
-				for (i,&vert_id) in edge_verts.iter().enumerate(){
+				for (i,&vert_id) in edge_verts.as_ref().iter().enumerate(){
 					//vertex normal gets parity from vert index
 					let n=edge_n*(1-2*(i as i64));
 					for dt in Fixed::<2,64>::zeroes2((n.dot(body.position-mesh.vert(vert_id)))*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
-						if body_time.le_ratio(dt)&&dt.lt_ratio(best_time)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-							let dt=Ratio::new(dt.num.fix_4(),dt.den.fix_4());
-							best_time=dt;
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+							let dt=Ratio::new(dt.num.widen_4(),dt.den.widen_4());
+							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Vert(vert_id),dt);
 							break;
 						}
@@ -108,13 +169,13 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 			},
 			&FEV::Vert(vert_id)=>{
 				//test each edge collision time, ignoring roots with zero or conflicting derivative
-				for &directed_edge_id in mesh.vert_edges(vert_id).iter(){
+				for &directed_edge_id in mesh.vert_edges(vert_id).as_ref(){
 					//edge is directed away from vertex, but we want the dot product to turn out negative
 					let n=-mesh.directed_edge_n(directed_edge_id);
 					for dt in Fixed::<2,64>::zeroes2((n.dot(body.position-mesh.vert(vert_id)))*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
-						if body_time.le_ratio(dt)&&dt.lt_ratio(best_time)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-							let dt=Ratio::new(dt.num.fix_4(),dt.den.fix_4());
-							best_time=dt;
+						if low(&lower_bound,&dt)&&upp(&dt,&upper_bound)&&n.dot(body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+							let dt=Ratio::new(dt.num.widen_4(),dt.den.widen_4());
+							upper_bound=Bound::Included(dt);
 							best_transition=Transition::Next(FEV::Edge(directed_edge_id.as_undirected()),dt);
 							break;
 						}
@@ -125,19 +186,16 @@ impl<F:Copy,M:MeshQuery<Normal=Vector3<F>,Offset=Fixed<4,128>>> FEV<M>
 		}
 		best_transition
 	}
-	pub fn crawl(mut self,mesh:&M,relative_body:&Body,start_time:Time,time_limit:Time)->CrawlResult<M>{
-		let mut body_time={
-			let r=(start_time-relative_body.time).to_ratio();
-			Ratio::new(r.num.fix_4(),r.den.fix_4())
-		};
-		let time_limit={
-			let r=(time_limit-relative_body.time).to_ratio();
-			Ratio::new(r.num.fix_4(),r.den.fix_4())
-		};
+	pub fn crawl(mut self,mesh:&M,relative_body:&Body,lower_bound:Bound<&Time>,upper_bound:Bound<&Time>)->CrawlResult<M>{
+		let mut lower_bound=lower_bound.map(|&t|into_giga_time(t,relative_body.time));
+		let upper_bound=upper_bound.map(|&t|into_giga_time(t,relative_body.time));
+		println!("crawl begin={self:?}");
 		for _ in 0..20{
-			match self.next_transition(body_time,mesh,relative_body,time_limit){
+			let transition=self.next_transition(mesh,relative_body,lower_bound,upper_bound);
+			println!("transition={transition:?}");
+			match transition{
 				Transition::Miss=>return CrawlResult::Miss(self),
-				Transition::Next(next_fev,next_time)=>(self,body_time)=(next_fev,next_time),
+				Transition::Next(next_fev,next_time)=>(self,lower_bound)=(next_fev,Bound::Included(next_time)),
 				Transition::Hit(face,time)=>return CrawlResult::Hit(face,time),
 			}
 		}

engine/physics/src/model.rs

@@ -1,6 +1,5 @@
-use std::borrow::{Borrow,Cow};
 use std::collections::{HashSet,HashMap};
-use core::ops::Range;
+use core::ops::{Bound,RangeBounds};
 use strafesnet_common::integer::vec3::Vector3;
 use strafesnet_common::model::{self,MeshId,PolygonIter};
 use strafesnet_common::integer::{self,vec3,Fixed,Planar64,Planar64Vec3,Ratio};
@@ -8,6 +7,13 @@ use strafesnet_common::physics::Time;
 
 type Body=crate::body::Body<strafesnet_common::physics::TimeInner>;
 
+struct AsRefHelper<T>(T);
+impl<T> AsRef<T> for AsRefHelper<T>{
+	fn as_ref(&self)->&T{
+		&self.0
+	}
+}
+
 pub trait UndirectedEdge{
 	type DirectedEdge:Copy+DirectedEdge;
 	fn as_directed(&self,parity:bool)->Self::DirectedEdge;
@@ -62,47 +68,52 @@ pub enum FEV<M:MeshQuery>{
 }
 
 //use Unit32 #[repr(C)] for map files
-#[derive(Clone,Hash,Eq,PartialEq)]
+#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
 struct Face{
 	normal:Planar64Vec3,
 	dot:Planar64,
 }
+#[derive(Debug)]
 struct Vert(Planar64Vec3);
 pub trait MeshQuery{
-	type Face:Clone;
-	type Edge:Clone+DirectedEdge;
-	type Vert:Clone;
+	type Face:Copy+std::fmt::Debug;
+	type Edge:Copy+DirectedEdge+std::fmt::Debug;
+	type Vert:Copy+std::fmt::Debug;
 	// Vertex must be Planar64Vec3 because it represents an actual position
 	type Normal;
 	type Offset;
 	fn edge_n(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->Planar64Vec3{
-		let verts=self.edge_verts(edge_id);
-		self.vert(verts[1].clone())-self.vert(verts[0].clone())
+		let &[v0,v1]=self.edge_verts(edge_id).as_ref();
+		self.vert(v1)-self.vert(v0)
 	}
 	fn directed_edge_n(&self,directed_edge_id:Self::Edge)->Planar64Vec3{
-		let verts=self.edge_verts(directed_edge_id.as_undirected());
-		(self.vert(verts[1].clone())-self.vert(verts[0].clone()))*((directed_edge_id.parity() as i64)*2-1)
+		let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
+		(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
 	}
 	fn vert(&self,vert_id:Self::Vert)->Planar64Vec3;
 	fn face_nd(&self,face_id:Self::Face)->(Self::Normal,Self::Offset);
-	fn face_edges(&self,face_id:Self::Face)->Cow<[Self::Edge]>;
-	fn edge_faces(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->Cow<[Self::Face;2]>;
-	fn edge_verts(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->Cow<[Self::Vert;2]>;
-	fn vert_edges(&self,vert_id:Self::Vert)->Cow<[Self::Edge]>;
-	fn vert_faces(&self,vert_id:Self::Vert)->Cow<[Self::Face]>;
+	fn face_edges(&self,face_id:Self::Face)->impl AsRef<[Self::Edge]>;
+	fn edge_faces(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->impl AsRef<[Self::Face;2]>;
+	fn edge_verts(&self,edge_id:<Self::Edge as DirectedEdge>::UndirectedEdge)->impl AsRef<[Self::Vert;2]>;
+	fn vert_edges(&self,vert_id:Self::Vert)->impl AsRef<[Self::Edge]>;
+	fn vert_faces(&self,vert_id:Self::Vert)->impl AsRef<[Self::Face]>;
 }
+#[derive(Debug)]
 struct FaceRefs{
 	edges:Vec<SubmeshDirectedEdgeId>,
 	//verts:Vec<VertId>,
 }
+#[derive(Debug)]
 struct EdgeRefs{
 	faces:[SubmeshFaceId;2],//left, right
 	verts:[SubmeshVertId;2],//bottom, top
 }
+#[derive(Debug)]
 struct VertRefs{
 	faces:Vec<SubmeshFaceId>,
 	edges:Vec<SubmeshDirectedEdgeId>,
 }
+#[derive(Debug)]
 pub struct PhysicsMeshData{
 	//this contains all real and virtual faces used in both the complete mesh and convex submeshes
 	//faces are sorted such that all faces that belong to the complete mesh appear first, and then
@@ -112,6 +123,7 @@ pub struct PhysicsMeshData{
 	faces:Vec<Face>,//MeshFaceId indexes this list
 	verts:Vec<Vert>,//MeshVertId indexes this list
 }
+#[derive(Debug)]
 pub struct PhysicsMeshTopology{
 	//mapping of local ids to PhysicsMeshData ids
 	faces:Vec<MeshFaceId>,//SubmeshFaceId indexes this list
@@ -137,10 +149,12 @@ impl From<MeshId> for PhysicsMeshId{
 pub struct PhysicsSubmeshId(u32);
 pub struct PhysicsMesh{
 	data:PhysicsMeshData,
-	complete_mesh:PhysicsMeshTopology,
-	//Most objects in roblox maps are already convex, so the list length is 0
-	//as soon as the mesh is divided into 2 submeshes, the list length jumps to 2.
-	//length 1 is unnecessary since the complete mesh would be a duplicate of the only submesh, but would still function properly
+	// The complete mesh is unused at this time.
+	// complete_mesh:PhysicsMeshTopology,
+	// Submeshes are guaranteed to be convex and may contain
+	// "virtual" faces which are not part of the complete mesh.
+	// Physics calculations should never resolve to hitting
+	// a virtual face.
 	submeshes:Vec<PhysicsMeshTopology>,
 }
 impl PhysicsMesh{
@@ -204,19 +218,24 @@ impl PhysicsMesh{
 		};
 		Self{
 			data,
-			complete_mesh:mesh_topology,
-			submeshes:Vec::new(),
+			// complete_mesh:mesh_topology.clone(),
+			submeshes:vec![mesh_topology],
 		}
 	}
 	pub fn unit_cylinder()->Self{
 		Self::unit_cube()
 	}
 	#[inline]
-	pub const fn complete_mesh(&self)->&PhysicsMeshTopology{
-		&self.complete_mesh
+	pub fn complete_mesh(&self)->&PhysicsMeshTopology{
+		// If there is exactly one submesh, then the complete mesh is identical to it.
+		if self.submeshes.len()==1{
+			self.submeshes.first().unwrap()
+		}else{
+			panic!("PhysicsMesh complete mesh is not known");
+		}
 	}
 	#[inline]
-	pub const fn complete_mesh_view(&self)->PhysicsMeshView{
+	pub fn complete_mesh_view(&self)->PhysicsMeshView<'_>{
 		PhysicsMeshView{
 			data:&self.data,
 			topology:self.complete_mesh(),
@@ -224,21 +243,16 @@ impl PhysicsMesh{
 	}
 	#[inline]
 	pub fn submeshes(&self)->&[PhysicsMeshTopology]{
-		//the complete mesh is already a convex mesh when len()==0, len()==1 is invalid but will still work
-		if self.submeshes.len()==0{
-			std::slice::from_ref(&self.complete_mesh)
-		}else{
-			&self.submeshes.as_slice()
-		}
+		&self.submeshes
 	}
 	#[inline]
-	pub fn submesh_view(&self,submesh_id:PhysicsSubmeshId)->PhysicsMeshView{
+	pub fn submesh_view(&self,submesh_id:PhysicsSubmeshId)->PhysicsMeshView<'_>{
 		PhysicsMeshView{
 			data:&self.data,
 			topology:&self.submeshes()[submesh_id.get() as usize],
 		}
 	}
-	pub fn submesh_views(&self)->impl Iterator<Item=PhysicsMeshView>{
+	pub fn submesh_views(&self)->impl Iterator<Item=PhysicsMeshView<'_>>{
 		self.submeshes().iter().map(|topology|PhysicsMeshView{
 			data:&self.data,
 			topology,
@@ -307,14 +321,20 @@ impl TryFrom<&model::Mesh> for PhysicsMesh{
 		if mesh.unique_pos.len()==0{
 			return Err(PhysicsMeshError::ZeroVertices);
 		}
+		// An empty physics mesh is a waste of resources
+		if mesh.physics_groups.len()==0{
+			return Err(PhysicsMeshError::NoPhysicsGroups);
+		}
 		let verts=mesh.unique_pos.iter().copied().map(Vert).collect();
 		//TODO: fix submeshes
 		//flat map mesh.physics_groups[$1].groups.polys()[$2] as face_id
 		//lower face_id points to upper face_id
 		//the same face is not allowed to be in multiple polygon groups
+		// because SubmeshFaceId -> CompleteMeshFaceId -> SubmeshFaceId is ambiguous
+		// when multiple SubmeshFaceId point to one MeshFaceId
 		let mut faces=Vec::new();
 		let mut face_id_from_face=HashMap::new();
-		let mut mesh_topologies:Vec<PhysicsMeshTopology>=mesh.physics_groups.iter().map(|physics_group|{
+		let mesh_topologies:Vec<PhysicsMeshTopology>=mesh.physics_groups.iter().map(|physics_group|{
 			//construct submesh
 			let mut submesh_faces=Vec::new();//these contain a map from submeshId->meshId
 			let mut submesh_verts=Vec::new();
@@ -372,18 +392,14 @@ impl TryFrom<&model::Mesh> for PhysicsMesh{
 					}
 					//assume face hash is stable, and there are no flush faces...
 					let face=Face{
-						normal:(normal/len as i64).divide().fix_1(),
-						dot:(dot/(len*len) as i64).fix_1(),
-					};
-					let face_id=match face_id_from_face.get(&face){
-						Some(&face_id)=>face_id,
-						None=>{
-							let face_id=MeshFaceId::new(faces.len() as u32);
-							face_id_from_face.insert(face.clone(),face_id);
-							faces.push(face);
-							face_id
-						}
+						normal:(normal/len as i64).divide().narrow_1().unwrap(),
+						dot:(dot/(len*len) as i64).narrow_1().unwrap(),
 					};
+					let face_id=*face_id_from_face.entry(face).or_insert_with(||{
+						let face_id=MeshFaceId::new(faces.len() as u32);
+						faces.push(face);
+						face_id
+					});
 					submesh_faces.push(face_id);
 					face_ref_guys.push(FaceRefEdges(face_edges));
 				}
@@ -391,16 +407,16 @@ impl TryFrom<&model::Mesh> for PhysicsMesh{
 			PhysicsMeshTopology{
 				faces:submesh_faces,
 				verts:submesh_verts,
-				face_topology:face_ref_guys.into_iter().map(|face_ref_guy|{
-					FaceRefs{edges:face_ref_guy.0}
+				face_topology:face_ref_guys.into_iter().map(|FaceRefEdges(edges)|{
+					FaceRefs{edges}
 				}).collect(),
-				edge_topology:edge_pool.edge_guys.into_iter().map(|(edge_ref_verts,edge_ref_faces)|
-					EdgeRefs{faces:edge_ref_faces.0,verts:edge_ref_verts.0}
+				edge_topology:edge_pool.edge_guys.into_iter().map(|(EdgeRefVerts(verts),EdgeRefFaces(faces))|
+					EdgeRefs{faces,verts}
 				).collect(),
-				vert_topology:vert_ref_guys.into_iter().map(|vert_ref_guy|
+				vert_topology:vert_ref_guys.into_iter().map(|VertRefGuy{edges,faces}|
 					VertRefs{
-						edges:vert_ref_guy.edges.into_iter().collect(),
-						faces:vert_ref_guy.faces.into_iter().collect(),
+						edges:edges.into_iter().collect(),
+						faces:faces.into_iter().collect(),
 					}
 				).collect(),
 			}
@@ -410,12 +426,13 @@ impl TryFrom<&model::Mesh> for PhysicsMesh{
 				faces,
 				verts,
 			},
-			complete_mesh:mesh_topologies.pop().ok_or(PhysicsMeshError::NoPhysicsGroups)?,
+			// complete_mesh:None,
 			submeshes:mesh_topologies,
 		})
 	}
 }
 
+#[derive(Debug)]
 pub struct PhysicsMeshView<'a>{
 	data:&'a PhysicsMeshData,
 	topology:&'a PhysicsMeshTopology,
@@ -435,23 +452,24 @@ impl MeshQuery for PhysicsMeshView<'_>{
 		let vert_idx=self.topology.verts[vert_id.get() as usize].get() as usize;
 		self.data.verts[vert_idx].0
 	}
-	fn face_edges(&self,face_id:SubmeshFaceId)->Cow<[SubmeshDirectedEdgeId]>{
-		Cow::Borrowed(&self.topology.face_topology[face_id.get() as usize].edges)
+	fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
+		self.topology.face_topology[face_id.get() as usize].edges.as_slice()
 	}
-	fn edge_faces(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshFaceId;2]>{
-		Cow::Borrowed(&self.topology.edge_topology[edge_id.get() as usize].faces)
+	fn edge_faces(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshFaceId;2]>{
+		AsRefHelper(self.topology.edge_topology[edge_id.get() as usize].faces)
 	}
-	fn edge_verts(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshVertId;2]>{
-		Cow::Borrowed(&self.topology.edge_topology[edge_id.get() as usize].verts)
+	fn edge_verts(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshVertId;2]>{
+		AsRefHelper(self.topology.edge_topology[edge_id.get() as usize].verts)
 	}
-	fn vert_edges(&self,vert_id:SubmeshVertId)->Cow<[SubmeshDirectedEdgeId]>{
-		Cow::Borrowed(&self.topology.vert_topology[vert_id.get() as usize].edges)
+	fn vert_edges(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshDirectedEdgeId]>{
+		self.topology.vert_topology[vert_id.get() as usize].edges.as_slice()
 	}
-	fn vert_faces(&self,vert_id:SubmeshVertId)->Cow<[SubmeshFaceId]>{
-		Cow::Borrowed(&self.topology.vert_topology[vert_id.get() as usize].faces)
+	fn vert_faces(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshFaceId]>{
+		self.topology.vert_topology[vert_id.get() as usize].faces.as_slice()
 	}
 }
 
+#[derive(Debug)]
 pub struct PhysicsMeshTransform{
 	pub vertex:integer::Planar64Affine3,
 	pub normal:integer::mat3::Matrix3<Fixed<2,64>>,
@@ -467,6 +485,7 @@ impl PhysicsMeshTransform{
 	}
 }
 
+#[derive(Debug)]
 pub struct TransformedMesh<'a>{
 	view:PhysicsMeshView<'a>,
 	transform:&'a PhysicsMeshTransform,
@@ -484,9 +503,6 @@ impl TransformedMesh<'_>{
 	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))
 	}
-	pub fn faces(&self)->impl Iterator<Item=SubmeshFaceId>{
-		(0..self.view.topology.faces.len() as u32).map(SubmeshFaceId::new)
-	}
 	fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
 		//this happens to be well-defined.  there are no virtual virtices
 		SubmeshVertId::new(
@@ -513,26 +529,27 @@ impl MeshQuery for TransformedMesh<'_>{
 		(transformed_n,transformed_d)
 	}
 	fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
-		self.transform.vertex.transform_point3(self.view.vert(vert_id)).fix_1()
+		// wrap for speed
+		self.transform.vertex.transform_point3(self.view.vert(vert_id)).wrap_1()
 	}
 	#[inline]
-	fn face_edges(&self,face_id:SubmeshFaceId)->Cow<[SubmeshDirectedEdgeId]>{
+	fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
 		self.view.face_edges(face_id)
 	}
 	#[inline]
-	fn edge_faces(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshFaceId;2]>{
+	fn edge_faces(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshFaceId;2]>{
 		self.view.edge_faces(edge_id)
 	}
 	#[inline]
-	fn edge_verts(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshVertId;2]>{
+	fn edge_verts(&self,edge_id:SubmeshEdgeId)->impl AsRef<[SubmeshVertId;2]>{
 		self.view.edge_verts(edge_id)
 	}
 	#[inline]
-	fn vert_edges(&self,vert_id:SubmeshVertId)->Cow<[SubmeshDirectedEdgeId]>{
+	fn vert_edges(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshDirectedEdgeId]>{
 		self.view.vert_edges(vert_id)
 	}
 	#[inline]
-	fn vert_faces(&self,vert_id:SubmeshVertId)->Cow<[SubmeshFaceId]>{
+	fn vert_faces(&self,vert_id:SubmeshVertId)->impl AsRef<[SubmeshFaceId]>{
 		self.view.vert_faces(vert_id)
 	}
 }
@@ -591,6 +608,7 @@ pub enum MinkowskiFace{
 	//FaceFace
 }
 
+#[derive(Debug)]
 pub struct MinkowskiMesh<'a>{
 	mesh0:TransformedMesh<'a>,
 	mesh1:TransformedMesh<'a>,
@@ -608,6 +626,10 @@ enum EV{
 }
 
 pub type GigaTime=Ratio<Fixed<4,128>,Fixed<4,128>>;
+pub fn into_giga_time(time:Time,relative_to:Time)->GigaTime{
+	let r=(time-relative_to).to_ratio();
+	Ratio::new(r.num.widen_4(),r.den.widen_4())
+}
 
 impl MinkowskiMesh<'_>{
 	pub fn minkowski_sum<'a>(mesh0:TransformedMesh<'a>,mesh1:TransformedMesh<'a>)->MinkowskiMesh<'a>{
@@ -621,12 +643,12 @@ impl MinkowskiMesh<'_>{
 	}
 	fn next_transition_vert(&self,vert_id:MinkowskiVert,best_distance_squared:&mut Fixed<2,64>,infinity_dir:Planar64Vec3,point:Planar64Vec3)->Transition{
 		let mut best_transition=Transition::Done;
-		for &directed_edge_id in self.vert_edges(vert_id).iter(){
+		for &directed_edge_id in self.vert_edges(vert_id).as_ref(){
 			let edge_n=self.directed_edge_n(directed_edge_id);
 			//is boundary uncrossable by a crawl from infinity
 			let edge_verts=self.edge_verts(directed_edge_id.as_undirected());
 			//select opposite vertex
-			let test_vert_id=edge_verts[directed_edge_id.parity() as usize];
+			let test_vert_id=edge_verts.as_ref()[directed_edge_id.parity() as usize];
 			//test if it's closer
 			let diff=point-self.vert(test_vert_id);
 			if edge_n.dot(infinity_dir).is_zero(){
@@ -642,7 +664,7 @@ impl MinkowskiMesh<'_>{
 	fn final_ev(&self,vert_id:MinkowskiVert,best_distance_squared:&mut Fixed<2,64>,infinity_dir:Planar64Vec3,point:Planar64Vec3)->EV{
 		let mut best_transition=EV::Vert(vert_id);
 		let diff=point-self.vert(vert_id);
-		for &directed_edge_id in self.vert_edges(vert_id).iter(){
+		for &directed_edge_id in self.vert_edges(vert_id).as_ref(){
 			let edge_n=self.directed_edge_n(directed_edge_id);
 			//is boundary uncrossable by a crawl from infinity
 			//check if time of collision is outside Time::MIN..Time::MAX
@@ -653,7 +675,8 @@ impl MinkowskiMesh<'_>{
 				if !d.is_negative()&&d<=edge_nn{
 					let distance_squared={
 						let c=diff.cross(edge_n);
-						(c.dot(c)/edge_nn).divide().fix_2()
+						//wrap for speed
+						(c.dot(c)/edge_nn).divide().wrap_2()
 					};
 					if distance_squared<=*best_distance_squared{
 						best_transition=EV::Edge(directed_edge_id.as_undirected());
@@ -677,7 +700,7 @@ impl MinkowskiMesh<'_>{
 		}
 	}
 	/// This function drops a vertex down to an edge or a face if the path from infinity did not cross any vertex-edge boundaries but the point is supposed to have already crossed a boundary down from a vertex
-	fn infinity_fev(&self,infinity_dir:Planar64Vec3,point:Planar64Vec3)->FEV::<MinkowskiMesh>{
+	fn infinity_fev(&self,infinity_dir:Planar64Vec3,point:Planar64Vec3)->FEV::<MinkowskiMesh<'_>>{
 		//start on any vertex
 		//cross uncrossable vertex-edge boundaries until you find the closest vertex or edge
 		//cross edge-face boundary if it's uncrossable
@@ -689,10 +712,10 @@ impl MinkowskiMesh<'_>{
 				let edge_n=self.edge_n(edge_id);
 				// point is multiplied by two because vert_sum sums two vertices.
 				let delta_pos=point*2-{
-					let &[v0,v1]=self.edge_verts(edge_id).borrow();
+					let &[v0,v1]=self.edge_verts(edge_id).as_ref();
 					self.vert(v0)+self.vert(v1)
 				};
-				for (i,&face_id) in self.edge_faces(edge_id).iter().enumerate(){
+				for (i,&face_id) in self.edge_faces(edge_id).as_ref().iter().enumerate(){
 					let face_n=self.face_nd(face_id).0;
 					//edge-face boundary nd, n facing out of the face towards the edge
 					let boundary_n=face_n.cross(edge_n)*(i as i64*2-1);
@@ -722,67 +745,71 @@ impl MinkowskiMesh<'_>{
 	//
 	// Most of the calculation time is just calculating the starting point
 	// for the "actual" crawling algorithm below (predict_collision_{in|out}).
-	fn closest_fev_not_inside(&self,mut infinity_body:Body,start_time:Time)->Option<FEV<MinkowskiMesh>>{
+	fn closest_fev_not_inside(&self,mut infinity_body:Body,start_time:Bound<&Time>)->Option<FEV<MinkowskiMesh<'_>>>{
 		infinity_body.infinity_dir().and_then(|dir|{
 			let infinity_fev=self.infinity_fev(-dir,infinity_body.position);
 			//a line is simpler to solve than a parabola
 			infinity_body.velocity=dir;
 			infinity_body.acceleration=vec3::ZERO;
 			//crawl in from negative infinity along a tangent line to get the closest fev
-			// TODO: change crawl_fev args to delta time? Optional values?
-			infinity_fev.crawl(self,&infinity_body,Time::MIN/4,start_time).miss()
+			infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,start_time).miss()
 		})
 	}
-	pub fn predict_collision_in(&self,relative_body:&Body,Range{start:start_time,end:time_limit}:Range<Time>)->Option<(MinkowskiFace,GigaTime)>{
-		self.closest_fev_not_inside(relative_body.clone(),start_time).and_then(|fev|{
+	pub fn predict_collision_in(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
+		println!("@@@BEGIN SETUP@@@");
+		self.closest_fev_not_inside(*relative_body,range.start_bound()).and_then(|fev|{
+			println!("@@@BEGIN REAL CRAWL@@@");
 			//continue forwards along the body parabola
-			fev.crawl(self,relative_body,start_time,time_limit).hit()
+			fev.crawl(self,relative_body,range.start_bound(),range.end_bound()).hit()
 		})
 	}
-	pub fn predict_collision_out(&self,relative_body:&Body,Range{start:start_time,end:time_limit}:Range<Time>)->Option<(MinkowskiFace,GigaTime)>{
-		//create an extrapolated body at time_limit
-		let infinity_body=-relative_body.clone();
-		self.closest_fev_not_inside(infinity_body,-time_limit).and_then(|fev|{
+	pub fn predict_collision_out(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
+		let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
+		// swap and negate bounds to do a time inversion
+		let (lower_bound,upper_bound)=(upper_bound.map(|&t|-t),lower_bound.map(|&t|-t));
+		let infinity_body=-relative_body;
+		self.closest_fev_not_inside(infinity_body,lower_bound.as_ref()).and_then(|fev|{
 			//continue backwards along the body parabola
-			fev.crawl(self,&infinity_body,-time_limit,-start_time).hit()
+			fev.crawl(self,&infinity_body,lower_bound.as_ref(),upper_bound.as_ref()).hit()
 				//no need to test -time<time_limit because of the first step
 				.map(|(face,time)|(face,-time))
 		})
 	}
-	pub fn predict_collision_face_out(&self,relative_body:&Body,Range{start:start_time,end:time_limit}:Range<Time>,contact_face_id:MinkowskiFace)->Option<(MinkowskiEdge,GigaTime)>{
+	pub fn predict_collision_face_out(&self,relative_body:&Body,range:impl RangeBounds<Time>,contact_face_id:MinkowskiFace)->Option<(MinkowskiDirectedEdge,GigaTime)>{
+		// TODO: make better
+		use crate::face_crawler::{low,upp};
 		//no algorithm needed, there is only one state and two cases (Edge,None)
 		//determine when it passes an edge ("sliding off" case)
-		let start_time={
-			let r=(start_time-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={
-			let r=(time_limit-relative_body.time).to_ratio();
-			Ratio::new(r.num.fix_4(),r.den.fix_4())
-		};
+		});
+		let mut best_time=range.end_bound().map(|&t|into_giga_time(t,relative_body.time));
 		let mut best_edge=None;
 		let face_n=self.face_nd(contact_face_id).0;
-		for &directed_edge_id in self.face_edges(contact_face_id).iter(){
+		for &directed_edge_id in self.face_edges(contact_face_id).as_ref(){
 			let edge_n=self.directed_edge_n(directed_edge_id);
 			//f x e points in
 			let n=face_n.cross(edge_n);
-			let verts=self.edge_verts(directed_edge_id.as_undirected());
-			let d=n.dot(self.vert(verts[0])+self.vert(verts[1]));
+			let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
+			let d=n.dot(self.vert(v0)+self.vert(v1));
 			//WARNING! d outside of *2
 			//WARNING: truncated precision
-			for dt in Fixed::<4,128>::zeroes2(((n.dot(relative_body.position))*2-d).fix_4(),n.dot(relative_body.velocity).fix_4()*2,n.dot(relative_body.acceleration).fix_4()){
-				if start_time.le_ratio(dt)&&dt.lt_ratio(best_time)&&n.dot(relative_body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
-					best_time=dt;
-					best_edge=Some(directed_edge_id);
+			//wrap for speed
+			for dt in Fixed::<4,128>::zeroes2(((n.dot(relative_body.position))*2-d).wrap_4(),n.dot(relative_body.velocity).wrap_4()*2,n.dot(relative_body.acceleration).wrap_4()){
+				if low(&start_time,&dt)&&upp(&dt,&best_time)&&n.dot(relative_body.extrapolated_velocity_ratio_dt(dt)).is_negative(){
+					best_time=Bound::Included(dt);
+					best_edge=Some((directed_edge_id,dt));
 					break;
 				}
 			}
 		}
-		best_edge.map(|e|(e.as_undirected(),best_time))
+		best_edge
 	}
 	fn infinity_in(&self,infinity_body:Body)->Option<(MinkowskiFace,GigaTime)>{
 		let infinity_fev=self.infinity_fev(-infinity_body.velocity,infinity_body.position);
-		infinity_fev.crawl(self,&infinity_body,Time::MIN/4,infinity_body.time).hit()
+		// Bound::Included means that the surface of the mesh is included in the mesh
+		infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,Bound::Included(&infinity_body.time)).hit()
 	}
 	pub fn is_point_in_mesh(&self,point:Planar64Vec3)->bool{
 		let infinity_body=Body::new(point,vec3::Y,vec3::ZERO,Time::ZERO);
@@ -811,12 +838,12 @@ impl MeshQuery for MinkowskiMesh<'_>{
 			MinkowskiFace::EdgeEdge(e0,e1,parity)=>{
 				let edge0_n=self.mesh0.edge_n(e0);
 				let edge1_n=self.mesh1.edge_n(e1);
-				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).borrow();
-				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).borrow();
+				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).as_ref();
+				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).as_ref();
 				let n=edge0_n.cross(edge1_n);
 				let e0d=n.dot(self.mesh0.vert(e0v0)+self.mesh0.vert(e0v1));
 				let e1d=n.dot(self.mesh1.vert(e1v0)+self.mesh1.vert(e1v1));
-				((n*(parity as i64*4-2)).fix_3(),((e0d-e1d)*(parity as i64*2-1)).fix_4())
+				((n*(parity as i64*4-2)).widen_3(),((e0d-e1d)*(parity as i64*2-1)).widen_4())
 			},
 			MinkowskiFace::FaceVert(f0,v1)=>{
 				let (n,d)=self.mesh0.face_nd(f0);
@@ -831,44 +858,44 @@ impl MeshQuery for MinkowskiMesh<'_>{
 			},
 		}
 	}
-	fn face_edges(&self,face_id:MinkowskiFace)->Cow<[MinkowskiDirectedEdge]>{
+	fn face_edges(&self,face_id:MinkowskiFace)->impl AsRef<[MinkowskiDirectedEdge]>{
 		match face_id{
 			MinkowskiFace::VertFace(v0,f1)=>{
-				Cow::Owned(self.mesh1.face_edges(f1).iter().map(|&edge_id1|{
+				self.mesh1.face_edges(f1).as_ref().iter().map(|&edge_id1|
 					MinkowskiDirectedEdge::VertEdge(v0,edge_id1.reverse())
-				}).collect())
+				).collect()
 			},
 			MinkowskiFace::EdgeEdge(e0,e1,parity)=>{
-				let e0v=self.mesh0.edge_verts(e0);
-				let e1v=self.mesh1.edge_verts(e1);
+				let &[e0v0,e0v1]=self.mesh0.edge_verts(e0).as_ref();
+				let &[e1v0,e1v1]=self.mesh1.edge_verts(e1).as_ref();
 				//could sort this if ordered edges are needed
 				//probably just need to reverse this list according to parity
-				Cow::Owned(vec![
-					MinkowskiDirectedEdge::VertEdge(e0v[0],e1.as_directed(parity)),
-					MinkowskiDirectedEdge::EdgeVert(e0.as_directed(!parity),e1v[0]),
-					MinkowskiDirectedEdge::VertEdge(e0v[1],e1.as_directed(!parity)),
-					MinkowskiDirectedEdge::EdgeVert(e0.as_directed(parity),e1v[1]),
-				])
+				vec![
+					MinkowskiDirectedEdge::VertEdge(e0v0,e1.as_directed(parity)),
+					MinkowskiDirectedEdge::EdgeVert(e0.as_directed(!parity),e1v0),
+					MinkowskiDirectedEdge::VertEdge(e0v1,e1.as_directed(!parity)),
+					MinkowskiDirectedEdge::EdgeVert(e0.as_directed(parity),e1v1),
+				]
 			},
 			MinkowskiFace::FaceVert(f0,v1)=>{
-				Cow::Owned(self.mesh0.face_edges(f0).iter().map(|&edge_id0|{
+				self.mesh0.face_edges(f0).as_ref().iter().map(|&edge_id0|
 					MinkowskiDirectedEdge::EdgeVert(edge_id0,v1)
-				}).collect())
+				).collect()
 			},
 		}
 	}
-	fn edge_faces(&self,edge_id:MinkowskiEdge)->Cow<[MinkowskiFace;2]>{
+	fn edge_faces(&self,edge_id:MinkowskiEdge)->impl AsRef<[MinkowskiFace;2]>{
 		match edge_id{
 			MinkowskiEdge::VertEdge(v0,e1)=>{
 				//faces are listed backwards from the minkowski mesh
 				let v0e=self.mesh0.vert_edges(v0);
-				let &[e1f0,e1f1]=self.mesh1.edge_faces(e1).borrow();
-				Cow::Owned([(e1f1,false),(e1f0,true)].map(|(edge_face_id1,face_parity)|{
+				let &[e1f0,e1f1]=self.mesh1.edge_faces(e1).as_ref();
+				AsRefHelper([(e1f1,false),(e1f0,true)].map(|(edge_face_id1,face_parity)|{
 					let mut best_edge=None;
 					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
 					let edge_face1_n=self.mesh1.face_nd(edge_face_id1).0;
 					let edge_face1_nn=edge_face1_n.dot(edge_face1_n);
-					for &directed_edge_id0 in v0e.iter(){
+					for &directed_edge_id0 in v0e.as_ref(){
 						let edge0_n=self.mesh0.directed_edge_n(directed_edge_id0);
 						//must be behind other face.
 						let d=edge_face1_n.dot(edge0_n);
@@ -892,13 +919,13 @@ impl MeshQuery for MinkowskiMesh<'_>{
 			MinkowskiEdge::EdgeVert(e0,v1)=>{
 				//tracking index with an external variable because .enumerate() is not available
 				let v1e=self.mesh1.vert_edges(v1);
-				let &[e0f0,e0f1]=self.mesh0.edge_faces(e0).borrow();
-				Cow::Owned([(e0f0,true),(e0f1,false)].map(|(edge_face_id0,face_parity)|{
+				let &[e0f0,e0f1]=self.mesh0.edge_faces(e0).as_ref();
+				AsRefHelper([(e0f0,true),(e0f1,false)].map(|(edge_face_id0,face_parity)|{
 					let mut best_edge=None;
 					let mut best_d:Ratio<Fixed<8,256>,Fixed<8,256>>=Ratio::new(Fixed::ZERO,Fixed::ONE);
 					let edge_face0_n=self.mesh0.face_nd(edge_face_id0).0;
 					let edge_face0_nn=edge_face0_n.dot(edge_face0_n);
-					for &directed_edge_id1 in v1e.iter(){
+					for &directed_edge_id1 in v1e.as_ref(){
 						let edge1_n=self.mesh1.directed_edge_n(directed_edge_id1);
 						let d=edge_face0_n.dot(edge1_n);
 						if d.is_negative(){
@@ -918,68 +945,73 @@ impl MeshQuery for MinkowskiMesh<'_>{
 			},
 		}
 	}
-	fn edge_verts(&self,edge_id:MinkowskiEdge)->Cow<[MinkowskiVert;2]>{
-		match edge_id{
-			MinkowskiEdge::VertEdge(v0,e1)=>{
-				Cow::Owned(self.mesh1.edge_verts(e1).map(|vert_id1|{
-					MinkowskiVert::VertVert(v0,vert_id1)
-				}))
-			},
-			MinkowskiEdge::EdgeVert(e0,v1)=>{
-				Cow::Owned(self.mesh0.edge_verts(e0).map(|vert_id0|{
-					MinkowskiVert::VertVert(vert_id0,v1)
-				}))
-			},
-		}
+	fn edge_verts(&self,edge_id:MinkowskiEdge)->impl AsRef<[MinkowskiVert;2]>{
+		AsRefHelper(match edge_id{
+			MinkowskiEdge::VertEdge(v0,e1)=>self.mesh1.edge_verts(e1).as_ref().map(|vert_id1|
+				MinkowskiVert::VertVert(v0,vert_id1)
+			),
+			MinkowskiEdge::EdgeVert(e0,v1)=>self.mesh0.edge_verts(e0).as_ref().map(|vert_id0|
+				MinkowskiVert::VertVert(vert_id0,v1)
+			),
+		})
 	}
-	fn vert_edges(&self,vert_id:MinkowskiVert)->Cow<[MinkowskiDirectedEdge]>{
+	fn vert_edges(&self,vert_id:MinkowskiVert)->impl AsRef<[MinkowskiDirectedEdge]>{
 		match vert_id{
 			MinkowskiVert::VertVert(v0,v1)=>{
 				let mut edges=Vec::new();
 				//detect shared volume when the other mesh is mirrored along a test edge dir
-				let v0f=self.mesh0.vert_faces(v0);
-				let v1f=self.mesh1.vert_faces(v1);
+				let v0f_thing=self.mesh0.vert_faces(v0);
+				let v1f_thing=self.mesh1.vert_faces(v1);
+				let v0f=v0f_thing.as_ref();
+				let v1f=v1f_thing.as_ref();
 				let v0f_n:Vec<_>=v0f.iter().map(|&face_id|self.mesh0.face_nd(face_id).0).collect();
 				let v1f_n:Vec<_>=v1f.iter().map(|&face_id|self.mesh1.face_nd(face_id).0).collect();
-				let the_len=v0f.len()+v1f.len();
-				for &directed_edge_id in self.mesh0.vert_edges(v0).iter(){
+				// scratch vector
+				let mut face_normals=Vec::with_capacity(v0f.len()+v1f.len());
+				face_normals.clone_from(&v0f_n);
+				for &directed_edge_id in self.mesh0.vert_edges(v0).as_ref(){
 					let n=self.mesh0.directed_edge_n(directed_edge_id);
 					let nn=n.dot(n);
 					// TODO: there's gotta be a better way to do this
-					//make a set of faces
-					let mut face_normals=Vec::with_capacity(the_len);
-					//add mesh0 faces as-is
-					face_normals.clone_from(&v0f_n);
+					// drop faces beyond v0f_n
+					face_normals.truncate(v0f.len());
+					// make a set of faces from mesh0's perspective
 					for face_n in &v1f_n{
 						//add reflected mesh1 faces
-						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().fix_3());
+						//wrap for speed
+						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
 					}
-					if is_empty_volume(face_normals){
+					if is_empty_volume(&face_normals){
 						edges.push(MinkowskiDirectedEdge::EdgeVert(directed_edge_id,v1));
 					}
 				}
-				for &directed_edge_id in self.mesh1.vert_edges(v1).iter(){
+				face_normals.clone_from(&v1f_n);
+				for &directed_edge_id in self.mesh1.vert_edges(v1).as_ref(){
 					let n=self.mesh1.directed_edge_n(directed_edge_id);
 					let nn=n.dot(n);
-					let mut face_normals=Vec::with_capacity(the_len);
-					face_normals.clone_from(&v1f_n);
+					// drop faces beyond v1f_n
+					face_normals.truncate(v1f.len());
+					// make a set of faces from mesh1's perspective
 					for face_n in &v0f_n{
-						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().fix_3());
+						//wrap for speed
+						face_normals.push(*face_n-(n*face_n.dot(n)*2/nn).divide().wrap_3());
 					}
-					if is_empty_volume(face_normals){
+					if is_empty_volume(&face_normals){
 						edges.push(MinkowskiDirectedEdge::VertEdge(v0,directed_edge_id));
 					}
 				}
-				Cow::Owned(edges)
+				edges
 			},
 		}
 	}
-	fn vert_faces(&self,_vert_id:MinkowskiVert)->Cow<[MinkowskiFace]>{
-		unimplemented!()
+	fn vert_faces(&self,_vert_id:MinkowskiVert)->impl AsRef<[MinkowskiFace]>{
+		unimplemented!();
+		#[expect(unreachable_code)]
+		Vec::new()
 	}
 }
 
-fn is_empty_volume(normals:Vec<Vector3<Fixed<3,96>>>)->bool{
+fn is_empty_volume(normals:&[Vector3<Fixed<3,96>>])->bool{
 	let len=normals.len();
 	for i in 0..len-1{
 		for j in i+1..len{
@@ -1005,6 +1037,6 @@ fn is_empty_volume(normals:Vec<Vector3<Fixed<3,96>>>)->bool{
 
 #[test]
 fn test_is_empty_volume(){
-	assert!(!is_empty_volume([vec3::X.fix_3(),vec3::Y.fix_3(),vec3::Z.fix_3()].to_vec()));
-	assert!(is_empty_volume([vec3::X.fix_3(),vec3::Y.fix_3(),vec3::Z.fix_3(),vec3::NEG_X.fix_3()].to_vec()));
+	assert!(!is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3()]));
+	assert!(is_empty_volume(&[vec3::X.widen_3(),vec3::Y.widen_3(),vec3::Z.widen_3(),vec3::NEG_X.widen_3()]));
 }

engine/physics/src/physics.rs

@@ -28,6 +28,7 @@ pub enum InternalInstruction{
 	CollisionStart(Collision,model_physics::GigaTime),
 	CollisionEnd(Collision,model_physics::GigaTime),
 	StrafeTick,
+	// TODO: add GigaTime to ReachWalkTargetVelocity
 	ReachWalkTargetVelocity,
 	// Water,
 }
@@ -100,6 +101,7 @@ enum TransientAcceleration{
 		time:Time,
 	},
 	//walk target will never be reached
+	#[expect(dead_code)]
 	Unreachable{
 		acceleration:Planar64Vec3,
 	}
@@ -107,6 +109,7 @@ enum TransientAcceleration{
 #[derive(Clone,Debug)]
 struct ContactMoveState{
 	jump_direction:JumpDirection,
+	// TODO: this is bad data normalization, remove this
 	contact:ContactCollision,
 	target:TransientAcceleration,
 }
@@ -117,8 +120,8 @@ impl TransientAcceleration{
 		}else{
 			//normal friction acceleration is clippedAcceleration.dot(normal)*friction
 			TransientAcceleration::Reachable{
-				acceleration:target_diff.with_length(accel).divide().fix_1(),
-				time:time+Time::from((target_diff.length()/accel).divide().fix_1())
+				acceleration:target_diff.with_length(accel).divide().wrap_1(),
+				time:time+Time::from((target_diff.length()/accel).divide().clamp_1())
 			}
 		}
 	}
@@ -183,6 +186,7 @@ struct PhysicsModels{
 	intersect_attributes:HashMap<IntersectAttributesId,gameplay_attributes::IntersectAttributes>,
 }
 impl PhysicsModels{
+	#[expect(dead_code)]
 	fn clear(&mut self){
 		self.meshes.clear();
 		self.contact_models.clear();
@@ -190,7 +194,7 @@ impl PhysicsModels{
 		self.contact_attributes.clear();
 		self.intersect_attributes.clear();
 	}
-	fn mesh(&self,convex_mesh_id:ConvexMeshId)->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];
@@ -207,14 +211,14 @@ 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,contact:&ContactCollision)->TransformedMesh{
+	fn contact_mesh(&self,contact:&ContactCollision)->TransformedMesh<'_>{
 		let model=&self.contact_models[&contact.model_id];
 		TransformedMesh::new(
 			self.meshes[&model.mesh_id].submesh_view(contact.submesh_id),
 			&model.transform
 		)
 	}
-	fn intersect_mesh(&self,intersect:&IntersectCollision)->TransformedMesh{
+	fn intersect_mesh(&self,intersect:&IntersectCollision)->TransformedMesh<'_>{
 		let model=&self.intersect_models[&intersect.model_id];
 		TransformedMesh::new(
 			self.meshes[&model.mesh_id].submesh_view(intersect.submesh_id),
@@ -283,6 +287,7 @@ impl PhysicsCamera{
 	fn rotation(&self)->Planar64Mat3{
 		self.get_rotation(self.clamped_mouse_pos)
 	}
+	#[expect(dead_code)]
 	fn simulate_move_rotation(&self,mouse_delta:glam::IVec2)->Planar64Mat3{
 		self.get_rotation(self.clamped_mouse_pos+mouse_delta)
 	}
@@ -350,6 +355,7 @@ mod gameplay{
 		pub fn unordered_checkpoint_count(&self)->u32{
 			self.unordered_checkpoints.len() as u32
 		}
+		#[expect(dead_code)]
 		pub fn set_mode_id(&mut self,mode_id:gameplay_modes::ModeId){
 			self.clear();
 			self.mode_id=mode_id;
@@ -407,7 +413,7 @@ impl HitboxMesh{
 		let transform=PhysicsMeshTransform::new(transform);
 		let transformed_mesh=TransformedMesh::new(mesh.complete_mesh_view(),&transform);
 		for vert in transformed_mesh.verts(){
-			aabb.grow(vert.fix_1());
+			aabb.grow(vert.narrow_1().unwrap());
 		}
 		Self{
 			halfsize:aabb.size()>>1,
@@ -416,7 +422,7 @@ impl HitboxMesh{
 		}
 	}
 	#[inline]
-	const fn transformed_mesh(&self)->TransformedMesh{
+	fn transformed_mesh(&self)->TransformedMesh<'_>{
 		TransformedMesh::new(self.mesh.complete_mesh_view(),&self.transform)
 	}
 }
@@ -460,12 +466,12 @@ impl StyleHelper for StyleModifiers{
 	}
 
 	fn get_y_control_dir(&self,camera:&PhysicsCamera,controls:Controls)->Planar64Vec3{
-		(camera.rotation_y()*self.get_control_dir(controls)).fix_1()
+		(camera.rotation_y()*self.get_control_dir(controls)).wrap_1()
 	}
 
 	fn get_propulsion_control_dir(&self,camera:&PhysicsCamera,controls:Controls)->Planar64Vec3{
 		//don't interpolate this! discrete mouse movement, constant acceleration
-		(camera.rotation()*self.get_control_dir(controls)).fix_1()
+		(camera.rotation()*self.get_control_dir(controls)).wrap_1()
 	}
 	fn calculate_mesh(&self)->HitboxMesh{
 		let mesh=match self.hitbox.mesh{
@@ -484,6 +490,7 @@ enum MoveState{
 	Air,
 	Walk(ContactMoveState),
 	Ladder(ContactMoveState),
+	#[expect(dead_code)]
 	Water,
 	Fly,
 }
@@ -601,12 +608,17 @@ impl MoveState{
 	fn cull_velocity(&mut self,velocity:Planar64Vec3,body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
 		//TODO: be more precise about contacts
 		if set_velocity_cull(body,touching,models,hitbox_mesh,velocity){
-			//TODO do better
+			// TODO do better
+			// TODO: unduplicate this code
 			match self.get_walk_state(){
-				//did you stop touching the thing you were walking on?
+				// did you stop touching the thing you were walking on?
 				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
+					self.apply_enum_and_input_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
 				},
+				// not walking, but stopped touching something
 				None=>self.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state),
 			}
 		}
@@ -857,6 +869,12 @@ impl Default for PhysicsState{
 }
 
 impl PhysicsState{
+	pub fn new_with_body(body:Body)->Self{
+		Self{
+			body,
+			..Self::default()
+		}
+	}
 	pub fn camera_body(&self)->Body{
 		Body{
 			position:self.body.position+self.style.camera_offset,
@@ -982,7 +1000,7 @@ impl PhysicsContext<'_>{
 impl PhysicsData{
 	/// use with caution, this is the only non-instruction way to mess with physics
 	pub fn generate_models(&mut self,map:&map::CompleteMap){
-		let mut modes=map.modes.clone().denormalize();
+		let modes=map.modes.clone().denormalize();
 		let mut used_contact_attributes=Vec::new();
 		let mut used_intersect_attributes=Vec::new();
 
@@ -1000,31 +1018,30 @@ impl PhysicsData{
 		let mut used_meshes=Vec::new();
 		let mut physics_mesh_id_from_model_mesh_id=HashMap::<MeshId,PhysicsMeshId>::new();
 		for (model_id,model) in map.models.iter().enumerate(){
-			//TODO: use .entry().or_insert_with(||{
-			let attr_id=if let Some(&attr_id)=physics_attr_id_from_model_attr_id.get(&model.attributes){
-				attr_id
-			}else{
-				//check if it's real
-				match map.attributes.get(model.attributes.get() as usize).and_then(|m_attr|{
-					PhysicsCollisionAttributes::try_from(m_attr).map_or(None,|p_attr|{
-						let attr_id=match p_attr{
-							PhysicsCollisionAttributes::Contact(attr)=>{
-								let attr_id=ContactAttributesId::new(used_contact_attributes.len() as u32);
-								used_contact_attributes.push(attr);
-								PhysicsAttributesId::Contact(attr_id)
-							},
-							PhysicsCollisionAttributes::Intersect(attr)=>{
-								let attr_id=IntersectAttributesId::new(used_intersect_attributes.len() as u32);
-								used_intersect_attributes.push(attr);
-								PhysicsAttributesId::Intersect(attr_id)
-							},
-						};
-						physics_attr_id_from_model_attr_id.insert(model.attributes,attr_id);
-						Some(attr_id)
-					})
-				}){
-					Some(attr_id)=>attr_id,
-					None=>continue,
+			let attr_id=match physics_attr_id_from_model_attr_id.entry(model.attributes){
+				std::collections::hash_map::Entry::Occupied(entry)=>*entry.get(),
+				std::collections::hash_map::Entry::Vacant(entry)=>{
+					//check if it's real
+					match map.attributes.get(model.attributes.get() as usize).and_then(|m_attr|{
+						PhysicsCollisionAttributes::try_from(m_attr).map_or(None,|p_attr|{
+							let attr_id=match p_attr{
+								PhysicsCollisionAttributes::Contact(attr)=>{
+									let attr_id=ContactAttributesId::new(used_contact_attributes.len() as u32);
+									used_contact_attributes.push(attr);
+									PhysicsAttributesId::Contact(attr_id)
+								},
+								PhysicsCollisionAttributes::Intersect(attr)=>{
+									let attr_id=IntersectAttributesId::new(used_intersect_attributes.len() as u32);
+									used_intersect_attributes.push(attr);
+									PhysicsAttributesId::Intersect(attr_id)
+								},
+							};
+							Some(*entry.insert(attr_id))
+						})
+					}){
+						Some(attr_id)=>attr_id,
+						None=>continue,
+					}
 				}
 			};
 			let mesh_id=if let Some(&mesh_id)=physics_mesh_id_from_model_mesh_id.get(&model.mesh){
@@ -1084,7 +1101,7 @@ impl PhysicsData{
 				let mut aabb=aabb::Aabb::default();
 				let transformed_mesh=TransformedMesh::new(view,transform);
 				for v in transformed_mesh.verts(){
-					aabb.grow(v.fix_1());
+					aabb.grow(v.narrow_1().unwrap());
 				}
 				(ConvexMeshId{
 					model_id,
@@ -1119,10 +1136,11 @@ impl PhysicsData{
 
 	//this is the one who asks
 	fn next_instruction_internal(state:&PhysicsState,data:&PhysicsData,time_limit:Time)->Option<TimedInstruction<InternalInstruction,Time>>{
+		println!("==== next_instruction_internal ====");
 		//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);
@@ -1134,6 +1152,7 @@ impl PhysicsData{
 		//let relative_body=state.body.relative_to(&Body::ZERO);
 		let relative_body=&state.body;
 		data.bvh.sample_aabb(&aabb,&mut |&convex_mesh_id|{
+			println!("Sampling object id={:?}",convex_mesh_id.model_id);
 			//no checks are needed because of the time limits.
 			let model_mesh=data.models.mesh(convex_mesh_id);
 			let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,data.hitbox_mesh.transformed_mesh());
@@ -1162,7 +1181,8 @@ fn contact_normal(models:&PhysicsModels,hitbox_mesh:&HitboxMesh,contact:&Contact
 	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
-	minkowski.face_nd(contact.face_id).0.fix_1()
+	// wrap for speed
+	minkowski.face_nd(contact.face_id).0.wrap_1()
 }
 
 fn recalculate_touching(
@@ -1187,7 +1207,7 @@ fn recalculate_touching(
 		collision_end_contact(move_state,body,touching,models,hitbox_mesh,style,camera,input_state,models.contact_attr(contact.model_id),contact)
 	}
 	while let Some(&intersect)=touching.intersects.iter().next(){
-		collision_end_intersect(touching,mode,run,models.intersect_attr(intersect.model_id),intersect,time);
+		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();
@@ -1248,6 +1268,7 @@ fn set_velocity_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsM
 		let n=contact_normal(models,hitbox_mesh,contact);
 		let r=n.dot(v).is_positive();
 		if r{
+			println!("culled {:?}",contact.model_id);
 			culled=true;
 		}
 		!r
@@ -1258,6 +1279,7 @@ fn set_velocity_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsM
 fn set_velocity(body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,v:Planar64Vec3){
 	body.velocity=touching.constrain_velocity(models,hitbox_mesh,v);
 }
+#[expect(dead_code)]
 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;
@@ -1321,7 +1343,7 @@ fn teleport_to_spawn(
 	const EPSILON:Planar64=Planar64::raw((1<<32)/16);
 	let transform=models.get_model_transform(spawn_model_id).ok_or(TeleportToSpawnError::NoModel)?;
 	//TODO: transform.vertex.matrix3.col(1)+transform.vertex.translation
-	let point=transform.vertex.transform_point3(vec3::Y).fix_1()+Planar64Vec3::new([Planar64::ZERO,style.hitbox.halfsize.y+EPSILON,Planar64::ZERO]);
+	let point=transform.vertex.transform_point3(vec3::Y).clamp_1()+Planar64Vec3::new([Planar64::ZERO,style.hitbox.halfsize.y+EPSILON,Planar64::ZERO]);
 	teleport(point,move_state,body,touching,run,mode_state,Some(mode),models,hitbox_mesh,bvh,style,camera,input_state,time);
 	Ok(())
 }
@@ -1485,7 +1507,7 @@ fn collision_start_contact(
 		Some(gameplay_attributes::ContactingBehaviour::Surf)=>(),
 		Some(gameplay_attributes::ContactingBehaviour::Cling)=>println!("Unimplemented!"),
 		&Some(gameplay_attributes::ContactingBehaviour::Elastic(elasticity))=>{
-			let reflected_velocity=body.velocity+((body.velocity-incident_velocity)*Planar64::raw(elasticity as i64+1)).fix_1();
+			let reflected_velocity=body.velocity+((body.velocity-incident_velocity)*Planar64::raw(elasticity as i64+1)).wrap_1();
 			set_velocity(body,touching,models,hitbox_mesh,reflected_velocity);
 		},
 		Some(gameplay_attributes::ContactingBehaviour::Ladder(contacting_ladder))=>
@@ -1599,6 +1621,7 @@ fn collision_start_intersect(
 			None=>(),
 		}
 	}
+	move_state.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
 	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);
 }
 
@@ -1614,20 +1637,32 @@ fn collision_end_contact(
 	_attr:&gameplay_attributes::ContactAttributes,
 	contact:ContactCollision,
 ){
+	println!("collision_end {:?}",contact.model_id);
 	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?
+		// did you stop touching the thing you were walking on?
 		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
+			move_state.apply_enum_and_input_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
 		},
+		// not walking, but stopped touching something
 		None=>move_state.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state),
 	}
 }
 fn collision_end_intersect(
+	move_state:&mut MoveState,
+	body:&mut Body,
 	touching:&mut TouchingState,
+	models:&PhysicsModels,
+	hitbox_mesh:&HitboxMesh,
+	style:&StyleModifiers,
+	camera:&PhysicsCamera,
+	input_state:&InputState,
 	mode:Option<&gameplay_modes::Mode>,
 	run:&mut run::Run,
 	_attr:&gameplay_attributes::IntersectAttributes,
@@ -1635,6 +1670,7 @@ fn collision_end_intersect(
 	time:Time,
 ){
 	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(intersect.model_id.into());
 		match zone{
@@ -1649,18 +1685,16 @@ fn collision_end_intersect(
 	}
 }
 fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedInstruction<InternalInstruction,Time>){
+	println!("\n==== atomic_internal_instruction ====");
 	state.time=ins.time;
-	let (should_advance_body,goober_time)=match ins.instruction{
+	match ins.instruction{
+		// collisions advance the body precisely
 		InternalInstruction::CollisionStart(_,dt)
-		|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),
-		}
+		|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=>(),
 	}
 		match ins.instruction{
 			InternalInstruction::CollisionStart(collision,_)=>{
@@ -1691,7 +1725,7 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
 					contact
 				),
 				Collision::Intersect(intersect)=>collision_end_intersect(
-					&mut state.touching,
+					&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.model_id),
@@ -1707,8 +1741,10 @@ 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().fix_1()){
+							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
 								//need to note which push planes activate in push solve and keep those
 								state.cull_velocity(data,ticked_velocity);
@@ -1901,7 +1937,7 @@ mod test{
 		assert_eq!(collision.map(|tup|relative_body.time+tup.1.into()),expected_collision_time,"Incorrect time of collision");
 	}
 	fn test_collision(relative_body:Body,expected_collision_time:Option<Time>){
-		test_collision_axis_aligned(relative_body.clone(),expected_collision_time);
+		test_collision_axis_aligned(relative_body,expected_collision_time);
 		test_collision_rotated(relative_body,expected_collision_time);
 	}
 	#[test]
@@ -1914,6 +1950,15 @@ mod test{
 		),Some(Time::from_secs(2)));
 	}
 	#[test]
+	fn test_collision_small_mv(){
+		test_collision(Body::new(
+			int3(0,5,0),
+			int3(0,-1,0)+(vec3::X>>32),
+			vec3::ZERO,
+			Time::ZERO
+		),Some(Time::from_secs(2)));
+	}
+	#[test]
 	fn test_collision_degenerate_east(){
 		test_collision(Body::new(
 			int3(3,5,0),

engine/physics/src/push_solve.rs

@@ -152,18 +152,19 @@ const fn get_push_ray_0(point:Planar64Vec3)->Ray{
 	Ray{origin:point,direction:vec3::ZERO}
 }
 fn get_push_ray_1(point:Planar64Vec3,c0:&Contact)->Option<Ray>{
-	let direction=solve1(c0)?.divide().fix_1();
+	//wrap for speed
+	let direction=solve1(c0)?.divide().wrap_1();
 	let [s0]=decompose1(direction,c0.velocity)?;
 	if s0.lt_ratio(RATIO_ZERO){
 		return None;
 	}
 	let origin=point+solve1(
 		&c0.relative_to(point),
-	)?.divide().fix_1();
+	)?.divide().wrap_1();
 	Some(Ray{origin,direction})
 }
 fn get_push_ray_2(point:Planar64Vec3,c0:&Contact,c1:&Contact)->Option<Ray>{
-	let direction=solve2(c0,c1)?.divide().fix_1();
+	let direction=solve2(c0,c1)?.divide().wrap_1();
 	let [s0,s1]=decompose2(direction,c0.velocity,c1.velocity)?;
 	if s0.lt_ratio(RATIO_ZERO)||s1.lt_ratio(RATIO_ZERO){
 		return None;
@@ -171,11 +172,11 @@ fn get_push_ray_2(point:Planar64Vec3,c0:&Contact,c1:&Contact)->Option<Ray>{
 	let origin=point+solve2(
 		&c0.relative_to(point),
 		&c1.relative_to(point),
-	)?.divide().fix_1();
+	)?.divide().wrap_1();
 	Some(Ray{origin,direction})
 }
 fn get_push_ray_3(point:Planar64Vec3,c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ray>{
-	let direction=solve3(c0,c1,c2)?.divide().fix_1();
+	let direction=solve3(c0,c1,c2)?.divide().wrap_1();
 	let [s0,s1,s2]=decompose3(direction,c0.velocity,c1.velocity,c2.velocity)?;
 	if s0.lt_ratio(RATIO_ZERO)||s1.lt_ratio(RATIO_ZERO)||s2.lt_ratio(RATIO_ZERO){
 		return None;
@@ -184,14 +185,14 @@ fn get_push_ray_3(point:Planar64Vec3,c0:&Contact,c1:&Contact,c2:&Contact)->Optio
 		&c0.relative_to(point),
 		&c1.relative_to(point),
 		&c2.relative_to(point),
-	)?.divide().fix_1();
+	)?.divide().wrap_1();
 	Some(Ray{origin,direction})
 }
 
 const fn get_best_push_ray_and_conts_0<'a>(point:Planar64Vec3)->(Ray,Conts<'a>){
 	(get_push_ray_0(point),Conts::new_const())
 }
-fn get_best_push_ray_and_conts_1(point:Planar64Vec3,c0:&Contact)->Option<(Ray,Conts)>{
+fn get_best_push_ray_and_conts_1(point:Planar64Vec3,c0:&Contact)->Option<(Ray,Conts<'_>)>{
 	get_push_ray_1(point,c0)
 		.map(|ray|(ray,Conts::from_iter([c0])))
 }

integration-testing/.gitignore

@@ -0,0 +1 @@
+/test_files

integration-testing/src/error.rs

@@ -0,0 +1,28 @@
+#[expect(dead_code)]
+#[derive(Debug)]
+pub enum ReplayError{
+	IO(std::io::Error),
+	SNF(strafesnet_snf::Error),
+	SNFM(strafesnet_snf::map::Error),
+	SNFB(strafesnet_snf::bot::Error),
+}
+impl From<std::io::Error> for ReplayError{
+	fn from(value:std::io::Error)->Self{
+		Self::IO(value)
+	}
+}
+impl From<strafesnet_snf::Error> for ReplayError{
+	fn from(value:strafesnet_snf::Error)->Self{
+		Self::SNF(value)
+	}
+}
+impl From<strafesnet_snf::map::Error> for ReplayError{
+	fn from(value:strafesnet_snf::map::Error)->Self{
+		Self::SNFM(value)
+	}
+}
+impl From<strafesnet_snf::bot::Error> for ReplayError{
+	fn from(value:strafesnet_snf::bot::Error)->Self{
+		Self::SNFB(value)
+	}
+}

integration-testing/src/main.rs

@@ -1,47 +1,23 @@
+mod error;
+mod util;
+
+#[cfg(test)]
+mod tests;
 
-use std::io::Cursor;
-use std::path::Path;
 use std::time::Instant;
 
+use error::ReplayError;
+use util::read_entire_file;
 use strafesnet_physics::physics::{PhysicsData,PhysicsState,PhysicsContext};
 
 fn main(){
-	test_determinism().unwrap();
-}
-
-#[allow(unused)]
-#[derive(Debug)]
-enum ReplayError{
-	IO(std::io::Error),
-	SNF(strafesnet_snf::Error),
-	SNFM(strafesnet_snf::map::Error),
-	SNFB(strafesnet_snf::bot::Error),
-}
-impl From<std::io::Error> for ReplayError{
-	fn from(value:std::io::Error)->Self{
-		Self::IO(value)
+	let arg=std::env::args().skip(1).next();
+	match arg.as_deref(){
+		Some("determinism")|None=>test_determinism().unwrap(),
+		Some("replay")=>run_replay().unwrap(),
+		_=>println!("invalid argument"),
 	}
 }
-impl From<strafesnet_snf::Error> for ReplayError{
-	fn from(value:strafesnet_snf::Error)->Self{
-		Self::SNF(value)
-	}
-}
-impl From<strafesnet_snf::map::Error> for ReplayError{
-	fn from(value:strafesnet_snf::map::Error)->Self{
-		Self::SNFM(value)
-	}
-}
-impl From<strafesnet_snf::bot::Error> for ReplayError{
-	fn from(value:strafesnet_snf::bot::Error)->Self{
-		Self::SNFB(value)
-	}
-}
-
-fn read_entire_file(path:impl AsRef<Path>)->Result<Cursor<Vec<u8>>,std::io::Error>{
-	let data=std::fs::read(path)?;
-	Ok(Cursor::new(data))
-}
 
 fn run_replay()->Result<(),ReplayError>{
 	println!("loading map file..");

integration-testing/src/tests.rs

@@ -0,0 +1,78 @@
+use crate::error::ReplayError;
+use crate::util::read_entire_file;
+use strafesnet_physics::physics::{PhysicsData,PhysicsState,PhysicsContext};
+
+#[test]
+#[ignore]
+fn physics_bug_2()->Result<(),ReplayError>{
+	println!("loading map file..");
+	let data=read_entire_file("test_files/bhop_monster_jam.snfm")?;
+	let map=strafesnet_snf::read_map(data)?.into_complete_map()?;
+
+	// create recording
+	let mut physics_data=PhysicsData::default();
+	println!("generating models..");
+	physics_data.generate_models(&map);
+	println!("simulating...");
+
+	//teleport to bug
+	// body pos = Vector { array: [Fixed { bits: 554895163352 }, Fixed { bits: 1485633089990 }, Fixed { bits: 1279601007173 }] }
+	// after the fix it's still happening, possibly for a different reason, new position to evince:
+	// body pos = Vector { array: [Fixed { bits: 555690659654 }, Fixed { bits: 1490485868773 }, Fixed { bits: 1277783839382 }] }
+	use strafesnet_common::integer::{vec3,Time};
+	let body=strafesnet_physics::physics::Body::new(
+		vec3::raw_xyz(555690659654,1490485868773,1277783839382),
+		vec3::int(0,0,0),
+		vec3::int(0,-100,0),
+		Time::ZERO,
+	);
+	let mut physics=PhysicsState::new_with_body(body);
+	// wait one second to activate the bug
+	// hit=Some(ModelId(2262))
+	PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
+		time:strafesnet_common::integer::Time::from_millis(500),
+		instruction:strafesnet_common::physics::Instruction::Idle,
+	});
+
+	Ok(())
+}
+
+#[test]
+#[ignore]
+fn physics_bug_3()->Result<(),ReplayError>{
+	println!("loading map file..");
+	let data=read_entire_file("../tools/bhop_maps/5692152916.snfm")?;
+	let map=strafesnet_snf::read_map(data)?.into_complete_map()?;
+
+	// create recording
+	let mut physics_data=PhysicsData::default();
+	println!("generating models..");
+	physics_data.generate_models(&map);
+	println!("simulating...");
+
+	//teleport to bug
+	use strafesnet_common::integer::{vec3,Time};
+	let body=strafesnet_physics::physics::Body::new(
+		// bhop_toc corner position after wall hits
+		// vec3::raw_xyz(-1401734815424,3315081280280,-2466057177493),
+		// vec3::raw_xyz(0,-96915585363,1265),
+		// vec3::raw_xyz(0,-429496729600,0),
+		// alternate room center position
+		// vec3::raw_xyz(-1129043783837,3324870327882,-2014012350212),
+		// vec3::raw_xyz(0,-96915585363,1265),
+		// vec3::raw_xyz(0,-429496729600,0),
+		// corner setup before wall hits
+		vec3::raw_xyz(-1392580080675,3325402529458,-2444727738679),
+		vec3::raw_xyz(-30259028820,-22950929553,-71141663007),
+		vec3::raw_xyz(0,-429496729600,0),
+		Time::ZERO,
+	);
+	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:strafesnet_common::integer::Time::from_millis(500),
+		instruction:strafesnet_common::physics::Instruction::Idle,
+	});
+
+	Ok(())
+}

integration-testing/src/util.rs

@@ -0,0 +1,7 @@
+use std::io::Cursor;
+use std::path::Path;
+
+pub fn read_entire_file(path:impl AsRef<Path>)->Result<Cursor<Vec<u8>>,std::io::Error>{
+	let data=std::fs::read(path)?;
+	Ok(Cursor::new(data))
+}

lib/bsp_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_bsp_loader"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -11,9 +11,9 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 glam = "0.30.0"
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.0", path = "../deferred_loader", registry = "strafesnet" }
-vbsp = "0.8.0"
+strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
+strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
+vbsp = "0.9.1"
 vbsp-entities-css = "0.6.0"
 vmdl = "0.2.0"
 vpk = "0.3.0"

lib/bsp_loader/src/brush.rs

@@ -34,6 +34,7 @@ pub enum PlanesToFacesError{
 	InitFace2,
 	InitIntersection,
 	FindNewIntersection,
+	// Narrow(strafesnet_common::integer::NarrowError),
 	EmptyFaces,
 	InfiniteLoop1,
 	InfiniteLoop2,
@@ -81,12 +82,12 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 			// test if any *other* faces occlude the intersection
 			for new_face in &face_list{
 				// new face occludes intersection point
-				if (new_face.dot.fix_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
+				if (new_face.dot.widen_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
 					// replace one of the faces with the new face
 					// dont' try to replace face0 because we are exploring that face in particular
 					if let Some(new_intersection)=solve3(face0,new_face,face2){
 						// face1 does not occlude (or intersect) the new intersection
-						if (face1.dot.fix_2()/Planar64::ONE).gt_ratio(face1.normal.dot(new_intersection.num)/new_intersection.den){
+						if (face1.dot.widen_2()/Planar64::ONE).gt_ratio(face1.normal.dot(new_intersection.num)/new_intersection.den){
 							face1=new_face;
 							intersection=new_intersection;
 							continue 'find;
@@ -94,7 +95,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 					}
 					if let Some(new_intersection)=solve3(face0,face1,new_face){
 						// face2 does not occlude (or intersect) the new intersection
-						if (face2.dot.fix_2()/Planar64::ONE).gt_ratio(face2.normal.dot(new_intersection.num)/new_intersection.den){
+						if (face2.dot.widen_2()/Planar64::ONE).gt_ratio(face2.normal.dot(new_intersection.num)/new_intersection.den){
 							face2=new_face;
 							intersection=new_intersection;
 							continue 'find;
@@ -119,7 +120,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 				continue;
 			}
 			// new_face occludes intersection meaning intersection is not on convex solid and face0 is degenrate
-			if (new_face.dot.fix_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
+			if (new_face.dot.widen_2()/Planar64::ONE).lt_ratio(new_face.normal.dot(intersection.num)/intersection.den){
 				// abort! reject face0 entirely
 				continue 'face;
 			}
@@ -137,7 +138,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 		loop{
 			// push point onto vertices
 			// problem: this may push a vertex that does not fit in the fixed point range and is thus meaningless
-			face.push(intersection.divide().fix_1());
+			face.push(intersection.divide().narrow_1().unwrap());
 
 			// we looped back around to face1, we're done!
 			if core::ptr::eq(face1,face2){
@@ -186,7 +187,7 @@ fn planes_to_faces(face_list:std::collections::HashSet<Face>)->Result<Faces,Plan
 	}
 }
 
-#[allow(dead_code)]
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum BrushToMeshError{
 	SliceBrushSides,

lib/bsp_loader/src/bsp.rs

@@ -53,9 +53,9 @@ fn add_brush<'a>(
 		rendercolor.b as f32
 	])/255.0).extend(1.0);
 
-	match model.split_at(1){
+	match model.chars().next(){
 		// The first character of brush.model is '*'
-		("*",id_str)=>match id_str.parse(){
+		Some('*')=>match model[1..].parse(){
 			Ok(mesh_id)=>{
 				let mesh=model::MeshId::new(mesh_id);
 				world_models.push(
@@ -349,7 +349,7 @@ pub struct PartialMap1{
 impl PartialMap1{
 	pub fn add_prop_meshes<'a>(
 		self,
-		prop_meshes:Meshes,
+		prop_meshes:Meshes<model::Mesh>,
 	)->PartialMap2{
 		PartialMap2{
 			attributes:self.attributes,

lib/bsp_loader/src/loader.rs

@@ -5,7 +5,6 @@ use strafesnet_deferred_loader::{loader::Loader,texture::Texture};
 
 use crate::{Bsp,Vpk};
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum TextureError{
 	Io(std::io::Error),
@@ -22,17 +21,17 @@ impl From<std::io::Error> for TextureError{
 	}
 }
 
-pub struct TextureLoader<'a>(std::marker::PhantomData<&'a ()>);
-impl TextureLoader<'_>{
+pub struct TextureLoader;
+impl TextureLoader{
 	pub fn new()->Self{
-		Self(std::marker::PhantomData)
+		Self
 	}
 }
-impl<'a> Loader for TextureLoader<'a>{
+impl Loader for TextureLoader{
 	type Error=TextureError;
-	type Index=Cow<'a,str>;
+	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();
@@ -41,7 +40,6 @@ impl<'a> Loader for TextureLoader<'a>{
 	}
 }
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum MeshError{
 	Io(std::io::Error),
@@ -100,30 +98,24 @@ impl<'bsp,'vpk> BspFinder<'bsp,'vpk>{
 	}
 }
 
-pub struct ModelLoader<'bsp,'vpk,'a>{
+pub struct ModelLoader<'bsp,'vpk>{
 	finder:BspFinder<'bsp,'vpk>,
-	life:core::marker::PhantomData<&'a ()>,
 }
-impl ModelLoader<'_,'_,'_>{
+impl ModelLoader<'_,'_>{
 	#[inline]
-	pub const fn new<'bsp,'vpk,'a>(
+	pub const fn new<'bsp,'vpk>(
 		finder:BspFinder<'bsp,'vpk>,
-	)->ModelLoader<'bsp,'vpk,'a>{
+	)->ModelLoader<'bsp,'vpk>{
 		ModelLoader{
 			finder,
-			life:core::marker::PhantomData,
 		}
 	}
 }
-impl<'bsp,'vpk,'a> Loader for ModelLoader<'bsp,'vpk,'a>
-	where
-		'bsp:'a,
-		'vpk:'a,
-{
+impl<'bsp,'vpk> Loader for ModelLoader<'bsp,'vpk>{
 	type Error=MeshError;
-	type Index=&'a str;
+	type Index<'a>=&'a str where Self:'a;
 	type Resource=vmdl::Model;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
+	fn load<'a>(&'a mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
 		let mdl_path_lower=index.to_lowercase();
 		//.mdl, .vvd, .dx90.vtx
 		let path=std::path::PathBuf::from(mdl_path_lower.as_str());
@@ -143,31 +135,27 @@ impl<'bsp,'vpk,'a> Loader for ModelLoader<'bsp,'vpk,'a>
 	}
 }
 
-pub struct MeshLoader<'bsp,'vpk,'load,'a>{
+pub struct MeshLoader<'bsp,'vpk,'load,'str>{
 	finder:BspFinder<'bsp,'vpk>,
-	deferred_loader:&'load mut strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader<Cow<'a,str>>,
+	deferred_loader:&'load mut strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader<Cow<'str,str>>,
 }
 impl MeshLoader<'_,'_,'_,'_>{
 	#[inline]
-	pub const fn new<'bsp,'vpk,'load,'a>(
+	pub const fn new<'bsp,'vpk,'load,'str>(
 		finder:BspFinder<'bsp,'vpk>,
-		deferred_loader:&'load mut strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader<Cow<'a,str>>,
-	)->MeshLoader<'bsp,'vpk,'load,'a>{
+		deferred_loader:&'load mut strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader<Cow<'str,str>>,
+	)->MeshLoader<'bsp,'vpk,'load,'str>{
 		MeshLoader{
 			finder,
 			deferred_loader
 		}
 	}
 }
-impl<'bsp,'vpk,'load,'a> Loader for MeshLoader<'bsp,'vpk,'load,'a>
-	where
-		'bsp:'a,
-		'vpk:'a,
-{
+impl<'str,'bsp,'vpk,'load> Loader for MeshLoader<'bsp,'vpk,'load,'str>{
 	type Error=MeshError;
-	type Index=&'a str;
+	type Index<'a>=&'a str where Self:'a;
 	type Resource=Mesh;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
+	fn load<'a>(&'a mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
 		let model=ModelLoader::new(self.finder).load(index)?;
 		let mesh=crate::mesh::convert_mesh(model,&mut self.deferred_loader);
 		Ok(mesh)

lib/common/Cargo.toml

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

lib/common/src/gameplay_modes.rs

@@ -140,6 +140,15 @@ impl ModeId{
 	pub const MAIN:Self=Self(0);
 	pub const BONUS:Self=Self(1);
 }
+impl core::fmt::Display for ModeId{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->core::fmt::Result{
+		match self{
+			&Self::MAIN=>write!(f,"Main"),
+			&Self::BONUS=>write!(f,"Bonus"),
+			&Self(mode_id)=>write!(f,"Bonus{mode_id}"),
+		}
+	}
+}
 #[derive(Clone)]
 pub struct Mode{
 	style:gameplay_style::StyleModifiers,
@@ -440,11 +449,11 @@ impl ModesBuilder{
 		}
 		NormalizedModes::new(modes.into_iter().map(|mode_builder|NormalizedMode(mode_builder.mode)).collect())
 	}
-	pub fn insert_mode(&mut self,mode_id:ModeId,mode:Mode){
-		assert!(self.modes.insert(mode_id,mode).is_none(),"Cannot replace existing mode");
+	pub fn insert_mode(&mut self,mode_id:ModeId,mode:Mode)->Result<(),ExistingEntryError>{
+		error_if_exists(self.modes.insert(mode_id,mode))
 	}
-	pub fn insert_stage(&mut self,mode_id:ModeId,stage_id:StageId,stage:Stage){
-		assert!(self.stages.entry(mode_id).or_insert(HashMap::new()).insert(stage_id,stage).is_none(),"Cannot replace existing stage");
+	pub fn insert_stage(&mut self,mode_id:ModeId,stage_id:StageId,stage:Stage)->Result<(),ExistingEntryError>{
+		error_if_exists(self.stages.entry(mode_id).or_insert(HashMap::new()).insert(stage_id,stage))
 	}
 	pub fn push_mode_update(&mut self,mode_id:ModeId,mode_update:ModeUpdate){
 		self.mode_updates.push((mode_id,mode_update));
@@ -453,3 +462,12 @@ impl ModesBuilder{
 	// 	self.stage_updates.push((mode_id,stage_id,stage_update));
 	// }
 }
+
+#[derive(Debug)]
+pub struct ExistingEntryError;
+fn error_if_exists<T>(value:Option<T>)->Result<(),ExistingEntryError>{
+	match value{
+		Some(_)=>Err(ExistingEntryError),
+		None=>Ok(())
+	}
+}

lib/common/src/gameplay_style.rs

@@ -66,18 +66,18 @@ impl JumpImpulse{
 		_mass:Planar64,
 	)->Planar64Vec3{
 		match self{
-			&JumpImpulse::Time(time)=>velocity-(*gravity*time).map(|t|t.divide().fix_1()),
+			&JumpImpulse::Time(time)=>velocity-(*gravity*time).map(|t|t.divide().clamp_1()),
 			&JumpImpulse::Height(height)=>{
 				//height==-v.y*v.y/(2*g.y);
 				//use energy to determine max height
 				let gg=gravity.length_squared();
-				let g=gg.sqrt().fix_1();
+				let g=gg.sqrt();
 				let v_g=gravity.dot(velocity);
 				//do it backwards
-				let radicand=v_g*v_g+(g*height*2).fix_4();
-				velocity-(*gravity*(radicand.sqrt().fix_2()+v_g)/gg).divide().fix_1()
+				let radicand=v_g*v_g+(g*height*2).widen_4();
+				velocity-(*gravity*(radicand.sqrt().wrap_2()+v_g)/gg).divide().clamp_1()
 			},
-			&JumpImpulse::Linear(jump_speed)=>velocity+(jump_dir*jump_speed/jump_dir.length()).divide().fix_1(),
+			&JumpImpulse::Linear(jump_speed)=>velocity+(jump_dir*jump_speed/jump_dir.length()).divide().clamp_1(),
 			&JumpImpulse::Energy(_energy)=>{
 				//calculate energy
 				//let e=gravity.dot(velocity);
@@ -91,10 +91,10 @@ impl JumpImpulse{
 	pub fn get_jump_deltav(&self,gravity:&Planar64Vec3,mass:Planar64)->Planar64{
 		//gravity.length() is actually the proper calculation because the jump is always opposite the gravity direction
 		match self{
-			&JumpImpulse::Time(time)=>(gravity.length().fix_1()*time/2).divide().fix_1(),
-			&JumpImpulse::Height(height)=>(gravity.length()*height*2).sqrt().fix_1(),
+			&JumpImpulse::Time(time)=>(gravity.length().wrap_1()*time/2).divide().clamp_1(),
+			&JumpImpulse::Height(height)=>(gravity.length()*height*2).sqrt().wrap_1(),
 			&JumpImpulse::Linear(deltav)=>deltav,
-			&JumpImpulse::Energy(energy)=>(energy.sqrt()*2/mass.sqrt()).divide().fix_1(),
+			&JumpImpulse::Energy(energy)=>(energy.sqrt()*2/mass.sqrt()).divide().clamp_1(),
 		}
 	}
 }
@@ -126,10 +126,10 @@ impl JumpSettings{
 					None=>rel_velocity,
 				};
 				let j=boost_vel.dot(jump_dir);
-				let js=jump_speed.fix_2();
+				let js=jump_speed.widen_2();
 				if j<js{
 					//weak booster: just do a regular jump
-					boost_vel+jump_dir.with_length(js-j).divide().fix_1()
+					boost_vel+jump_dir.with_length(js-j).divide().wrap_1()
 				}else{
 					//activate booster normally, jump does nothing
 					boost_vel
@@ -142,13 +142,13 @@ impl JumpSettings{
 					None=>rel_velocity,
 				};
 				let j=boost_vel.dot(jump_dir);
-				let js=jump_speed.fix_2();
+				let js=jump_speed.widen_2();
 				if j<js{
 					//speed in direction of jump cannot be lower than amount
-					boost_vel+jump_dir.with_length(js-j).divide().fix_1()
+					boost_vel+jump_dir.with_length(js-j).divide().wrap_1()
 				}else{
 					//boost and jump add together
-					boost_vel+jump_dir.with_length(js).divide().fix_1()
+					boost_vel+jump_dir.with_length(js).divide().wrap_1()
 				}
 			}
 			(false,JumpCalculation::Max)=>{
@@ -159,10 +159,10 @@ impl JumpSettings{
 					None=>rel_velocity,
 				};
 				let boost_dot=boost_vel.dot(jump_dir);
-				let js=jump_speed.fix_2();
+				let js=jump_speed.widen_2();
 				if boost_dot<js{
 					//weak boost is extended to jump speed
-					boost_vel+jump_dir.with_length(js-boost_dot).divide().fix_1()
+					boost_vel+jump_dir.with_length(js-boost_dot).divide().wrap_1()
 				}else{
 					//activate booster normally, jump does nothing
 					boost_vel
@@ -174,7 +174,7 @@ impl JumpSettings{
 					Some(booster)=>booster.boost(rel_velocity),
 					None=>rel_velocity,
 				};
-				boost_vel+jump_dir.with_length(jump_speed).divide().fix_1()
+				boost_vel+jump_dir.with_length(jump_speed).divide().wrap_1()
 			},
 		}
 	}
@@ -267,9 +267,9 @@ pub struct StrafeSettings{
 impl StrafeSettings{
 	pub fn tick_velocity(&self,velocity:Planar64Vec3,control_dir:Planar64Vec3)->Option<Planar64Vec3>{
 		let d=velocity.dot(control_dir);
-		let mv=self.mv.fix_2();
+		let mv=self.mv.widen_2();
 		match d<mv{
-			true=>Some(velocity+(control_dir*self.air_accel_limit.map_or(mv-d,|limit|limit.fix_2().min(mv-d))).fix_1()),
+			true=>Some(velocity+(control_dir*self.air_accel_limit.map_or(mv-d,|limit|limit.widen_2().min(mv-d))).wrap_1()),
 			false=>None,
 		}
 	}
@@ -290,7 +290,7 @@ pub struct PropulsionSettings{
 }
 impl PropulsionSettings{
 	pub fn acceleration(&self,control_dir:Planar64Vec3)->Planar64Vec3{
-		(control_dir*self.magnitude).fix_1()
+		(control_dir*self.magnitude).clamp_1()
 	}
 }
 
@@ -310,13 +310,13 @@ pub struct WalkSettings{
 impl WalkSettings{
 	pub fn accel(&self,target_diff:Planar64Vec3,gravity:Planar64Vec3)->Planar64{
 		//TODO: fallible walk accel
-		let diff_len=target_diff.length().fix_1();
+		let diff_len=target_diff.length().wrap_1();
 		let friction=if diff_len<self.accelerate.topspeed{
 			self.static_friction
 		}else{
 			self.kinetic_friction
 		};
-		self.accelerate.accel.min((-gravity.y*friction).fix_1())
+		self.accelerate.accel.min((-gravity.y*friction).clamp_1())
 	}
 	pub fn get_walk_target_velocity(&self,control_dir:Planar64Vec3,normal:Planar64Vec3)->Planar64Vec3{
 		if control_dir==crate::integer::vec3::ZERO{
@@ -332,7 +332,7 @@ impl WalkSettings{
 			if cr==crate::integer::vec3::ZERO_2{
 				crate::integer::vec3::ZERO
 			}else{
-				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().fix_1()
+				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
 			}
 		}else{
 			crate::integer::vec3::ZERO
@@ -341,7 +341,7 @@ impl WalkSettings{
 	pub fn is_slope_walkable(&self,normal:Planar64Vec3,up:Planar64Vec3)->bool{
 		//normal is not guaranteed to be unit length
 		let ny=normal.dot(up);
-		let h=normal.length().fix_1();
+		let h=normal.length().wrap_1();
 		//remember this is a normal vector
 		ny.is_positive()&&h*self.surf_dot<ny
 	}
@@ -368,13 +368,13 @@ impl LadderSettings{
 		let nnmm=nn*mm;
 		let d=normal.dot(control_dir);
 		let mut dd=d*d;
-		if (self.dot*self.dot*nnmm).fix_4()<dd{
+		if (self.dot*self.dot*nnmm).clamp_4()<dd{
 			if d.is_negative(){
-				control_dir=Planar64Vec3::new([Planar64::ZERO,mm.fix_1(),Planar64::ZERO]);
+				control_dir=Planar64Vec3::new([Planar64::ZERO,mm.clamp_1(),Planar64::ZERO]);
 			}else{
-				control_dir=Planar64Vec3::new([Planar64::ZERO,-mm.fix_1(),Planar64::ZERO]);
+				control_dir=Planar64Vec3::new([Planar64::ZERO,-mm.clamp_1(),Planar64::ZERO]);
 			}
-			dd=(normal.y*normal.y).fix_4();
+			dd=(normal.y*normal.y).widen_4();
 		}
 		//n=d if you are standing on top of a ladder and press E.
 		//two fixes:
@@ -385,7 +385,7 @@ impl LadderSettings{
 			if cr==crate::integer::vec3::ZERO_2{
 				crate::integer::vec3::ZERO
 			}else{
-				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().fix_1()
+				(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
 			}
 		}else{
 			crate::integer::vec3::ZERO
@@ -417,7 +417,7 @@ impl Hitbox{
 	}
 	pub fn source()->Self{
 		Self{
-			halfsize:((int3(33,73,33)>>1)*VALVE_SCALE).fix_1(),
+			halfsize:((int3(33,73,33)>>1)*VALVE_SCALE).narrow_1().unwrap(),
 			mesh:HitboxMesh::Box,
 		}
 	}
@@ -538,11 +538,11 @@ impl StyleModifiers{
 				tick_rate:Ratio64::new(100,AbsoluteTime::ONE_SECOND.get() as u64).unwrap(),
 			}),
 			jump:Some(JumpSettings{
-				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).fix_1()),
+				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).narrow_1().unwrap()),
 				calculation:JumpCalculation::JumpThenBoost,
 				limit_minimum:true,
 			}),
-			gravity:(int3(0,-800,0)*VALVE_SCALE).fix_1(),
+			gravity:(int3(0,-800,0)*VALVE_SCALE).narrow_1().unwrap(),
 			mass:int(1),
 			rocket:None,
 			walk:Some(WalkSettings{
@@ -565,7 +565,7 @@ impl StyleModifiers{
 				magnitude:int(12),//?
 			}),
 			hitbox:Hitbox::source(),
-			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).fix_1(),
+			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).narrow_1().unwrap(),
 		}
 	}
 	pub fn source_surf()->Self{
@@ -574,16 +574,16 @@ impl StyleModifiers{
 			controls_mask_state:Controls::all(),
 			strafe:Some(StrafeSettings{
 				enable:ControlsActivation::full_2d(),
-				air_accel_limit:Some((int(150)*66*VALVE_SCALE).fix_1()),
+				air_accel_limit:Some((int(150)*66*VALVE_SCALE).narrow_1().unwrap()),
 				mv:Planar64::raw(30<<28),
 				tick_rate:Ratio64::new(66,AbsoluteTime::ONE_SECOND.get() as u64).unwrap(),
 			}),
 			jump:Some(JumpSettings{
-				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).fix_1()),
+				impulse:JumpImpulse::Height((int(52)*VALVE_SCALE).narrow_1().unwrap()),
 				calculation:JumpCalculation::JumpThenBoost,
 				limit_minimum:true,
 			}),
-			gravity:(int3(0,-800,0)*VALVE_SCALE).fix_1(),
+			gravity:(int3(0,-800,0)*VALVE_SCALE).narrow_1().unwrap(),
 			mass:int(1),
 			rocket:None,
 			walk:Some(WalkSettings{
@@ -606,7 +606,7 @@ impl StyleModifiers{
 				magnitude:int(12),//?
 			}),
 			hitbox:Hitbox::source(),
-			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).fix_1(),
+			camera_offset:((int3(0,64,0)-(int3(0,73,0)>>1))*VALVE_SCALE).narrow_1().unwrap(),
 		}
 	}
 }

lib/common/src/integer.rs

@@ -1,5 +1,5 @@
-pub use fixed_wide::fixed::{Fixed,Fix};
-pub use ratio_ops::ratio::{Ratio,Divide};
+pub use fixed_wide::fixed::*;
+pub use ratio_ops::ratio::{Ratio,Divide,Parity};
 
 //integer units
 
@@ -60,7 +60,7 @@ impl<T> Time<T>{
 impl<T> From<Planar64> for Time<T>{
 	#[inline]
 	fn from(value:Planar64)->Self{
-		Self::raw((value*Planar64::raw(1_000_000_000)).fix_1().to_raw())
+		Self::raw((value*Planar64::raw(1_000_000_000)).clamp_1().to_raw())
 	}
 }
 impl<T> From<Time<T>> for Ratio<Planar64,Planar64>{
@@ -73,11 +73,11 @@ impl<T,Num,Den,N1,T1> From<Ratio<Num,Den>> for Time<T>
 	where
 		Num:core::ops::Mul<Planar64,Output=N1>,
 		N1:Divide<Den,Output=T1>,
-		T1:Fix<Planar64>,
+		T1:Clamp<Planar64>,
 {
 	#[inline]
 	fn from(value:Ratio<Num,Den>)->Self{
-		Self::raw((value*Planar64::raw(1_000_000_000)).divide().fix().to_raw())
+		Self::raw((value*Planar64::raw(1_000_000_000)).divide().clamp().to_raw())
 	}
 }
 impl<T> std::fmt::Display for Time<T>{
@@ -132,20 +132,21 @@ impl<T> std::ops::Mul for Time<T>{
 		Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
 	}
 }
-impl<T> std::ops::Div<i64> for Time<T>{
-	type Output=Self;
-	#[inline]
-	fn div(self,rhs:i64)->Self::Output{
-		Self::raw(self.0/rhs)
-	}
-}
-impl<T> std::ops::Mul<i64> for Time<T>{
-	type Output=Self;
-	#[inline]
-	fn mul(self,rhs:i64)->Self::Output{
-		Self::raw(self.0*rhs)
+macro_rules! impl_time_i64_rhs_operator {
+	($op:ident,$method:ident)=>{
+		impl<T> core::ops::$op<i64> for Time<T>{
+			type Output=Self;
+			#[inline]
+			fn $method(self,rhs:i64)->Self::Output{
+				Self::raw(self.0.$method(rhs))
+			}
+		}
 	}
 }
+impl_time_i64_rhs_operator!(Div,div);
+impl_time_i64_rhs_operator!(Mul,mul);
+impl_time_i64_rhs_operator!(Shr,shr);
+impl_time_i64_rhs_operator!(Shl,shl);
 impl<T> core::ops::Mul<Time<T>> for Planar64{
 	type Output=Ratio<Fixed<2,64>,Planar64>;
 	fn mul(self,rhs:Time<T>)->Self::Output{
@@ -401,6 +402,10 @@ impl Angle32{
 	pub const NEG_FRAC_PI_2:Self=Self(-1<<30);
 	pub const PI:Self=Self(-1<<31);
 	#[inline]
+	pub const fn raw(num:i32)->Self{
+		Self(num)
+	}
+	#[inline]
 	pub const fn wrap_from_i64(theta:i64)->Self{
 		//take lower bits
 		//note: this was checked on compiler explorer and compiles to 1 instruction!
@@ -515,8 +520,8 @@ fn angle_sin_cos(){
 		println!("cordic s={} c={}",(s/h).divide(),(c/h).divide());
 		let (fs,fc)=f.sin_cos();
 		println!("float s={} c={}",fs,fc);
-		assert!(close_enough((c/h).divide().fix_1(),Planar64::raw((fc*((1u64<<32) as f64)) as i64)));
-		assert!(close_enough((s/h).divide().fix_1(),Planar64::raw((fs*((1u64<<32) as f64)) as i64)));
+		assert!(close_enough((c/h).divide().wrap_1(),Planar64::raw((fc*((1u64<<32) as f64)) as i64)));
+		assert!(close_enough((s/h).divide().wrap_1(),Planar64::raw((fs*((1u64<<32) as f64)) as i64)));
 	}
 	test_angle(1.0);
 	test_angle(std::f64::consts::PI/4.0);
@@ -558,6 +563,10 @@ pub mod vec3{
 	pub const MAX:Planar64Vec3=Planar64Vec3::new([Planar64::MAX;3]);
 	pub const ZERO:Planar64Vec3=Planar64Vec3::new([Planar64::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]);
@@ -625,8 +634,8 @@ pub mod mat3{
 		let (yc,ys)=y.cos_sin();
 		Planar64Mat3::from_cols([
 			Planar64Vec3::new([xc,Planar64::ZERO,-xs]),
-			Planar64Vec3::new([(xs*ys).fix_1(),yc,(xc*ys).fix_1()]),
-			Planar64Vec3::new([(xs*yc).fix_1(),-ys,(xc*yc).fix_1()]),
+			Planar64Vec3::new([(xs*ys).wrap_1(),yc,(xc*ys).wrap_1()]),
+			Planar64Vec3::new([(xs*yc).wrap_1(),-ys,(xc*yc).wrap_1()]),
 		])
 	}
 	#[inline]
@@ -648,7 +657,7 @@ pub mod mat3{
 	}
 }
 
-#[derive(Clone,Copy,Default,Hash,Eq,PartialEq)]
+#[derive(Clone,Copy,Debug,Default,Hash,Eq,PartialEq)]
 pub struct Planar64Affine3{
 	pub matrix3:Planar64Mat3,//includes scale above 1
 	pub translation:Planar64Vec3,
@@ -668,7 +677,7 @@ impl Planar64Affine3{
 	}
 	#[inline]
 	pub fn transform_point3(&self,point:Planar64Vec3)->vec3::Vector3<Fixed<2,64>>{
-		self.translation.fix_2()+self.matrix3*point
+		self.translation.widen_2()+self.matrix3*point
 	}
 }
 impl Into<glam::Mat4> for Planar64Affine3{

lib/common/src/model.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::integer::{Planar64Vec3,Planar64Affine3};
+use crate::integer::{Planar64,Planar64Vec3,Planar64Affine3};
 use crate::gameplay_attributes;
 
 pub type TextureCoordinate=glam::Vec2;
@@ -168,6 +168,11 @@ impl MeshBuilder{
 		}
 	}
 	pub fn acquire_pos_id(&mut self,pos:Planar64Vec3)->PositionId{
+		// Truncate the 16 most precise bits of the vertex positions.
+		// This allows the normal vectors to exactly represent the face.
+		// Remove this in Mesh V2
+		const MASK:Planar64=Planar64::raw(!((1<<16)-1));
+		let pos=pos.map(|c|c&MASK);
 		*self.pos_id_from.entry(pos).or_insert_with(||{
 			let pos_id=PositionId::new(self.unique_pos.len() as u32);
 			self.unique_pos.push(pos);

lib/common/src/ray.rs

@@ -13,8 +13,8 @@ impl Ray{
 		Num:core::ops::Mul<Planar64,Output=N1>,
 		Planar64:core::ops::Mul<Den,Output=N1>,
 		N1:integer::Divide<Den,Output=T1>,
-		T1:integer::Fix<Planar64>,
+		T1:integer::Clamp<Planar64>,
 	{
-		self.origin+self.direction.map(|elem|(t*elem).divide().fix())
+		self.origin+self.direction.map(|elem|(t*elem).divide().clamp())
 	}
 }

lib/deferred_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_deferred_loader"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -10,4 +10,4 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
+strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }

lib/deferred_loader/src/deferred_loader.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use crate::loader::Loader;
 use crate::mesh::Meshes;
 use crate::texture::{RenderConfigs,Texture};
-use strafesnet_common::model::{Mesh,MeshId,RenderConfig,RenderConfigId,TextureId};
+use strafesnet_common::model::{MeshId,RenderConfig,RenderConfigId,TextureId};
 
 #[derive(Clone,Copy,Debug)]
 pub enum LoadFailureMode{
@@ -45,7 +45,7 @@ impl<H:core::hash::Hash+Eq> RenderConfigDeferredLoader<H>{
 	pub fn into_indices(self)->impl Iterator<Item=H>{
 		self.render_config_id_from_asset_id.into_keys().flatten()
 	}
-	pub fn into_render_configs<L:Loader<Resource=Texture,Index=H>>(mut self,loader:&mut L,failure_mode:LoadFailureMode)->Result<RenderConfigs,L::Error>{
+	pub fn into_render_configs<'a,L:Loader<Resource=Texture,Index<'a>=H>+'a>(mut self,loader:&mut L,failure_mode:LoadFailureMode)->Result<RenderConfigs,L::Error>{
 		let mut sorted_textures=vec![None;self.texture_count as usize];
 		for (index_option,render_config_id) in self.render_config_id_from_asset_id{
 			let render_config=&mut self.render_configs[render_config_id.get() as usize];
@@ -93,7 +93,7 @@ impl<H:core::hash::Hash+Eq> MeshDeferredLoader<H>{
 	pub fn into_indices(self)->impl Iterator<Item=H>{
 		self.mesh_id_from_asset_id.into_keys()
 	}
-	pub fn into_meshes<L:Loader<Resource=Mesh,Index=H>>(self,loader:&mut L,failure_mode:LoadFailureMode)->Result<Meshes,L::Error>{
+	pub fn into_meshes<'a,M:Clone,L:Loader<Resource=M,Index<'a>=H>+'a>(self,loader:&mut L,failure_mode:LoadFailureMode)->Result<Meshes<M>,L::Error>{
 		let mut mesh_list=vec![None;self.mesh_id_from_asset_id.len()];
 		for (index,mesh_id) in self.mesh_id_from_asset_id{
 			let resource_result=loader.load(index);

lib/deferred_loader/src/loader.rs

@@ -2,7 +2,7 @@ use std::error::Error;
 
 pub trait Loader{
 	type Error:Error;
-	type Index;
+	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/deferred_loader/src/mesh.rs

@@ -1,15 +1,15 @@
-use strafesnet_common::model::{Mesh,MeshId};
+use strafesnet_common::model::MeshId;
 
-pub struct Meshes{
-	meshes:Vec<Option<Mesh>>,
+pub struct Meshes<M>{
+	meshes:Vec<Option<M>>,
 }
-impl Meshes{
-	pub(crate) const fn new(meshes:Vec<Option<Mesh>>)->Self{
+impl<M> Meshes<M>{
+	pub(crate) const fn new(meshes:Vec<Option<M>>)->Self{
 		Self{
 			meshes,
 		}
 	}
-	pub fn consume(self)->impl Iterator<Item=(MeshId,Mesh)>{
+	pub fn consume(self)->impl Iterator<Item=(MeshId,M)>{
 		self.meshes.into_iter().enumerate().filter_map(|(mesh_id,maybe_mesh)|
 			maybe_mesh.map(|mesh|(MeshId::new(mesh_id as u32),mesh))
 		)

lib/fixed_wide/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fixed_wide"
-version = "0.1.2"
+version = "0.2.1"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"

lib/fixed_wide/src/fixed.rs

@@ -233,6 +233,11 @@ impl FixedFromFloatError{
 		}
 	}
 }
+impl core::fmt::Display for FixedFromFloatError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
 macro_rules! impl_from_float {
 	( $decode:ident, $input: ty, $mantissa_bits:expr ) => {
 		impl<const N:usize,const F:usize> TryFrom<$input> for Fixed<N,F>{
@@ -663,74 +668,94 @@ macro_repeated!(
 	1,2,3,4,5,6,7,8
 );
 
-pub trait Fix<Out>{
-	fn fix(self)->Out;
+#[derive(Debug,Eq,PartialEq)]
+pub enum NarrowError{
+	Overflow,
+	Underflow,
 }
 
-macro_rules! impl_fix_rhs_lt_lhs_not_const_generic{
+pub trait Wrap<Output>{
+	fn wrap(self)->Output;
+}
+pub trait Clamp<Output>{
+	fn clamp(self)->Output;
+}
+impl<const N:usize,const F:usize> Clamp<Fixed<N,F>> for Result<Fixed<N,F>,NarrowError>{
+	fn clamp(self)->Fixed<N,F>{
+		match self{
+			Ok(fixed)=>fixed,
+			Err(NarrowError::Overflow)=>Fixed::MAX,
+			Err(NarrowError::Underflow)=>Fixed::MIN,
+		}
+	}
+}
+
+macro_rules! impl_narrow_not_const_generic{
 	(
 		(),
 		($lhs:expr,$rhs:expr)
 	)=>{
-		impl Fixed<$lhs,{$lhs*32}>
-		{
-			paste::item!{
+		paste::item!{
+			impl Fixed<$lhs,{$lhs*32}>
+			{
 				#[inline]
-				pub fn [<fix_ $rhs>](self)->Fixed<$rhs,{$rhs*32}>{
+				pub fn [<wrap_ $rhs>](self)->Fixed<$rhs,{$rhs*32}>{
 					Fixed::from_bits(bnum::cast::As::as_::<BInt::<$rhs>>(self.bits.shr(($lhs-$rhs)*32)))
 				}
+				#[inline]
+				pub fn [<narrow_ $rhs>](self)->Result<Fixed<$rhs,{$rhs*32}>,NarrowError>{
+					if Fixed::<$rhs,{$rhs*32}>::MAX.[<widen_ $lhs>]().bits<self.bits{
+						return Err(NarrowError::Overflow);
+					}
+					if self.bits<Fixed::<$rhs,{$rhs*32}>::MIN.[<widen_ $lhs>]().bits{
+						return Err(NarrowError::Underflow);
+					}
+					Ok(self.[<wrap_ $rhs>]())
+				}
+				#[inline]
+				pub fn [<clamp_ $rhs>](self)->Fixed<$rhs,{$rhs*32}>{
+					self.[<narrow_ $rhs>]().clamp()
+				}
 			}
-		}
-		impl Fix<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
-			fn fix(self)->Fixed<$rhs,{$rhs*32}>{
-				paste::item!{
-				self.[<fix_ $rhs>]()
+			impl Wrap<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
+				#[inline]
+				fn wrap(self)->Fixed<$rhs,{$rhs*32}>{
+					self.[<wrap_ $rhs>]()
+				}
+			}
+			impl TryInto<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
+				type Error=NarrowError;
+				#[inline]
+				fn try_into(self)->Result<Fixed<$rhs,{$rhs*32}>,Self::Error>{
+					self.[<narrow_ $rhs>]()
+				}
+			}
+			impl Clamp<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
+				#[inline]
+				fn clamp(self)->Fixed<$rhs,{$rhs*32}>{
+					self.[<clamp_ $rhs>]()
 				}
 			}
 		}
 	}
 }
-macro_rules! impl_fix_lhs_lt_rhs_not_const_generic{
+macro_rules! impl_widen_not_const_generic{
 	(
 		(),
 		($lhs:expr,$rhs:expr)
 	)=>{
-		impl Fixed<$lhs,{$lhs*32}>
-		{
-			paste::item!{
+		paste::item!{
+			impl Fixed<$lhs,{$lhs*32}>
+			{
 				#[inline]
-				pub fn [<fix_ $rhs>](self)->Fixed<$rhs,{$rhs*32}>{
+				pub fn [<widen_ $rhs>](self)->Fixed<$rhs,{$rhs*32}>{
 					Fixed::from_bits(bnum::cast::As::as_::<BInt::<$rhs>>(self.bits).shl(($rhs-$lhs)*32))
 				}
 			}
-		}
-		impl Fix<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
-			fn fix(self)->Fixed<$rhs,{$rhs*32}>{
-				paste::item!{
-				self.[<fix_ $rhs>]()
-				}
-			}
-		}
-	}
-}
-macro_rules! impl_fix_lhs_eq_rhs_not_const_generic{
-	(
-		(),
-		($lhs:expr,$rhs:expr)
-	)=>{
-		impl Fixed<$lhs,{$lhs*32}>
-		{
-			paste::item!{
+			impl Into<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
 				#[inline]
-				pub fn [<fix_ $rhs>](self)->Fixed<$rhs,{$rhs*32}>{
-					self
-				}
-			}
-		}
-		impl Fix<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
-			fn fix(self)->Fixed<$rhs,{$rhs*32}>{
-				paste::item!{
-				self.[<fix_ $rhs>]()
+				fn into(self)->Fixed<$rhs,{$rhs*32}>{
+					self.[<widen_ $rhs>]()
 				}
 			}
 		}
@@ -740,7 +765,7 @@ macro_rules! impl_fix_lhs_eq_rhs_not_const_generic{
 // I LOVE NOT BEING ABLE TO USE CONST GENERICS
 
 macro_repeated!(
-	impl_fix_rhs_lt_lhs_not_const_generic,(),
+	impl_narrow_not_const_generic,(),
 	(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1),(11,1),(12,1),(13,1),(14,1),(15,1),(16,1),(17,1),
 	(3,2),(4,2),(5,2),(6,2),(7,2),(8,2),(9,2),(10,2),(11,2),(12,2),(13,2),(14,2),(15,2),(16,2),
 	(4,3),(5,3),(6,3),(7,3),(8,3),(9,3),(10,3),(11,3),(12,3),(13,3),(14,3),(15,3),(16,3),
@@ -758,7 +783,7 @@ macro_repeated!(
 	(16,15)
 );
 macro_repeated!(
-	impl_fix_lhs_lt_rhs_not_const_generic,(),
+	impl_widen_not_const_generic,(),
 	(1,2),
 	(1,3),(2,3),
 	(1,4),(2,4),(3,4),
@@ -773,11 +798,8 @@ macro_repeated!(
 	(1,13),(2,13),(3,13),(4,13),(5,13),(6,13),(7,13),(8,13),(9,13),(10,13),(11,13),(12,13),
 	(1,14),(2,14),(3,14),(4,14),(5,14),(6,14),(7,14),(8,14),(9,14),(10,14),(11,14),(12,14),(13,14),
 	(1,15),(2,15),(3,15),(4,15),(5,15),(6,15),(7,15),(8,15),(9,15),(10,15),(11,15),(12,15),(13,15),(14,15),
-	(1,16),(2,16),(3,16),(4,16),(5,16),(6,16),(7,16),(8,16),(9,16),(10,16),(11,16),(12,16),(13,16),(14,16),(15,16)
-);
-macro_repeated!(
-	impl_fix_lhs_eq_rhs_not_const_generic,(),
-	(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16)
+	(1,16),(2,16),(3,16),(4,16),(5,16),(6,16),(7,16),(8,16),(9,16),(10,16),(11,16),(12,16),(13,16),(14,16),(15,16),
+	(1,17)
 );
 
 macro_rules! impl_not_const_generic{
@@ -797,7 +819,7 @@ macro_rules! impl_not_const_generic{
 				let mut result=Self::ZERO;
 
 				//resize self to match the wide mul output
-				let wide_self=self.[<fix_ $_2n>]();
+				let wide_self=self.[<widen_ $_2n>]();
 				//descend down the bits and check if flipping each bit would push the square over the input value
 				for shift in (0..=max_shift).rev(){
 					result.as_bits_mut().as_bits_mut().set_bit(shift,true);

lib/fixed_wide/src/tests.rs

@@ -61,7 +61,7 @@ fn from_f32(){
 	let b:Result<I32F32,_>=Into::<f32>::into(I32F32::MIN).try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Overflow));
 	//16 is within the 24 bits of float precision
-	let b:Result<I32F32,_>=Into::<f32>::into(-I32F32::MIN.fix_2()).try_into();
+	let b:Result<I32F32,_>=Into::<f32>::into(-I32F32::MIN.widen_2()).try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Overflow));
 	let b:Result<I32F32,_>=f32::MIN_POSITIVE.try_into();
 	assert_eq!(b,Err(crate::fixed::FixedFromFloatError::Underflow));
@@ -136,11 +136,24 @@ fn test_bint(){
 }
 
 #[test]
-fn test_fix(){
-	assert_eq!(I32F32::ONE.fix_8(),I256F256::ONE);
-	assert_eq!(I32F32::ONE,I256F256::ONE.fix_1());
-	assert_eq!(I32F32::NEG_ONE.fix_8(),I256F256::NEG_ONE);
-	assert_eq!(I32F32::NEG_ONE,I256F256::NEG_ONE.fix_1());
+fn test_wrap(){
+	assert_eq!(I32F32::ONE,I256F256::ONE.wrap_1());
+	assert_eq!(I32F32::NEG_ONE,I256F256::NEG_ONE.wrap_1());
+}
+#[test]
+fn test_narrow(){
+	assert_eq!(Ok(I32F32::ONE),I256F256::ONE.narrow_1());
+	assert_eq!(Ok(I32F32::NEG_ONE),I256F256::NEG_ONE.narrow_1());
+}
+#[test]
+fn test_widen(){
+	assert_eq!(I32F32::ONE.widen_8(),I256F256::ONE);
+	assert_eq!(I32F32::NEG_ONE.widen_8(),I256F256::NEG_ONE);
+}
+#[test]
+fn test_clamp(){
+	assert_eq!(I32F32::ONE,I256F256::ONE.clamp_1());
+	assert_eq!(I32F32::NEG_ONE,I256F256::NEG_ONE.clamp_1());
 }
 #[test]
 fn test_sqrt(){

lib/fixed_wide/src/zeroes.rs

@@ -15,8 +15,10 @@ macro_rules! impl_zeroes{
 				let radicand=a1*a1-a2*a0*4;
 				match radicand.cmp(&<Self as core::ops::Mul>::Output::ZERO){
 					Ordering::Greater=>{
+						// using wrap because sqrt always halves the number of leading digits.
+						// clamp would be more defensive, but is slower.
 						paste::item!{
-						let planar_radicand=radicand.sqrt().[<fix_ $n>]();
+						let planar_radicand=radicand.sqrt().[<wrap_ $n>]();
 						}
 						//sort roots ascending and avoid taking the difference of large numbers
 						let zeroes=match (a2pos,Self::ZERO<a1){

lib/linear_ops/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "linear_ops"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -15,7 +15,7 @@ deferred-division=["dep:ratio_ops"]
 
 [dependencies]
 ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
-fixed_wide = { version = "0.1.2", path = "../fixed_wide", registry = "strafesnet", optional = true }
+fixed_wide = { version = "0.2.0", path = "../fixed_wide", registry = "strafesnet", optional = true }
 paste = { version = "1.0.15", optional = true }
 
 [dev-dependencies]

lib/linear_ops/src/macros/fixed_wide.rs

@@ -38,40 +38,95 @@ macro_rules! impl_fixed_wide_vector {
 		$crate::macro_4!(impl_fixed_wide_vector_not_const_generic,());
 		// I LOVE NOT BEING ABLE TO USE CONST GENERICS
 		$crate::macro_repeated!(
-			impl_fix_not_const_generic,(),
-			(1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1),(11,1),(12,1),(13,1),(14,1),(15,1),(16,1),
-			(1,2),(2,2),(3,2),(4,2),(5,2),(6,2),(7,2),(8,2),(9,2),(10,2),(11,2),(12,2),(13,2),(14,2),(15,2),(16,2),
-			(1,3),(2,3),(3,3),(4,3),(5,3),(6,3),(7,3),(8,3),(9,3),(10,3),(11,3),(12,3),(13,3),(14,3),(15,3),(16,3),
-			(1,4),(2,4),(3,4),(4,4),(5,4),(6,4),(7,4),(8,4),(9,4),(10,4),(11,4),(12,4),(13,4),(14,4),(15,4),(16,4),
-			(1,5),(2,5),(3,5),(4,5),(5,5),(6,5),(7,5),(8,5),(9,5),(10,5),(11,5),(12,5),(13,5),(14,5),(15,5),(16,5),
-			(1,6),(2,6),(3,6),(4,6),(5,6),(6,6),(7,6),(8,6),(9,6),(10,6),(11,6),(12,6),(13,6),(14,6),(15,6),(16,6),
-			(1,7),(2,7),(3,7),(4,7),(5,7),(6,7),(7,7),(8,7),(9,7),(10,7),(11,7),(12,7),(13,7),(14,7),(15,7),(16,7),
-			(1,8),(2,8),(3,8),(4,8),(5,8),(6,8),(7,8),(8,8),(9,8),(10,8),(11,8),(12,8),(13,8),(14,8),(15,8),(16,8),
-			(1,9),(2,9),(3,9),(4,9),(5,9),(6,9),(7,9),(8,9),(9,9),(10,9),(11,9),(12,9),(13,9),(14,9),(15,9),(16,9),
-			(1,10),(2,10),(3,10),(4,10),(5,10),(6,10),(7,10),(8,10),(9,10),(10,10),(11,10),(12,10),(13,10),(14,10),(15,10),(16,10),
-			(1,11),(2,11),(3,11),(4,11),(5,11),(6,11),(7,11),(8,11),(9,11),(10,11),(11,11),(12,11),(13,11),(14,11),(15,11),(16,11),
-			(1,12),(2,12),(3,12),(4,12),(5,12),(6,12),(7,12),(8,12),(9,12),(10,12),(11,12),(12,12),(13,12),(14,12),(15,12),(16,12),
-			(1,13),(2,13),(3,13),(4,13),(5,13),(6,13),(7,13),(8,13),(9,13),(10,13),(11,13),(12,13),(13,13),(14,13),(15,13),(16,13),
-			(1,14),(2,14),(3,14),(4,14),(5,14),(6,14),(7,14),(8,14),(9,14),(10,14),(11,14),(12,14),(13,14),(14,14),(15,14),(16,14),
-			(1,15),(2,15),(3,15),(4,15),(5,15),(6,15),(7,15),(8,15),(9,15),(10,15),(11,15),(12,15),(13,15),(14,15),(15,15),(16,15),
-			(1,16),(2,16),(3,16),(4,16),(5,16),(6,16),(7,16),(8,16),(9,16),(10,16),(11,16),(12,16),(13,16),(14,16),(15,16),(16,16)
+			impl_narrow_not_const_generic,(),
+			(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1),(11,1),(12,1),(13,1),(14,1),(15,1),(16,1),(17,1),
+			(3,2),(4,2),(5,2),(6,2),(7,2),(8,2),(9,2),(10,2),(11,2),(12,2),(13,2),(14,2),(15,2),(16,2),
+			(4,3),(5,3),(6,3),(7,3),(8,3),(9,3),(10,3),(11,3),(12,3),(13,3),(14,3),(15,3),(16,3),
+			(5,4),(6,4),(7,4),(8,4),(9,4),(10,4),(11,4),(12,4),(13,4),(14,4),(15,4),(16,4),
+			(6,5),(7,5),(8,5),(9,5),(10,5),(11,5),(12,5),(13,5),(14,5),(15,5),(16,5),
+			(7,6),(8,6),(9,6),(10,6),(11,6),(12,6),(13,6),(14,6),(15,6),(16,6),
+			(8,7),(9,7),(10,7),(11,7),(12,7),(13,7),(14,7),(15,7),(16,7),
+			(9,8),(10,8),(11,8),(12,8),(13,8),(14,8),(15,8),(16,8),
+			(10,9),(11,9),(12,9),(13,9),(14,9),(15,9),(16,9),
+			(11,10),(12,10),(13,10),(14,10),(15,10),(16,10),
+			(12,11),(13,11),(14,11),(15,11),(16,11),
+			(13,12),(14,12),(15,12),(16,12),
+			(14,13),(15,13),(16,13),
+			(15,14),(16,14),
+			(16,15)
 		);
+		$crate::macro_repeated!(
+			impl_widen_not_const_generic,(),
+			(1,2),
+			(1,3),(2,3),
+			(1,4),(2,4),(3,4),
+			(1,5),(2,5),(3,5),(4,5),
+			(1,6),(2,6),(3,6),(4,6),(5,6),
+			(1,7),(2,7),(3,7),(4,7),(5,7),(6,7),
+			(1,8),(2,8),(3,8),(4,8),(5,8),(6,8),(7,8),
+			(1,9),(2,9),(3,9),(4,9),(5,9),(6,9),(7,9),(8,9),
+			(1,10),(2,10),(3,10),(4,10),(5,10),(6,10),(7,10),(8,10),(9,10),
+			(1,11),(2,11),(3,11),(4,11),(5,11),(6,11),(7,11),(8,11),(9,11),(10,11),
+			(1,12),(2,12),(3,12),(4,12),(5,12),(6,12),(7,12),(8,12),(9,12),(10,12),(11,12),
+			(1,13),(2,13),(3,13),(4,13),(5,13),(6,13),(7,13),(8,13),(9,13),(10,13),(11,13),(12,13),
+			(1,14),(2,14),(3,14),(4,14),(5,14),(6,14),(7,14),(8,14),(9,14),(10,14),(11,14),(12,14),(13,14),
+			(1,15),(2,15),(3,15),(4,15),(5,15),(6,15),(7,15),(8,15),(9,15),(10,15),(11,15),(12,15),(13,15),(14,15),
+			(1,16),(2,16),(3,16),(4,16),(5,16),(6,16),(7,16),(8,16),(9,16),(10,16),(11,16),(12,16),(13,16),(14,16),(15,16),
+			(1,17)
+		);
+		impl<const N:usize,T:fixed_wide::fixed::Wrap<U>,U> fixed_wide::fixed::Wrap<Vector<N,U>> for Vector<N,T>
+		{
+			#[inline]
+			fn wrap(self)->Vector<N,U>{
+				self.map(|t|t.wrap())
+			}
+		}
+		impl<const N:usize,T:fixed_wide::fixed::Clamp<U>,U> fixed_wide::fixed::Clamp<Vector<N,U>> for Vector<N,T>
+		{
+			#[inline]
+			fn clamp(self)->Vector<N,U>{
+				self.map(|t|t.clamp())
+			}
+		}
 	};
 }
-
 #[doc(hidden)]
 #[macro_export(local_inner_macros)]
-macro_rules! impl_fix_not_const_generic{
+macro_rules! impl_narrow_not_const_generic{
 	(
 		(),
 		($lhs:expr,$rhs:expr)
 	)=>{
-		impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<$lhs,{$lhs*32}>>
-		{
-			paste::item!{
+		paste::item!{
+			impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<$lhs,{$lhs*32}>>{
 				#[inline]
-				pub fn [<fix_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
-					self.map(|t|t.[<fix_ $rhs>]())
+				pub fn [<wrap_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
+					self.map(|t|t.[<wrap_ $rhs>]())
+				}
+				#[inline]
+				pub fn [<narrow_ $rhs>](self)->Vector<N,Result<fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>,fixed_wide::fixed::NarrowError>>{
+					self.map(|t|t.[<narrow_ $rhs>]())
+				}
+				#[inline]
+				pub fn [<clamp_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
+					self.map(|t|t.[<clamp_ $rhs>]())
+				}
+			}
+		}
+	}
+}
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! impl_widen_not_const_generic{
+	(
+		(),
+		($lhs:expr,$rhs:expr)
+	)=>{
+		paste::item!{
+			impl<const N:usize> Vector<N,fixed_wide::fixed::Fixed<$lhs,{$lhs*32}>>{
+				#[inline]
+				pub fn [<widen_ $rhs>](self)->Vector<N,fixed_wide::fixed::Fixed<$rhs,{$rhs*32}>>{
+					self.map(|t|t.[<widen_ $rhs>]())
 				}
 			}
 		}

lib/linear_ops/src/macros/matrix.rs

@@ -204,13 +204,19 @@ macro_rules! impl_matrix_named_fields_shape {
 			type Target=$struct_outer<Vector<$size_inner,T>>;
 			#[inline]
 			fn deref(&self)->&Self::Target{
-				unsafe{core::mem::transmute(&self.array)}
+				// This cast is valid because Matrix has #[repr(transparent)]
+				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}
 			}
 		}
 		impl<T> core::ops::DerefMut for Matrix<$size_outer,$size_inner,T>{
 			#[inline]
 			fn deref_mut(&mut self)->&mut Self::Target{
-				unsafe{core::mem::transmute(&mut self.array)}
+				// This cast is valid because Matrix has #[repr(transparent)]
+				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

@@ -58,6 +58,15 @@ macro_rules! impl_vector {
 			}
 		}
 
+		impl<const N:usize,T,E:std::fmt::Debug> Vector<N,Result<T,E>>{
+			#[inline]
+			pub fn unwrap(self)->Vector<N,T>{
+				Vector{
+					array:self.array.map(Result::unwrap)
+				}
+			}
+		}
+
 		impl<const N:usize,T:Ord> Vector<N,T>{
 			#[inline]
 			pub fn min(self,rhs:Self)->Self{
@@ -321,13 +330,19 @@ macro_rules! impl_vector_named_fields {
 			type Target=$struct<T>;
 			#[inline]
 			fn deref(&self)->&Self::Target{
-				unsafe{core::mem::transmute(&self.array)}
+				// This cast is valid because Vector has #[repr(transparent)]
+				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}
 			}
 		}
 		impl<T> core::ops::DerefMut for Vector<$size,T>{
 			#[inline]
 			fn deref_mut(&mut self)->&mut Self::Target{
-				unsafe{core::mem::transmute(&mut self.array)}
+				// This cast is valid because Vector has #[repr(transparent)]
+				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/rbx_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafesnet_rbx_loader"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -13,12 +13,13 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 bytemuck = "1.14.3"
 glam = "0.30.0"
 lazy-regex = "3.1.0"
-rbx_binary = { version = "0.7.4", registry = "strafesnet" }
-rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
-rbx_mesh = "0.3.1"
-rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
-rbx_xml = { version = "0.13.3", registry = "strafesnet" }
+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.1.0-sn4", registry = "strafesnet" }
 rbxassetid = { version = "0.1.0", path = "../rbxassetid", registry = "strafesnet" }
-roblox_emulator = { version = "0.4.7", path = "../roblox_emulator", registry = "strafesnet" }
-strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.0", path = "../deferred_loader", 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" }

lib/rbx_loader/src/error.rs

@@ -0,0 +1,245 @@
+use std::collections::HashSet;
+use std::num::ParseIntError;
+
+use strafesnet_common::gameplay_modes::{StageId,ModeId};
+use strafesnet_common::integer::{FixedFromFloatError,Planar64TryFromFloatError};
+
+/// A collection of errors which can be ignored at your peril
+#[derive(Debug,Default)]
+pub struct RecoverableErrors{
+	/// A basepart has an invalid / missing property.
+	pub basepart_property:Vec<InstancePath>,
+	/// A part has an unconvertable CFrame.
+	pub basepart_cframe:Vec<CFrameError>,
+	/// A part has an unconvertable Velocity.
+	pub basepart_velocity:Vec<Planar64ConvertError>,
+	/// A part has an invalid / missing property.
+	pub part_property:Vec<InstancePath>,
+	/// A part has an invalid shape.
+	pub part_shape:Vec<ShapeError>,
+	/// A meshpart has an invalid / missing property.
+	pub meshpart_property:Vec<InstancePath>,
+	/// A meshpart has no mesh.
+	pub meshpart_content:Vec<InstancePath>,
+	/// A basepart has an unsupported subclass.
+	pub unsupported_class:HashSet<String>,
+	/// A decal has an invalid / missing property.
+	pub decal_property:Vec<InstancePath>,
+	/// A decal has an invalid normal_id.
+	pub normal_id:Vec<NormalIdError>,
+	/// A texture has an invalid / missing property.
+	pub texture_property:Vec<InstancePath>,
+	/// A mode_id failed to parse.
+	pub mode_id_parse_int:Vec<ParseIntContext>,
+	/// There is a duplicate mode.
+	pub duplicate_mode:HashSet<ModeId>,
+	/// A mode_id failed to parse.
+	pub stage_id_parse_int:Vec<ParseIntContext>,
+	/// A Stage was duplicated leading to undefined behaviour.
+	pub duplicate_stage:HashSet<DuplicateStageError>,
+	/// A WormholeOut id failed to parse.
+	pub wormhole_out_id_parse_int:Vec<ParseIntContext>,
+	/// A WormholeOut was duplicated leading to undefined behaviour.
+	pub duplicate_wormhole_out:HashSet<u32>,
+	/// A WormholeIn id failed to parse.
+	pub wormhole_in_id_parse_int:Vec<ParseIntContext>,
+	/// A jump limit failed to parse.
+	pub jump_limit_parse_int:Vec<ParseIntContext>,
+}
+
+impl RecoverableErrors{
+	pub fn count(&self)->usize{
+		self.basepart_property.len()+
+		self.basepart_cframe.len()+
+		self.basepart_velocity.len()+
+		self.part_property.len()+
+		self.part_shape.len()+
+		self.meshpart_property.len()+
+		self.meshpart_content.len()+
+		self.unsupported_class.len()+
+		self.decal_property.len()+
+		self.normal_id.len()+
+		self.texture_property.len()+
+		self.mode_id_parse_int.len()+
+		self.duplicate_mode.len()+
+		self.stage_id_parse_int.len()+
+		self.duplicate_stage.len()+
+		self.wormhole_out_id_parse_int.len()+
+		self.duplicate_wormhole_out.len()+
+		self.wormhole_in_id_parse_int.len()+
+		self.jump_limit_parse_int.len()
+	}
+}
+
+fn write_comma_separated<T>(
+	f:&mut std::fmt::Formatter<'_>,
+	mut it:impl Iterator<Item=T>,
+	custom_write:impl Fn(&mut std::fmt::Formatter<'_>,T)->std::fmt::Result
+)->std::fmt::Result{
+	if let Some(t)=it.next(){
+		custom_write(f,t)?;
+		for t in it{
+			write!(f,", ")?;
+			custom_write(f,t)?;
+		}
+	}
+	Ok(())
+}
+
+macro_rules! write_instance_path_error{
+	($f:ident,$self:ident,$field:ident,$class:literal,$class_plural:literal,$problem:literal)=>{
+		let len=$self.$field.len();
+		if len!=0{
+			let plural=if len==1{$class}else{$class_plural};
+			write!($f,"The following {plural} {}: ",$problem)?;
+			write_comma_separated($f,$self.$field.iter(),|f,InstancePath(path)|
+				write!(f,"{path}")
+			)?;
+			writeln!($f)?;
+		}
+	};
+}
+macro_rules! write_duplicate_error{
+	($f:ident,$self:ident,$field:ident,$class:literal,$class_plural:literal)=>{
+		let len=$self.$field.len();
+		if len!=0{
+			let plural=if len==1{$class}else{$class_plural};
+			write!($f,"The following {plural} duplicates: ")?;
+			write_comma_separated($f,$self.$field.iter(),|f,id|
+				write!(f,"{id}")
+			)?;
+			writeln!($f)?;
+		}
+	};
+}
+macro_rules! write_bespoke_error{
+	($f:ident,$self:ident,$field:ident,$class:literal,$class_plural:literal,$problem:literal,$path_field:ident,$error_field:ident)=>{
+		let len=$self.$field.len();
+		if len!=0{
+			let plural=if len==1{$class}else{$class_plural};
+			write!($f,"The following {plural} {}: ",$problem)?;
+			write_comma_separated($f,$self.$field.iter(),|f,context|
+				write!(f,"{} ({})",context.$path_field,context.$error_field)
+			)?;
+			writeln!($f)?;
+		}
+	};
+}
+
+impl core::fmt::Display for RecoverableErrors{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write_instance_path_error!(f,self,basepart_property,"BasePart is","BaseParts are","missing a property");
+		write_bespoke_error!(f,self,basepart_cframe,"BasePart","BaseParts","CFrame float convert failed",path,error);
+		write_bespoke_error!(f,self,basepart_velocity,"BasePart","BaseParts","Velocity float convert failed",path,error);
+		write_instance_path_error!(f,self,part_property,"Part is","Parts are","missing a property");
+		write_bespoke_error!(f,self,part_shape,"Part","Parts","Shape is invalid",path,shape);
+		write_instance_path_error!(f,self,meshpart_property,"MeshPart is","MeshParts are","missing a property");
+		write_instance_path_error!(f,self,meshpart_content,"MeshPart has","MeshParts have","no mesh");
+		{
+			let len=self.unsupported_class.len();
+			if len!=0{
+				let plural=if len==1{"Class is"}else{"Classes are"};
+				write!(f,"The following {plural} not supported: ")?;
+				write_comma_separated(f,self.unsupported_class.iter(),|f,classname|write!(f,"{classname}"))?;
+				writeln!(f)?;
+			}
+		}
+		write_instance_path_error!(f,self,decal_property,"Decal is","Decals are","missing a property");
+		write_bespoke_error!(f,self,normal_id,"Decal","Decals","NormalId is invalid",path,normal_id);
+		write_instance_path_error!(f,self,texture_property,"Texture is","Textures are","missing a property");
+		write_bespoke_error!(f,self,mode_id_parse_int,"ModeId","ModeIds","failed to parse",context,error);
+		write_duplicate_error!(f,self,duplicate_mode,"ModeId has","ModeIds have");
+		write_bespoke_error!(f,self,stage_id_parse_int,"StageId","StageIds","failed to parse",context,error);
+		write_duplicate_error!(f,self,duplicate_stage,"StageId has","StageIds have");
+		write_bespoke_error!(f,self,wormhole_out_id_parse_int,"WormholeOutId","WormholeOutIds","failed to parse",context,error);
+		write_duplicate_error!(f,self,duplicate_wormhole_out,"WormholeOutId has","WormholeOutIds have");
+		write_bespoke_error!(f,self,wormhole_in_id_parse_int,"WormholeInId","WormholeInIds","failed to parse",context,error);
+		write_bespoke_error!(f,self,jump_limit_parse_int,"jump limit","jump limits","failed to parse",context,error);
+		Ok(())
+	}
+}
+
+/// A Decal was missing required properties
+#[derive(Debug)]
+pub struct InstancePath(pub String);
+
+impl core::fmt::Display for InstancePath{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		self.0.fmt(f)
+	}
+}
+
+impl InstancePath{
+	pub fn new(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->InstancePath{
+		let mut names:Vec<_>=core::iter::successors(
+			Some(instance),
+			|i|dom.get_by_ref(i.parent())
+		).map(
+			|i|i.name.as_str()
+		).collect();
+		// discard the name of the root object
+		names.pop();
+		names.reverse();
+		InstancePath(names.join("."))
+	}
+}
+
+#[derive(Debug)]
+pub struct ParseIntContext{
+	pub context:String,
+	pub error:ParseIntError,
+}
+impl ParseIntContext{
+	pub fn parse<T:core::str::FromStr<Err=ParseIntError>>(input:&str)->Result<T,Self>{
+		input.parse().map_err(|error|ParseIntContext{
+			context:input.to_owned(),
+			error,
+		})
+	}
+}
+
+#[derive(Debug)]
+pub struct NormalIdError{
+	pub path:InstancePath,
+	pub normal_id:u32,
+}
+
+#[derive(Debug)]
+pub struct ShapeError{
+	pub path:InstancePath,
+	pub shape:u32,
+}
+
+#[derive(Debug)]
+pub enum CFrameErrorType{
+	ZeroDeterminant,
+	Convert(FixedFromFloatError),
+}
+impl core::fmt::Display for CFrameErrorType{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+
+#[derive(Debug)]
+pub struct CFrameError{
+	pub path:InstancePath,
+	pub error:CFrameErrorType,
+}
+
+#[derive(Debug)]
+pub struct Planar64ConvertError{
+	pub path:InstancePath,
+	pub error:Planar64TryFromFloatError,
+}
+
+#[derive(Debug,Hash,Eq,PartialEq)]
+pub struct DuplicateStageError{
+	pub mode_id:ModeId,
+	pub stage_id:StageId,
+}
+impl core::fmt::Display for DuplicateStageError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{}-Spawn{}",self.mode_id,self.stage_id.get())
+	}
+}

lib/rbx_loader/src/lib.rs

@@ -1,9 +1,15 @@
 use std::io::Read;
 use rbx_dom_weak::WeakDom;
+use roblox_emulator::context::Context;
+use strafesnet_common::map::CompleteMap;
 use strafesnet_deferred_loader::deferred_loader::{LoadFailureMode,MeshDeferredLoader,RenderConfigDeferredLoader};
 
+pub use error::RecoverableErrors;
+pub use roblox_emulator::runner::Error as RunnerError;
+
 mod rbx;
 mod mesh;
+mod error;
 mod union;
 pub mod loader;
 mod primitives;
@@ -27,13 +33,7 @@ impl Model{
 	fn new(dom:WeakDom)->Self{
 		Self{dom}
 	}
-	pub fn into_place(self)->Place{
-		let Self{mut dom}=self;
-		let context=roblox_emulator::context::Context::from_mut(&mut dom);
-		let services=context.convert_into_place();
-		Place{dom,services}
-	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<strafesnet_common::map::CompleteMap,LoadError>{
+	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<(CompleteMap,RecoverableErrors),LoadError>{
 		to_snf(self,failure_mode)
 	}
 }
@@ -44,36 +44,43 @@ impl AsRef<WeakDom> for Model{
 }
 
 pub struct Place{
-	dom:WeakDom,
-	services:roblox_emulator::context::Services,
+	context:Context,
 }
 impl Place{
-	pub fn new(dom:WeakDom)->Option<Self>{
-		let context=roblox_emulator::context::Context::from_ref(&dom);
-		Some(Self{
-			services:context.find_services()?,
-			dom,
+	pub fn new(dom:WeakDom)->Result<Self,roblox_emulator::context::ServicesError>{
+		let context=Context::from_place(dom)?;
+		Ok(Self{
+			context,
 		})
 	}
-	pub fn run_scripts(&mut self){
-		let Place{dom,services}=self;
-		let runner=roblox_emulator::runner::Runner::new().unwrap();
-		let context=roblox_emulator::context::Context::from_mut(dom);
+	pub fn run_scripts(&mut self)->Result<Vec<RunnerError>,RunnerError>{
+		let Place{context}=self;
+		let runner=roblox_emulator::runner::Runner::new()?;
 		let scripts=context.scripts();
-		let runnable=runner.runnable_context_with_services(context,services).unwrap();
+		let runnable=runner.runnable_context(context)?;
+		let mut errors=Vec::new();
 		for script in scripts{
 			if let Err(e)=runnable.run_script(script){
-				println!("runner error: {e}");
+				errors.push(e);
 			}
 		}
+		Ok(errors)
 	}
-	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<strafesnet_common::map::CompleteMap,LoadError>{
+	pub fn to_snf(&self,failure_mode:LoadFailureMode)->Result<(CompleteMap,RecoverableErrors),LoadError>{
 		to_snf(self,failure_mode)
 	}
 }
 impl AsRef<WeakDom> for Place{
 	fn as_ref(&self)->&WeakDom{
-		&self.dom
+		self.context.as_ref()
+	}
+}
+impl From<Model> for Place{
+	fn from(model:Model)->Self{
+		let context=Context::from_model(model.dom);
+		Self{
+			context,
+		}
 	}
 }
 
@@ -94,9 +101,9 @@ impl std::error::Error for ReadError{}
 pub fn read<R:Read>(input:R)->Result<Model,ReadError>{
 	let mut buf=std::io::BufReader::new(input);
 	let peek=std::io::BufRead::fill_buf(&mut buf).map_err(ReadError::Io)?;
-	match &peek[0..8]{
-		b"<roblox!"=>rbx_binary::from_reader(buf).map(Model::new).map_err(ReadError::RbxBinary),
-		b"<roblox "=>rbx_xml::from_reader_default(buf).map(Model::new).map_err(ReadError::RbxXml),
+	match peek.get(0..8){
+		Some(b"<roblox!")=>rbx_binary::from_reader(buf).map(Model::new).map_err(ReadError::RbxBinary),
+		Some(b"<roblox ")=>rbx_xml::from_reader_default(buf).map(Model::new).map_err(ReadError::RbxXml),
 		_=>Err(ReadError::UnknownFileFormat),
 	}
 }
@@ -123,7 +130,7 @@ impl From<loader::MeshError> for LoadError{
 	}
 }
 
-fn to_snf(dom:impl AsRef<WeakDom>,failure_mode:LoadFailureMode)->Result<strafesnet_common::map::CompleteMap,LoadError>{
+fn to_snf(dom:impl AsRef<WeakDom>,failure_mode:LoadFailureMode)->Result<(CompleteMap,RecoverableErrors),LoadError>{
 	let dom=dom.as_ref();
 
 	let mut texture_deferred_loader=RenderConfigDeferredLoader::new();
@@ -143,7 +150,5 @@ fn to_snf(dom:impl AsRef<WeakDom>,failure_mode:LoadFailureMode)->Result<strafesn
 	let mut texture_loader=loader::TextureLoader::new();
 	let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,failure_mode).map_err(LoadError::Texture)?;
 
-	let map=map_step2.add_render_configs_and_textures(render_configs);
-
-	Ok(map)
+	Ok(map_step2.add_render_configs_and_textures(render_configs))
 }

lib/rbx_loader/src/loader.rs

@@ -4,7 +4,12 @@ use strafesnet_common::model::Mesh;
 use strafesnet_deferred_loader::{loader::Loader,texture::Texture};
 
 use crate::data::RobloxMeshBytes;
-use crate::rbx::RobloxFaceTextureDescription;
+use crate::rbx::RobloxPartDescription;
+
+// disallow non-static lifetimes
+fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
+	rbx_dom_weak::ustr(s)
+}
 
 fn read_entire_file(path:impl AsRef<std::path::Path>)->Result<Vec<u8>,std::io::Error>{
 	let mut file=std::fs::File::open(path)?;
@@ -13,7 +18,6 @@ fn read_entire_file(path:impl AsRef<std::path::Path>)->Result<Vec<u8>,std::io::E
 	Ok(data)
 }
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum TextureError{
 	Io(std::io::Error),
@@ -36,17 +40,17 @@ impl From<RobloxAssetIdParseErr> for TextureError{
 	}
 }
 
-pub struct TextureLoader<'a>(std::marker::PhantomData<&'a ()>);
-impl TextureLoader<'_>{
+pub struct TextureLoader;
+impl TextureLoader{
 	pub fn new()->Self{
-		Self(std::marker::PhantomData)
+		Self
 	}
 }
-impl<'a> Loader for TextureLoader<'a>{
+impl Loader for TextureLoader{
 	type Error=TextureError;
-	type Index=&'a str;
+	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)?;
@@ -54,7 +58,6 @@ impl<'a> Loader for TextureLoader<'a>{
 	}
 }
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum MeshError{
 	Io(std::io::Error),
@@ -104,7 +107,7 @@ pub enum MeshType<'a>{
 		mesh_data:&'a [u8],
 		physics_data:&'a [u8],
 		size_float_bits:[u32;3],
-		part_texture_description:[Option<RobloxFaceTextureDescription>;6],
+		part_texture_description:RobloxPartDescription,
 	},
 }
 #[derive(Hash,Eq,PartialEq)]
@@ -113,7 +116,7 @@ pub struct MeshIndex<'a>{
 	content:&'a str,
 }
 impl MeshIndex<'_>{
-	pub fn file_mesh(content:&str)->MeshIndex{
+	pub fn file_mesh(content:&str)->MeshIndex<'_>{
 		MeshIndex{
 			mesh_type:MeshType::FileMesh,
 			content,
@@ -124,7 +127,7 @@ impl MeshIndex<'_>{
 		mesh_data:&'a [u8],
 		physics_data:&'a [u8],
 		size:&rbx_dom_weak::types::Vector3,
-		part_texture_description:crate::rbx::RobloxPartDescription,
+		part_texture_description:RobloxPartDescription,
 	)->MeshIndex<'a>{
 		MeshIndex{
 			mesh_type:MeshType::Union{
@@ -138,17 +141,23 @@ impl MeshIndex<'_>{
 	}
 }
 
-pub struct MeshLoader<'a>(std::marker::PhantomData<&'a ()>);
-impl MeshLoader<'_>{
+#[derive(Clone)]
+pub struct MeshWithSize{
+	pub(crate) mesh:Mesh,
+	pub(crate) size:strafesnet_common::integer::Planar64Vec3,
+}
+
+pub struct MeshLoader;
+impl MeshLoader{
 	pub fn new()->Self{
-		Self(std::marker::PhantomData)
+		Self
 	}
 }
-impl<'a> Loader for MeshLoader<'a>{
+impl Loader for MeshLoader{
 	type Error=MeshError;
-	type Index=MeshIndex<'a>;
-	type Resource=Mesh;
-	fn load(&mut self,index:Self::Index)->Result<Self::Resource,Self::Error>{
+	type Index<'a>=MeshIndex<'a>;
+	type Resource=MeshWithSize;
+	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()?;
@@ -171,12 +180,12 @@ impl<'a> Loader for MeshLoader<'a>{
 						return Err(MeshError::MissingInstance);
 					};
 					if physics_data.is_empty(){
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get("PhysicsData"){
+						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&static_ustr("PhysicsData")){
 							physics_data=data.as_ref();
 						}
 					}
 					if mesh_data.is_empty(){
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get("MeshData"){
+						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&static_ustr("MeshData")){
 							mesh_data=data.as_ref();
 						}
 					}

lib/rbx_loader/src/mesh.rs

@@ -1,9 +1,12 @@
 use std::collections::HashMap;
 
 use rbx_mesh::mesh::{Vertex2,Vertex2Truncated};
-use strafesnet_common::{integer::vec3,model::{self,ColorId,IndexedVertex,NormalId,PolygonGroup,PolygonList,PositionId,RenderConfigId,TextureCoordinateId,VertexId}};
+use strafesnet_common::aabb::Aabb;
+use strafesnet_common::integer::vec3;
+use strafesnet_common::model::{self,ColorId,IndexedVertex,PolygonGroup,PolygonList,RenderConfigId,VertexId};
+
+use crate::loader::MeshWithSize;
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Planar64Vec3(strafesnet_common::integer::Planar64TryFromFloatError),
@@ -16,69 +19,44 @@ impl std::fmt::Display for Error{
 }
 impl std::error::Error for Error{}
 
-fn ingest_vertices2<
-	AcquirePosId,
-	AcquireTexId,
-	AcquireNormalId,
-	AcquireColorId,
-	AcquireVertexId,
->(
+fn ingest_vertices2(
 	vertices:Vec<Vertex2>,
-	acquire_pos_id:&mut AcquirePosId,
-	acquire_tex_id:&mut AcquireTexId,
-	acquire_normal_id:&mut AcquireNormalId,
-	acquire_color_id:&mut AcquireColorId,
-	acquire_vertex_id:&mut AcquireVertexId,
-)->Result<HashMap<rbx_mesh::mesh::VertexId2,VertexId>,Error>
-where
-	AcquirePosId:FnMut([f32;3])->Result<PositionId,Error>,
-	AcquireTexId:FnMut([f32;2])->TextureCoordinateId,
-	AcquireNormalId:FnMut([f32;3])->Result<NormalId,Error>,
-	AcquireColorId:FnMut([f32;4])->ColorId,
-	AcquireVertexId:FnMut(IndexedVertex)->VertexId,
-{
+	mb:&mut model::MeshBuilder,
+)->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
 	Ok(vertices.into_iter().enumerate().map(|(vertex_id,vertex)|Ok((
 		rbx_mesh::mesh::VertexId2(vertex_id as u32),
-		acquire_vertex_id(IndexedVertex{
-			pos:acquire_pos_id(vertex.pos)?,
-			tex:acquire_tex_id(vertex.tex),
-			normal:acquire_normal_id(vertex.norm)?,
-			color:acquire_color_id(vertex.color.map(|f|f as f32/255.0f32))
-		}),
-	))).collect::<Result<_,_>>()?)
+		{
+			let vertex=IndexedVertex{
+				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)?),
+				color:mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)))
+			};
+			mb.acquire_vertex_id(vertex)
+		}
+	))).collect::<Result<_,_>>().map_err(Error::Planar64Vec3)?)
 }
-fn ingest_vertices_truncated2<
-	AcquirePosId,
-	AcquireTexId,
-	AcquireNormalId,
-	AcquireVertexId,
->(
+fn ingest_vertices_truncated2(
 	vertices:Vec<Vertex2Truncated>,
-	acquire_pos_id:&mut AcquirePosId,
-	acquire_tex_id:&mut AcquireTexId,
-	acquire_normal_id:&mut AcquireNormalId,
+	mb:&mut model::MeshBuilder,
 	static_color_id:ColorId,//pick one color and fill everything with it
-	acquire_vertex_id:&mut AcquireVertexId,
-)->Result<HashMap<rbx_mesh::mesh::VertexId2,VertexId>,Error>
-where
-	AcquirePosId:FnMut([f32;3])->Result<PositionId,Error>,
-	AcquireTexId:FnMut([f32;2])->TextureCoordinateId,
-	AcquireNormalId:FnMut([f32;3])->Result<NormalId,Error>,
-	AcquireVertexId:FnMut(IndexedVertex)->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
 	Ok(vertices.into_iter().enumerate().map(|(vertex_id,vertex)|Ok((
 		rbx_mesh::mesh::VertexId2(vertex_id as u32),
-		acquire_vertex_id(IndexedVertex{
-			pos:acquire_pos_id(vertex.pos)?,
-			tex:acquire_tex_id(vertex.tex),
-			normal:acquire_normal_id(vertex.norm)?,
-			color:static_color_id
-		}),
-	))).collect::<Result<_,_>>()?)
+		{
+			let vertex=IndexedVertex{
+				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)?),
+				color:static_color_id,
+			};
+			mb.acquire_vertex_id(vertex)
+		}
+	))).collect::<Result<_,_>>().map_err(Error::Planar64Vec3)?)
 }
 
 fn ingest_faces2_lods3(
@@ -95,123 +73,74 @@ fn ingest_faces2_lods3(
 	))
 }
 
-pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<model::Mesh,Error>{
+pub fn convert(roblox_mesh_bytes:crate::data::RobloxMeshBytes)->Result<MeshWithSize,Error>{
 	//generate that mesh boi
-	let mut unique_pos=Vec::new();
-	let mut pos_id_from=HashMap::new();
-	let mut unique_tex=Vec::new();
-	let mut tex_id_from=HashMap::new();
-	let mut unique_normal=Vec::new();
-	let mut normal_id_from=HashMap::new();
-	let mut unique_color=Vec::new();
-	let mut color_id_from=HashMap::new();
-	let mut unique_vertices=Vec::new();
-	let mut vertex_id_from=HashMap::new();
 	let mut polygon_groups=Vec::new();
-	let mut acquire_pos_id=|pos|{
-		let p=vec3::try_from_f32_array(pos).map_err(Error::Planar64Vec3)?;
-		Ok(PositionId::new(*pos_id_from.entry(p).or_insert_with(||{
-			let pos_id=unique_pos.len();
-			unique_pos.push(p);
-			pos_id
-		}) as u32))
-	};
-	let mut acquire_tex_id=|tex|{
-		let h=bytemuck::cast::<[f32;2],[u32;2]>(tex);
-		TextureCoordinateId::new(*tex_id_from.entry(h).or_insert_with(||{
-			let tex_id=unique_tex.len();
-			unique_tex.push(glam::Vec2::from_array(tex));
-			tex_id
-		}) as u32)
-	};
-	let mut acquire_normal_id=|normal|{
-		let n=vec3::try_from_f32_array(normal).map_err(Error::Planar64Vec3)?;
-		Ok(NormalId::new(*normal_id_from.entry(n).or_insert_with(||{
-			let normal_id=unique_normal.len();
-			unique_normal.push(n);
-			normal_id
-		}) as u32))
-	};
-	let mut acquire_color_id=|color|{
-		let h=bytemuck::cast::<[f32;4],[u32;4]>(color);
-		ColorId::new(*color_id_from.entry(h).or_insert_with(||{
-			let color_id=unique_color.len();
-			unique_color.push(glam::Vec4::from_array(color));
-			color_id
-		}) as u32)
-	};
-	let mut acquire_vertex_id=|vertex:IndexedVertex|{
-		VertexId::new(*vertex_id_from.entry(vertex.clone()).or_insert_with(||{
-			let vertex_id=unique_vertices.len();
-			unique_vertices.push(vertex);
-			vertex_id
-		}) as u32)
-	};
+	let mut mb=model::MeshBuilder::new();
 	match rbx_mesh::read_versioned(roblox_mesh_bytes.cursor()).map_err(Error::RbxMesh)?{
-		rbx_mesh::mesh::VersionedMesh::Version1(mesh)=>{
-			let color_id=acquire_color_id([1.0f32;4]);
+		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).map(|trip|{
-				let mut ingest_vertex1=|vertex:&rbx_mesh::mesh::Vertex1|Ok(acquire_vertex_id(IndexedVertex{
-					pos:acquire_pos_id(vertex.pos)?,
-					tex:acquire_tex_id([vertex.tex[0],vertex.tex[1]]),
-					normal:acquire_normal_id(vertex.norm)?,
-					color:color_id,
-				}));
+				let mut ingest_vertex1=|vertex:&rbx_mesh::mesh::Vertex1|{
+					let vertex=IndexedVertex{
+						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)?),
+						color:color_id,
+					};
+					Ok(mb.acquire_vertex_id(vertex))
+				};
 				Ok(vec![ingest_vertex1(&trip[0])?,ingest_vertex1(&trip[1])?,ingest_vertex1(&trip[2])?])
-			}).collect::<Result<_,_>>()?)));
+			}).collect::<Result<_,_>>().map_err(Error::Planar64Vec3)?)));
 		},
-		rbx_mesh::mesh::VersionedMesh::Version2(mesh)=>{
+		rbx_mesh::mesh::Mesh::V2(mesh)=>{
 			let vertex_id_map=match mesh.header.sizeof_vertex{
 				rbx_mesh::mesh::SizeOfVertex2::Truncated=>{
 					//pick white and make all the vertices white
-					let color_id=acquire_color_id([1.0f32;4]);
-					ingest_vertices_truncated2(mesh.vertices_truncated,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,color_id,&mut acquire_vertex_id)
+					let color_id=mb.acquire_color_id(glam::Vec4::ONE);
+					ingest_vertices_truncated2(mesh.vertices_truncated,&mut mb,color_id)
 				},
-				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_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().map(|face|
 				vec![vertex_id_map[&face.0],vertex_id_map[&face.1],vertex_id_map[&face.2]]
 			).collect())));
 		},
-		rbx_mesh::mesh::VersionedMesh::Version3(mesh)=>{
+		rbx_mesh::mesh::Mesh::V3(mesh)=>{
 			let vertex_id_map=match mesh.header.sizeof_vertex{
 				rbx_mesh::mesh::SizeOfVertex2::Truncated=>{
-					let color_id=acquire_color_id([1.0f32;4]);
-					ingest_vertices_truncated2(mesh.vertices_truncated,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,color_id,&mut acquire_vertex_id)
+					let color_id=mb.acquire_color_id(glam::Vec4::ONE);
+					ingest_vertices_truncated2(mesh.vertices_truncated,&mut mb,color_id)
 				},
-				rbx_mesh::mesh::SizeOfVertex2::Full=>ingest_vertices2(mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_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::VersionedMesh::Version4(mesh)=>{
-			let vertex_id_map=ingest_vertices2(
-				mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_id
-			)?;
+		rbx_mesh::mesh::Mesh::V4(mesh)=>{
+			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::VersionedMesh::Version5(mesh)=>{
-			let vertex_id_map=ingest_vertices2(
-				mesh.vertices,&mut acquire_pos_id,&mut acquire_tex_id,&mut acquire_normal_id,&mut acquire_color_id,&mut acquire_vertex_id
-			)?;
+		rbx_mesh::mesh::Mesh::V5(mesh)=>{
+			let vertex_id_map=ingest_vertices2(mesh.vertices,&mut mb)?;
 			ingest_faces2_lods3(&mut polygon_groups,&vertex_id_map,&mesh.faces,&mesh.lods);
 		},
 	}
-	Ok(model::Mesh{
-		unique_pos,
-		unique_normal,
-		unique_tex,
-		unique_color,
-		unique_vertices,
+	let mesh=mb.build(
 		polygon_groups,
 		//these should probably be moved to the model...
 		//but what if models want to use the same texture
-		graphics_groups:vec![model::IndexedGraphicsGroup{
+		vec![model::IndexedGraphicsGroup{
 			render:RenderConfigId::new(0),
 			//the lowest lod is highest quality
 			groups:vec![model::PolygonGroupId::new(0)]
 		}],
 		//disable physics
-		physics_groups:Vec::new(),
-	})
+		Vec::new(),
+	);
+	let mut aabb=Aabb::default();
+	for &point in &mesh.unique_pos{
+		aabb.grow(point);
+	}
+	Ok(MeshWithSize{mesh,size:aabb.size()})
 }

lib/rbx_loader/src/primitives.rs

@@ -1,5 +1,6 @@
-use strafesnet_common::model::{Color4,TextureCoordinate,Mesh,IndexedGraphicsGroup,IndexedPhysicsGroup,IndexedVertex,PolygonGroupId,PolygonGroup,PolygonList,PositionId,TextureCoordinateId,NormalId,ColorId,VertexId,RenderConfigId};
-use strafesnet_common::integer::{vec3,Planar64Vec3};
+use crate::rbx::{RobloxPartDescription,RobloxWedgeDescription,RobloxCornerWedgeDescription};
+use strafesnet_common::model::{Color4,TextureCoordinate,Mesh,MeshBuilder,IndexedGraphicsGroup,IndexedPhysicsGroup,IndexedVertex,PolygonGroupId,PolygonGroup,PolygonList,PositionId,TextureCoordinateId,NormalId,ColorId,VertexId,RenderConfigId};
+use strafesnet_common::integer::{vec3,Planar64,Planar64Vec3};
 
 #[derive(Debug)]
 pub enum Primitives{
@@ -9,7 +10,22 @@ pub enum Primitives{
 	Wedge,
 	CornerWedge,
 }
-#[derive(Hash,PartialEq,Eq)]
+#[derive(Debug)]
+pub struct PrimitivesError;
+impl TryFrom<u32> for Primitives{
+	type Error=PrimitivesError;
+	fn try_from(value:u32)->Result<Self,Self::Error>{
+		match value{
+			0=>Ok(Primitives::Sphere),
+			1=>Ok(Primitives::Cube),
+			2=>Ok(Primitives::Cylinder),
+			3=>Ok(Primitives::Wedge),
+			4=>Ok(Primitives::CornerWedge),
+			_=>Err(PrimitivesError),
+		}
+	}
+}
+#[derive(Clone,Copy,Hash,PartialEq,Eq)]
 pub enum CubeFace{
 	Right,
 	Top,
@@ -18,13 +34,29 @@ pub enum CubeFace{
 	Bottom,
 	Front,
 }
+#[derive(Debug)]
+pub struct CubeFaceError;
+impl TryFrom<u32> for CubeFace{
+	type Error=CubeFaceError;
+	fn try_from(value:u32)->Result<Self,Self::Error>{
+		match value{
+			0=>Ok(CubeFace::Right),
+			1=>Ok(CubeFace::Top),
+			2=>Ok(CubeFace::Back),
+			3=>Ok(CubeFace::Left),
+			4=>Ok(CubeFace::Bottom),
+			5=>Ok(CubeFace::Front),
+			_=>Err(CubeFaceError),
+		}
+	}
+}
 const CUBE_DEFAULT_TEXTURE_COORDS:[TextureCoordinate;4]=[
 	TextureCoordinate::new(0.0,0.0),
 	TextureCoordinate::new(1.0,0.0),
 	TextureCoordinate::new(1.0,1.0),
 	TextureCoordinate::new(0.0,1.0),
 ];
-const CUBE_DEFAULT_VERTICES:[Planar64Vec3;8]=[
+pub const CUBE_DEFAULT_VERTICES:[Planar64Vec3;8]=[
 	vec3::int(-1,-1, 1),//0 left bottom back
 	vec3::int( 1,-1, 1),//1 right bottom back
 	vec3::int( 1, 1, 1),//2 right top back
@@ -34,7 +66,7 @@ const CUBE_DEFAULT_VERTICES:[Planar64Vec3;8]=[
 	vec3::int( 1,-1,-1),//6 right bottom front
 	vec3::int(-1,-1,-1),//7 left bottom front
 ];
-const CUBE_DEFAULT_NORMALS:[Planar64Vec3;6]=[
+pub const CUBE_DEFAULT_NORMALS:[Planar64Vec3;6]=[
 	vec3::int( 1, 0, 0),//CubeFace::Right
 	vec3::int( 0, 1, 0),//CubeFace::Top
 	vec3::int( 0, 0, 1),//CubeFace::Back
@@ -43,103 +75,36 @@ const CUBE_DEFAULT_NORMALS:[Planar64Vec3;6]=[
 	vec3::int( 0, 0,-1),//CubeFace::Front
 ];
 
-#[derive(Hash,PartialEq,Eq)]
-pub enum WedgeFace{
-	Right,
-	TopFront,
-	Back,
-	Left,
-	Bottom,
-}
-const WEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
-	vec3::int( 1, 0, 0),//Wedge::Right
-	vec3::int( 0, 1,-1),//Wedge::TopFront
-	vec3::int( 0, 0, 1),//Wedge::Back
-	vec3::int(-1, 0, 0),//Wedge::Left
-	vec3::int( 0,-1, 0),//Wedge::Bottom
-];
-/*
-local cornerWedgeVerticies = {
-	Vector3.new(-1/2,-1/2,-1/2),7
-	Vector3.new(-1/2,-1/2, 1/2),0
-	Vector3.new( 1/2,-1/2,-1/2),6
-	Vector3.new( 1/2,-1/2, 1/2),1
-	Vector3.new( 1/2, 1/2,-1/2),5
-}
-*/
-#[derive(Hash,PartialEq,Eq)]
-pub enum CornerWedgeFace{
-	Right,
-	TopBack,
-	TopLeft,
-	Bottom,
-	Front,
-}
-const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
-	vec3::int( 1, 0, 0),//CornerWedge::Right
-	vec3::int( 0, 1, 1),//CornerWedge::BackTop
-	vec3::int(-1, 1, 0),//CornerWedge::LeftTop
-	vec3::int( 0,-1, 0),//CornerWedge::Bottom
-	vec3::int( 0, 0,-1),//CornerWedge::Front
-];
-#[derive(Default)]
-pub struct CubeFaceDescription([Option<FaceDescription>;6]);
+pub struct CubeFaceDescription([FaceDescription;Self::FACES]);
 impl CubeFaceDescription{
-	pub fn insert(&mut self,index:CubeFace,value:FaceDescription){
-		self.0[index as usize]=Some(value);
-	}
-	pub fn pairs(self)->impl Iterator<Item=(usize,FaceDescription)>{
-		self.0.into_iter().enumerate().filter_map(|(i,v)|v.map(|u|(i,u)))
+	pub const FACES:usize=6;
+	pub fn new(RobloxPartDescription(part_description):RobloxPartDescription,textureless_render_id:RenderConfigId)->Self{
+		Self(part_description.map(|face_description|match face_description{
+			Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
+			None=>FaceDescription::new_with_render_id(textureless_render_id),
+		}))
 	}
 }
-pub fn unit_cube(render:RenderConfigId)->Mesh{
-	let mut t=CubeFaceDescription::default();
-	t.insert(CubeFace::Right,FaceDescription::new_with_render_id(render));
-	t.insert(CubeFace::Top,FaceDescription::new_with_render_id(render));
-	t.insert(CubeFace::Back,FaceDescription::new_with_render_id(render));
-	t.insert(CubeFace::Left,FaceDescription::new_with_render_id(render));
-	t.insert(CubeFace::Bottom,FaceDescription::new_with_render_id(render));
-	t.insert(CubeFace::Front,FaceDescription::new_with_render_id(render));
-	generate_partial_unit_cube(t)
-}
-#[derive(Default)]
-pub struct WedgeFaceDescription([Option<FaceDescription>;5]);
+pub struct WedgeFaceDescription([FaceDescription;Self::FACES]);
 impl WedgeFaceDescription{
-	pub fn insert(&mut self,index:WedgeFace,value:FaceDescription){
-		self.0[index as usize]=Some(value);
-	}
-	pub fn pairs(self)->std::iter::FilterMap<std::iter::Enumerate<std::array::IntoIter<Option<FaceDescription>,5>>,impl FnMut((usize,Option<FaceDescription>))->Option<(usize,FaceDescription)>>{
-		self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
+	pub const FACES:usize=5;
+	pub fn new(RobloxWedgeDescription(part_description):RobloxWedgeDescription,textureless_render_id:RenderConfigId)->Self{
+		Self(part_description.map(|face_description|match face_description{
+			Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
+			None=>FaceDescription::new_with_render_id(textureless_render_id),
+		}))
 	}
 }
-// pub fn unit_wedge(render:RenderConfigId)->Mesh{
-// 	let mut t=WedgeFaceDescription::default();
-// 	t.insert(WedgeFace::Right,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::TopFront,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::Back,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::Left,FaceDescription::new_with_render_id(render));
-// 	t.insert(WedgeFace::Bottom,FaceDescription::new_with_render_id(render));
-// 	generate_partial_unit_wedge(t)
-// }
-#[derive(Default)]
-pub struct CornerWedgeFaceDescription([Option<FaceDescription>;5]);
+pub struct CornerWedgeFaceDescription([FaceDescription;Self::FACES]);
 impl CornerWedgeFaceDescription{
-	pub fn insert(&mut self,index:CornerWedgeFace,value:FaceDescription){
-		self.0[index as usize]=Some(value);
-	}
-	pub fn pairs(self)->std::iter::FilterMap<std::iter::Enumerate<std::array::IntoIter<Option<FaceDescription>,5>>,impl FnMut((usize,Option<FaceDescription>))->Option<(usize,FaceDescription)>>{
-		self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
+	pub const FACES:usize=5;
+	pub fn new(RobloxCornerWedgeDescription(part_description):RobloxCornerWedgeDescription,textureless_render_id:RenderConfigId)->Self{
+		Self(part_description.map(|face_description|match face_description{
+			Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
+			None=>FaceDescription::new_with_render_id(textureless_render_id),
+		}))
 	}
 }
-// pub fn unit_cornerwedge(render:RenderConfigId)->Mesh{
-// 	let mut t=CornerWedgeFaceDescription::default();
-// 	t.insert(CornerWedgeFace::Right,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::TopBack,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::TopLeft,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::Bottom,FaceDescription::new_with_render_id(render));
-// 	t.insert(CornerWedgeFace::Front,FaceDescription::new_with_render_id(render));
-// 	generate_partial_unit_cornerwedge(t)
-// }
 
 #[derive(Clone)]
 pub struct FaceDescription{
@@ -148,7 +113,7 @@ pub struct FaceDescription{
 	pub color:Color4,
 }
 impl FaceDescription{
-	pub fn new_with_render_id(render:RenderConfigId)->Self {
+	pub fn new_with_render_id(render:RenderConfigId)->Self{
 		Self{
 			render,
 			transform:glam::Affine2::IDENTITY,
@@ -156,51 +121,51 @@ impl FaceDescription{
 		}
 	}
 }
-pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
-	const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
+pub const CUBE_DEFAULT_POLYS:[[[u32;2];4];6]=[
 		// right (1, 0, 0)
 		[
-			[6,2,0],//[vertex,tex,norm]
-			[5,1,0],
-			[2,0,0],
-			[1,3,0],
+			[6,2],//[vertex,tex]
+			[5,1],
+			[2,0],
+			[1,3],
 		],
 		// top (0, 1, 0)
 		[
-			[5,3,1],
-			[4,2,1],
-			[3,1,1],
-			[2,0,1],
+			[5,3],
+			[4,2],
+			[3,1],
+			[2,0],
 		],
 		// back (0, 0, 1)
 		[
-			[0,3,2],
-			[1,2,2],
-			[2,1,2],
-			[3,0,2],
+			[0,3],
+			[1,2],
+			[2,1],
+			[3,0],
 		],
 		// left (-1, 0, 0)
 		[
-			[0,2,3],
-			[3,1,3],
-			[4,0,3],
-			[7,3,3],
+			[0,2],
+			[3,1],
+			[4,0],
+			[7,3],
 		],
 		// bottom (0,-1, 0)
 		[
-			[1,1,4],
-			[0,0,4],
-			[7,3,4],
-			[6,2,4],
+			[1,1],
+			[0,0],
+			[7,3],
+			[6,2],
 		],
 		// front (0, 0,-1)
 		[
-			[4,1,5],
-			[5,0,5],
-			[6,3,5],
-			[7,2,5],
+			[4,1],
+			[5,0],
+			[6,3],
+			[7,2],
 		],
 	];
+pub fn unit_cube(CubeFaceDescription(face_descriptions):CubeFaceDescription)->Mesh{
 	let mut generated_pos=Vec::new();
 	let mut generated_tex=Vec::new();
 	let mut generated_normal=Vec::new();
@@ -211,7 +176,7 @@ pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
 	let mut physics_group=IndexedPhysicsGroup::default();
 	let mut transforms=Vec::new();
 	//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
-	for (face_id,face_description) in face_descriptions.pairs(){
+	for (face_id,face_description) in face_descriptions.into_iter().enumerate(){
 		//assume that scanning short lists is faster than hashing.
 		let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
 			transform_index
@@ -238,8 +203,8 @@ pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
 		//push vertices as they are needed
 		let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
 		polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(vec![
-			CUBE_DEFAULT_POLYS[face_id].map(|tup|{
-				let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
+			CUBE_DEFAULT_POLYS[face_id].map(|[pos_id,tex_id]|{
+				let pos=CUBE_DEFAULT_VERTICES[pos_id as usize];
 				let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
 					pos_index
 				}else{
@@ -251,7 +216,7 @@ pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
 				//always push vertex
 				let vertex=IndexedVertex{
 					pos:PositionId::new(pos_index),
-					tex:TextureCoordinateId::new(tup[1]+4*transform_index),
+					tex:TextureCoordinateId::new(tex_id+4*transform_index),
 					normal:NormalId::new(normal_index),
 					color:ColorId::new(color_index),
 				};
@@ -278,42 +243,49 @@ pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->Mesh{
 	}
 }
 //don't think too hard about the copy paste because this is all going into the map tool eventually...
-pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh{
-	const WEDGE_DEFAULT_POLYS:[&[[u32;3]];5]=[
+pub fn unit_wedge(WedgeFaceDescription(face_descriptions):WedgeFaceDescription)->Mesh{
+	const WEDGE_DEFAULT_POLYS:[&[[u32;2]];5]=[
 		// right (1, 0, 0)
 		&[
-			[6,2,0],//[vertex,tex,norm]
-			[2,0,0],
-			[1,3,0],
+			[6,2],//[vertex,tex]
+			[2,0],
+			[1,3],
 		],
 		// FrontTop (0, 1, -1)
 		&[
-			[3,1,1],
-			[2,0,1],
-			[6,3,1],
-			[7,2,1],
+			[3,1],
+			[2,0],
+			[6,3],
+			[7,2],
 		],
 		// back (0, 0, 1)
 		&[
-			[0,3,2],
-			[1,2,2],
-			[2,1,2],
-			[3,0,2],
+			[0,3],
+			[1,2],
+			[2,1],
+			[3,0],
 		],
 		// left (-1, 0, 0)
 		&[
-			[0,2,3],
-			[3,1,3],
-			[7,3,3],
+			[0,2],
+			[3,1],
+			[7,3],
 		],
 		// bottom (0,-1, 0)
 		&[
-			[1,1,4],
-			[0,0,4],
-			[7,3,4],
-			[6,2,4],
+			[1,1],
+			[0,0],
+			[7,3],
+			[6,2],
 		],
 	];
+	const WEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
+		vec3::int( 1, 0, 0),//Wedge::Right
+		vec3::int( 0, 1,-1),//Wedge::TopFront
+		vec3::int( 0, 0, 1),//Wedge::Back
+		vec3::int(-1, 0, 0),//Wedge::Left
+		vec3::int( 0,-1, 0),//Wedge::Bottom
+	];
 	let mut generated_pos=Vec::new();
 	let mut generated_tex=Vec::new();
 	let mut generated_normal=Vec::new();
@@ -324,7 +296,7 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh
 	let mut physics_group=IndexedPhysicsGroup::default();
 	let mut transforms=Vec::new();
 	//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
-	for (face_id,face_description) in face_descriptions.pairs(){
+	for (face_id,face_description) in face_descriptions.into_iter().enumerate(){
 		//assume that scanning short lists is faster than hashing.
 		let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
 			transform_index
@@ -351,8 +323,8 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh
 		//push vertices as they are needed
 		let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
 		polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(vec![
-			WEDGE_DEFAULT_POLYS[face_id].iter().map(|tup|{
-				let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
+			WEDGE_DEFAULT_POLYS[face_id].iter().map(|&[pos_id,tex_id]|{
+				let pos=CUBE_DEFAULT_VERTICES[pos_id as usize];
 				let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
 					pos_index
 				}else{
@@ -364,7 +336,7 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh
 				//always push vertex
 				let vertex=IndexedVertex{
 					pos:PositionId::new(pos_index),
-					tex:TextureCoordinateId::new(tup[1]+4*transform_index),
+					tex:TextureCoordinateId::new(tex_id+4*transform_index),
 					normal:NormalId::new(normal_index),
 					color:ColorId::new(color_index),
 				};
@@ -391,40 +363,47 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh
 	}
 }
 
-pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescription)->Mesh{
-	const CORNERWEDGE_DEFAULT_POLYS:[&[[u32;3]];5]=[
+pub fn unit_cornerwedge(CornerWedgeFaceDescription(face_descriptions):CornerWedgeFaceDescription)->Mesh{
+	const CORNERWEDGE_DEFAULT_POLYS:[&[[u32;2]];5]=[
 		// right (1, 0, 0)
 		&[
-			[6,2,0],//[vertex,tex,norm]
-			[5,1,0],
-			[1,3,0],
+			[6,2],//[vertex,tex]
+			[5,1],
+			[1,3],
 		],
 		// BackTop (0, 1, 1)
 		&[
-			[5,3,1],
-			[0,1,1],
-			[1,0,1],
+			[5,3],
+			[0,1],
+			[1,0],
 		],
 		// LeftTop (-1, 1, 0)
 		&[
-			[5,3,2],
-			[7,2,2],
-			[0,1,2],
+			[5,3],
+			[7,2],
+			[0,1],
 		],
 		// bottom (0,-1, 0)
 		&[
-			[1,1,3],
-			[0,0,3],
-			[7,3,3],
-			[6,2,3],
+			[1,1],
+			[0,0],
+			[7,3],
+			[6,2],
 		],
 		// front (0, 0,-1)
 		&[
-			[5,0,4],
-			[6,3,4],
-			[7,2,4],
+			[5,0],
+			[6,3],
+			[7,2],
 		],
 	];
+	const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
+		vec3::int( 1, 0, 0),//CornerWedge::Right
+		vec3::int( 0, 1, 1),//CornerWedge::BackTop
+		vec3::int(-1, 1, 0),//CornerWedge::LeftTop
+		vec3::int( 0,-1, 0),//CornerWedge::Bottom
+		vec3::int( 0, 0,-1),//CornerWedge::Front
+	];
 	let mut generated_pos=Vec::new();
 	let mut generated_tex=Vec::new();
 	let mut generated_normal=Vec::new();
@@ -435,7 +414,7 @@ pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescri
 	let mut physics_group=IndexedPhysicsGroup::default();
 	let mut transforms=Vec::new();
 	//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
-	for (face_id,face_description) in face_descriptions.pairs(){
+	for (face_id,face_description) in face_descriptions.into_iter().enumerate(){
 		//assume that scanning short lists is faster than hashing.
 		let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
 			transform_index
@@ -462,8 +441,8 @@ pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescri
 		//push vertices as they are needed
 		let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
 		polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(vec![
-			CORNERWEDGE_DEFAULT_POLYS[face_id].iter().map(|tup|{
-				let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
+			CORNERWEDGE_DEFAULT_POLYS[face_id].iter().map(|&[pos_id,tex_id]|{
+				let pos=CUBE_DEFAULT_VERTICES[pos_id as usize];
 				let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
 					pos_index
 				}else{
@@ -475,7 +454,7 @@ pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescri
 				//always push vertex
 				let vertex=IndexedVertex{
 					pos:PositionId::new(pos_index),
-					tex:TextureCoordinateId::new(tup[1]+4*transform_index),
+					tex:TextureCoordinateId::new(tex_id+4*transform_index),
 					normal:NormalId::new(normal_index),
 					color:ColorId::new(color_index),
 				};
@@ -501,3 +480,133 @@ pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescri
 		physics_groups:vec![physics_group],
 	}
 }
+
+// TODO: fix face texture orientation
+pub fn unit_cylinder(face_descriptions:CubeFaceDescription)->Mesh{
+	// cylinder is oriented about the x axis
+	// roblox cylinders use projected grid coordinates
+	/// how many grid coordinates to use (positive and negative)
+	const GON:i32=3;
+	/// grid perimeter
+	const POINTS:[[i32;2];4*2*GON as usize]=const{
+		let mut points=[[0;2];{4*2*GON as usize}];
+		let mut i=-GON;
+		while i<GON{
+			points[(i+GON) as usize]=[i,GON];
+			points[(i+GON+1*2*GON) as usize]=[GON,-i];
+			points[(i+GON+2*2*GON) as usize]=[-i,-GON];
+			points[(i+GON+3*2*GON) as usize]=[-GON,i];
+			i+=1;
+		}
+		points
+	};
+
+	let mut mb=MeshBuilder::new();
+	let mut polygon_groups=Vec::with_capacity(CubeFaceDescription::FACES);
+	let mut graphics_groups=Vec::with_capacity(CubeFaceDescription::FACES);
+	let mut physics_group=IndexedPhysicsGroup{groups:Vec::with_capacity(CubeFaceDescription::FACES)};
+	let CubeFaceDescription([right,top,back,left,bottom,front])=face_descriptions;
+
+	macro_rules! end_face{
+		($face_description:expr,$end:expr,$iter:expr)=>{
+			let normal=mb.acquire_normal_id($end);
+			let color=mb.acquire_color_id($face_description.color);
+
+			// single polygon for physics
+			let polygon:Vec<_>=$iter.map(|[x,y]|{
+				let tex=mb.acquire_tex_id(
+					$face_description.transform.transform_point2(
+						(glam::vec2(-x as f32,y as f32).normalize()+1.0)/2.0
+					)
+				);
+				let pos=mb.acquire_pos_id($end+vec3::int(0,-x,y).with_length(Planar64::ONE).divide().wrap_1());
+				mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color})
+			}).collect();
+
+			// fanned polygons for graphics
+			let pos=mb.acquire_pos_id($end);
+			let tex=mb.acquire_tex_id($face_description.transform.transform_point2(glam::Vec2::ONE/2.0));
+			let center=mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color});
+			let polygon_list=(0..POINTS.len()).map(|i|
+				vec![center,polygon[i],polygon[(i+1)%POINTS.len()]]
+			).collect();
+
+			// end face graphics
+			let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(polygon_list)));
+			graphics_groups.push(IndexedGraphicsGroup{
+				render:$face_description.render,
+				groups:vec![group_id],
+			});
+
+			// end face physics
+			let polygon_list=vec![polygon];
+
+			let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(polygon_list)));
+			physics_group.groups.push(group_id);
+		}
+	}
+	macro_rules! tex{
+		($face_description:expr,$tex:expr)=>{{
+			let [x,y]=$tex;
+			$face_description.transform.transform_point2(
+				glam::vec2((x+GON) as f32,(y+GON) as f32)/(2*GON) as f32
+			)
+		}};
+	}
+	macro_rules! barrel_face{
+		($face_description:expr,$loop:ident,$lo_dir:expr,$hi_dir:expr,$tex_0:expr,$tex_1:expr,$tex_2:expr,$tex_3:expr)=>{
+			let mut polygon_list=Vec::with_capacity(CubeFaceDescription::FACES);
+			for $loop in -GON..GON{
+				// lo Z
+				let lz_dir=$lo_dir.with_length(Planar64::ONE).divide().wrap_1();
+				// hi Z
+				let hz_dir=$hi_dir.with_length(Planar64::ONE).divide().wrap_1();
+
+				// pos
+				let lx_lz_pos=mb.acquire_pos_id(vec3::NEG_X+lz_dir);
+				let lx_hz_pos=mb.acquire_pos_id(vec3::NEG_X+hz_dir);
+				let hx_hz_pos=mb.acquire_pos_id(vec3::X+hz_dir);
+				let hx_lz_pos=mb.acquire_pos_id(vec3::X+lz_dir);
+				// tex
+				let lx_lz_tex=mb.acquire_tex_id(tex!($face_description,$tex_0));
+				let lx_hz_tex=mb.acquire_tex_id(tex!($face_description,$tex_1));
+				let hx_hz_tex=mb.acquire_tex_id(tex!($face_description,$tex_2));
+				let hx_lz_tex=mb.acquire_tex_id(tex!($face_description,$tex_3));
+				// norm
+				let lz_norm=mb.acquire_normal_id(lz_dir);
+				let hz_norm=mb.acquire_normal_id(hz_dir);
+				// color
+				let color=mb.acquire_color_id($face_description.color);
+
+				polygon_list.push(vec![
+					mb.acquire_vertex_id(IndexedVertex{pos:lx_lz_pos,tex:lx_lz_tex,normal:lz_norm,color}),
+					mb.acquire_vertex_id(IndexedVertex{pos:lx_hz_pos,tex:lx_hz_tex,normal:hz_norm,color}),
+					mb.acquire_vertex_id(IndexedVertex{pos:hx_hz_pos,tex:hx_hz_tex,normal:hz_norm,color}),
+					mb.acquire_vertex_id(IndexedVertex{pos:hx_lz_pos,tex:hx_lz_tex,normal:lz_norm,color}),
+				]);
+			}
+
+			// push face
+			let group_id=PolygonGroupId::new(polygon_groups.len() as u32);
+			polygon_groups.push(PolygonGroup::PolygonList(PolygonList::new(polygon_list)));
+			graphics_groups.push(IndexedGraphicsGroup{
+				render:$face_description.render,
+				groups:vec![group_id],
+			});
+			physics_group.groups.push(group_id);
+		};
+	}
+
+	end_face!(right, vec3::X,POINTS.into_iter());
+	barrel_face!(top, z,vec3::int(0,GON,z),vec3::int(0,GON,z+1), [GON,z],[GON,z+1],[-GON,z+1],[-GON,z]);
+	barrel_face!(back, y,vec3::int(0,y+1,GON),vec3::int(0,y,GON), [GON,y+1],[GON,y],[-GON,y],[-GON,y+1]);
+	end_face!(left, vec3::NEG_X,POINTS.into_iter().rev());
+	barrel_face!(bottom, z,vec3::int(0,-GON,z+1),vec3::int(0,-GON,z), [-GON,z+1],[-GON,z],[GON,z],[GON,z+1]);
+	barrel_face!(front, y,vec3::int(0,y,-GON),vec3::int(0,y+1,-GON), [-GON,y],[-GON,y+1],[GON,y+1],[GON,y]);
+
+	let physics_groups=vec![physics_group];
+
+	mb.build(polygon_groups,graphics_groups,physics_groups)
+}

lib/rbx_loader/src/union.rs

@@ -1,8 +1,12 @@
-use rbx_mesh::mesh_data::NormalId2 as MeshDataNormalId2;
-use strafesnet_common::model::{self,IndexedVertex,PolygonGroup,PolygonGroupId,PolygonList,RenderConfigId};
+use crate::loader::MeshWithSize;
+use crate::rbx::RobloxPartDescription;
+use crate::primitives::{CUBE_DEFAULT_VERTICES,CUBE_DEFAULT_POLYS,FaceDescription};
+
+use rbx_mesh::mesh_data::{VertexId as MeshDataVertexId,NormalId as MeshDataNormalId,NormalId2 as MeshDataNormalId2,NormalId5 as MeshDataNormalId5};
+use rbx_mesh::physics_data::VertexId as PhysicsDataVertexId;
+use strafesnet_common::model::{self,IndexedVertex,MeshBuilder,PolygonGroup,PolygonGroupId,PolygonList,RenderConfigId,VertexId};
 use strafesnet_common::integer::vec3;
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Block,
@@ -20,7 +24,7 @@ impl std::fmt::Display for Error{
 // wacky state machine to make sure all vertices in a face agree upon what NormalId to use.
 // Roblox duplicates this information per vertex when it should only exist per-face.
 enum MeshDataNormalStatus{
-	Agree(MeshDataNormalId2),
+	Agree(MeshDataNormalId),
 	Conflicting,
 }
 struct MeshDataNormalChecker{
@@ -30,7 +34,7 @@ impl MeshDataNormalChecker{
 	fn new()->Self{
 		Self{status:None}
 	}
-	fn check(&mut self,normal:MeshDataNormalId2){
+	fn check(&mut self,normal:MeshDataNormalId){
 		self.status=match self.status.take(){
 			None=>Some(MeshDataNormalStatus::Agree(normal)),
 			Some(MeshDataNormalStatus::Agree(old_normal))=>{
@@ -43,7 +47,7 @@ impl MeshDataNormalChecker{
 			Some(MeshDataNormalStatus::Conflicting)=>Some(MeshDataNormalStatus::Conflicting),
 		};
 	}
-	fn into_agreed_normal(self)->Option<MeshDataNormalId2>{
+	fn into_agreed_normal(self)->Option<MeshDataNormalId>{
 		self.status.and_then(|status|match status{
 			MeshDataNormalStatus::Agree(normal)=>Some(normal),
 			MeshDataNormalStatus::Conflicting=>None,
@@ -51,18 +55,127 @@ impl MeshDataNormalChecker{
 	}
 }
 
+fn build_mesh2(
+	mb:&mut MeshBuilder,
+	polygon_groups_normal_id:&mut [Vec<Vec<VertexId>>;NORMAL_FACES],
+	cube_face_description:&[Option<FaceDescription>;NORMAL_FACES],
+	mesh:rbx_mesh::mesh_data::Mesh2,
+)->Result<(),Error>{
+	//autoscale to size, idk what roblox is doing with the graphics mesh size
+	let mut pos_min=glam::Vec3::MAX;
+	let mut pos_max=glam::Vec3::MIN;
+	for vertex in &mesh.vertices{
+		let p=vertex.pos.into();
+		pos_min=pos_min.min(p);
+		pos_max=pos_max.max(p);
+	}
+	let graphics_size=pos_max-pos_min;
+	for [MeshDataVertexId(vertex_id0),MeshDataVertexId(vertex_id1),MeshDataVertexId(vertex_id2)] in mesh.faces{
+		let face=[
+			mesh.vertices.get(vertex_id0 as usize).ok_or(Error::MissingVertexId(vertex_id0))?,
+			mesh.vertices.get(vertex_id1 as usize).ok_or(Error::MissingVertexId(vertex_id1))?,
+			mesh.vertices.get(vertex_id2 as usize).ok_or(Error::MissingVertexId(vertex_id2))?,
+		];
+		let mut normal_agreement_checker=MeshDataNormalChecker::new();
+		let face=face.into_iter().map(|vertex|{
+			let MeshDataNormalId2(normal_id)=vertex.normal_id;
+			normal_agreement_checker.check(normal_id);
+			let pos=glam::Vec3::from_array(vertex.pos)/graphics_size;
+			let pos=mb.acquire_pos_id(vec3::try_from_f32_array(pos.to_array())?);
+			let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?);
+			let tex_coord=glam::Vec2::from_array(vertex.tex);
+			let maybe_face_description=&cube_face_description[normal_id as usize-1];
+			let (tex,color)=match maybe_face_description{
+				Some(face_description)=>{
+					// transform texture coordinates and set decal color
+					let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
+					let color=mb.acquire_color_id(face_description.color);
+					(tex,color)
+				},
+				None=>{
+					// texture coordinates don't matter and pass through mesh vertex color
+					let tex=mb.acquire_tex_id(tex_coord);
+					let color=mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)));
+					(tex,color)
+				},
+			};
+			Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
+		}).collect::<Result<Vec<_>,_>>().map_err(Error::Planar64Vec3)?;
+		if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
+			polygon_groups_normal_id[normal_id as usize-1].push(face);
+		}else{
+			panic!("Empty face!");
+		}
+	}
+	Ok(())
+}
+fn build_mesh5(
+	mb:&mut MeshBuilder,
+	polygon_groups_normal_id:&mut [Vec<Vec<VertexId>>;NORMAL_FACES],
+	cube_face_description:&[Option<FaceDescription>;NORMAL_FACES],
+	mesh:rbx_mesh::mesh_data::CSGMDL5,
+)->Result<(),Error>{
+	//autoscale to size, idk what roblox is doing with the graphics mesh size
+	let mut pos_min=glam::Vec3::MAX;
+	let mut pos_max=glam::Vec3::MIN;
+	for &pos in &mesh.positions{
+		let p=pos.into();
+		pos_min=pos_min.min(p);
+		pos_max=pos_max.max(p);
+	}
+	let graphics_size=pos_max-pos_min;
+	for face in mesh.faces.indices.chunks_exact(3){
+		let mut normal_agreement_checker=MeshDataNormalChecker::new();
+		let face=face.into_iter().map(|&vertex_id|{
+			let vertex_index=vertex_id as usize;
+			let &pos=mesh.positions.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &MeshDataNormalId5(normal_id)=mesh.normal_ids.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &norm=mesh.normals.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &tex=mesh.tex.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &color=mesh.colors.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			normal_agreement_checker.check(normal_id);
+			let pos=glam::Vec3::from_array(pos)/graphics_size;
+			let pos=mb.acquire_pos_id(vec3::try_from_f32_array(pos.to_array()).map_err(Error::Planar64Vec3)?);
+			let normal=mb.acquire_normal_id(vec3::try_from_f32_array(norm).map_err(Error::Planar64Vec3)?);
+			let tex_coord=glam::Vec2::from_array(tex);
+			let maybe_face_description=&cube_face_description[normal_id as usize-1];
+			let (tex,color)=match maybe_face_description{
+				Some(face_description)=>{
+					// transform texture coordinates and set decal color
+					let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
+					let color=mb.acquire_color_id(face_description.color);
+					(tex,color)
+				},
+				None=>{
+					// texture coordinates don't matter and pass through mesh vertex color
+					let tex=mb.acquire_tex_id(tex_coord);
+					let color=mb.acquire_color_id(glam::Vec4::from_array(color.map(|f|f as f32/255.0f32)));
+					(tex,color)
+				},
+			};
+			Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
+		}).collect::<Result<Vec<_>,_>>()?;
+		if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
+			polygon_groups_normal_id[normal_id as usize-1].push(face);
+		}else{
+			panic!("Empty face!");
+		}
+	}
+	Ok(())
+}
+
+const NORMAL_FACES:usize=6;
 impl std::error::Error for Error{}
 pub fn convert(
 	roblox_physics_data:&[u8],
 	roblox_mesh_data:&[u8],
 	size:glam::Vec3,
-	part_texture_description:crate::rbx::RobloxPartDescription,
-)->Result<model::Mesh,Error>{
-	const NORMAL_FACES:usize=6;
-	let mut polygon_groups_normal_id=vec![Vec::new();NORMAL_FACES];
+	RobloxPartDescription(part_texture_description):RobloxPartDescription,
+)->Result<MeshWithSize,Error>{
+	let mut polygon_groups_normal_id:[_;NORMAL_FACES]=[vec![],vec![],vec![],vec![],vec![],vec![]];
 
 	// build graphics and physics meshes
-	let mut mb=strafesnet_common::model::MeshBuilder::new();
+	let mut mb=MeshBuilder::new();
 	// graphics
 	let graphics_groups=if !roblox_mesh_data.is_empty(){
 		// create per-face texture coordinate affine transforms
@@ -74,46 +187,12 @@ pub fn convert(
 		let mesh_data=rbx_mesh::read_mesh_data_versioned(
 			std::io::Cursor::new(roblox_mesh_data)
 		).map_err(Error::RobloxMeshData)?;
-		let graphics_mesh=match mesh_data{
+		match mesh_data{
 			rbx_mesh::mesh_data::MeshData::CSGK(_)=>return Err(Error::Block),
-			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::CSGMDL2(mesh_data2))=>mesh_data2.mesh,
-			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::CSGMDL4(mesh_data4))=>mesh_data4.mesh,
+			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V2(mesh_data2))=>build_mesh2(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data2.mesh)?,
+			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V4(mesh_data4))=>build_mesh2(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data4.mesh)?,
+			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V5(mesh_data4))=>build_mesh5(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data4)?,
 		};
-		for [vertex_id0,vertex_id1,vertex_id2] in graphics_mesh.faces{
-			let face=[
-				graphics_mesh.vertices.get(vertex_id0.0 as usize).ok_or(Error::MissingVertexId(vertex_id0.0))?,
-				graphics_mesh.vertices.get(vertex_id1.0 as usize).ok_or(Error::MissingVertexId(vertex_id1.0))?,
-				graphics_mesh.vertices.get(vertex_id2.0 as usize).ok_or(Error::MissingVertexId(vertex_id2.0))?,
-			];
-			let mut normal_agreement_checker=MeshDataNormalChecker::new();
-			let face=face.into_iter().map(|vertex|{
-				normal_agreement_checker.check(vertex.normal_id);
-				let pos=mb.acquire_pos_id(vec3::try_from_f32_array(vertex.pos)?);
-				let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?);
-				let tex_coord=glam::Vec2::from_array(vertex.tex);
-				let maybe_face_description=&cube_face_description[vertex.normal_id as usize-1];
-				let (tex,color)=match maybe_face_description{
-					Some(face_description)=>{
-						// transform texture coordinates and set decal color
-						let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
-						let color=mb.acquire_color_id(face_description.color);
-						(tex,color)
-					},
-					None=>{
-						// texture coordinates don't matter and pass through mesh vertex color
-						let tex=mb.acquire_tex_id(tex_coord);
-						let color=mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)));
-						(tex,color)
-					},
-				};
-				Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
-			}).collect::<Result<Vec<_>,_>>().map_err(Error::Planar64Vec3)?;
-			if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
-				polygon_groups_normal_id[normal_id as usize-1].push(face);
-			}else{
-				panic!("Empty face!");
-			}
-		}
 		(0..NORMAL_FACES).map(|polygon_group_id|{
 			model::IndexedGraphicsGroup{
 				render:cube_face_description[polygon_group_id].as_ref().map_or(RenderConfigId::new(0),|face_description|face_description.render),
@@ -125,7 +204,11 @@ pub fn convert(
 	};
 
 	//physics
-	let physics_convex_meshes=if !roblox_physics_data.is_empty(){
+	let polygon_groups_normal_it=polygon_groups_normal_id.into_iter().map(|faces|
+		// graphics polygon groups (to be rendered)
+		Ok(PolygonGroup::PolygonList(PolygonList::new(faces)))
+	);
+	let polygon_groups:Vec<PolygonGroup>=if !roblox_physics_data.is_empty(){
 		let physics_data=rbx_mesh::read_physics_data_versioned(
 			std::io::Cursor::new(roblox_physics_data)
 		).map_err(Error::RobloxPhysicsData)?;
@@ -134,44 +217,56 @@ pub fn convert(
 			// have not seen this format in practice
 			|rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::Block)
 			=>return Err(Error::Block),
-			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::Meshes(meshes))
+			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::V3(meshes))
+			|rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::V5(meshes))
+			=>meshes.meshes,
+			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::V6(meshes))
+			=>vec![meshes.mesh],
+			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::V7(meshes))
 			=>meshes.meshes,
-			rbx_mesh::physics_data::PhysicsData::CSGPHS(rbx_mesh::physics_data::CSGPHS::PhysicsInfoMesh(pim))
-			=>vec![pim.mesh],
 		};
-		physics_convex_meshes
+		let physics_convex_meshes_it=physics_convex_meshes.into_iter().map(|mesh|{
+			// this can be factored out of the loop but I am lazy
+			let color=mb.acquire_color_id(glam::Vec4::ONE);
+			let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
+			// physics polygon groups (to do physics)
+			Ok(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().map(|[PhysicsDataVertexId(vertex_id0),PhysicsDataVertexId(vertex_id1),PhysicsDataVertexId(vertex_id2)]|{
+				let face=[
+					mesh.vertices.get(vertex_id0 as usize).ok_or(Error::MissingVertexId(vertex_id0))?,
+					mesh.vertices.get(vertex_id1 as usize).ok_or(Error::MissingVertexId(vertex_id1))?,
+					mesh.vertices.get(vertex_id2 as usize).ok_or(Error::MissingVertexId(vertex_id2))?,
+				].map(|v|glam::Vec3::from_slice(v)/size);
+				let vertex_norm=(face[1]-face[0])
+				          .cross(face[2]-face[0]);
+				let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex_norm.to_array()).map_err(Error::Planar64Vec3)?);
+				face.into_iter().map(|vertex_pos|{
+					let pos=mb.acquire_pos_id(vec3::try_from_f32_array(vertex_pos.to_array()).map_err(Error::Planar64Vec3)?);
+					Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
+				}).collect()
+			}).collect::<Result<_,_>>()?)))
+		});
+		polygon_groups_normal_it.chain(physics_convex_meshes_it).collect::<Result<_,_>>()?
 	}else{
-		Vec::new()
-	};
-	let polygon_groups:Vec<PolygonGroup>=polygon_groups_normal_id.into_iter().map(|faces|
-		// graphics polygon groups (to be rendered)
-		Ok(PolygonGroup::PolygonList(PolygonList::new(faces)))
-	).chain(physics_convex_meshes.into_iter().map(|mesh|{
-		// this can be factored out of the loop but I am lazy
-		let color=mb.acquire_color_id(glam::Vec4::ONE);
+		// generate a unit cube as default physics
+		let pos_list=CUBE_DEFAULT_VERTICES.map(|pos|mb.acquire_pos_id(pos>>1));
 		let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
-		// physics polygon groups (to do physics)
-		Ok(PolygonGroup::PolygonList(PolygonList::new(mesh.faces.into_iter().map(|[vertex_id0,vertex_id1,vertex_id2]|{
-			let face=[
-				mesh.vertices.get(vertex_id0.0 as usize).ok_or(Error::MissingVertexId(vertex_id0.0))?,
-				mesh.vertices.get(vertex_id1.0 as usize).ok_or(Error::MissingVertexId(vertex_id1.0))?,
-				mesh.vertices.get(vertex_id2.0 as usize).ok_or(Error::MissingVertexId(vertex_id2.0))?,
-			].map(|v|glam::Vec3::from_slice(v)/size);
-			let vertex_norm=(face[1]-face[0])
-			          .cross(face[2]-face[0]);
-			let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex_norm.to_array()).map_err(Error::Planar64Vec3)?);
-			face.into_iter().map(|vertex_pos|{
-				let pos=mb.acquire_pos_id(vec3::try_from_f32_array(vertex_pos.to_array()).map_err(Error::Planar64Vec3)?);
-				Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
-			}).collect()
-		}).collect::<Result<_,_>>()?)))
-	})).collect::<Result<_,_>>()?;
+		let normal=mb.acquire_normal_id(vec3::ZERO);
+		let color=mb.acquire_color_id(glam::Vec4::ONE);
+		let polygon_group=PolygonGroup::PolygonList(PolygonList::new(CUBE_DEFAULT_POLYS.map(|poly|poly.map(|[pos_id,_]|
+			mb.acquire_vertex_id(IndexedVertex{pos:pos_list[pos_id as usize],tex,normal,color})
+		).to_vec()).to_vec()));
+		polygon_groups_normal_it.chain([Ok(polygon_group)]).collect::<Result<_,_>>()?
+	};
 	let physics_groups=(NORMAL_FACES..polygon_groups.len()).map(|id|model::IndexedPhysicsGroup{
 		groups:vec![PolygonGroupId::new(id as u32)]
 	}).collect();
-	Ok(mb.build(
+	let mesh=mb.build(
 		polygon_groups,
 		graphics_groups,
 		physics_groups,
-	))
+	);
+	Ok(MeshWithSize{
+		mesh,
+		size:vec3::ONE,
+	})
 }

lib/roblox_emulator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "roblox_emulator"
-version = "0.4.7"
+version = "0.5.1"
 edition = "2024"
 repository = "https://git.itzana.me/StrafesNET/strafe-project"
 license = "MIT OR Apache-2.0"
@@ -14,8 +14,8 @@ run-service=[]
 [dependencies]
 glam = "0.30.0"
 mlua = { version = "0.10.1", features = ["luau"] }
-phf = { version = "0.11.2", features = ["macros"] }
-rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
-rbx_reflection = { version = "4.7.0", registry = "strafesnet" }
-rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
-rbx_types = { version = "1.10.0", registry = "strafesnet" }
+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"

lib/roblox_emulator/src/context.rs

@@ -1,93 +1,121 @@
+use crate::util::static_ustr;
 use rbx_dom_weak::{types::Ref,InstanceBuilder,WeakDom};
 
-pub fn class_is_a(class:&str,superclass:&str)->bool{
-	class==superclass
-	||rbx_reflection_database::get().classes.get(class)
-	.is_some_and(|descriptor|
-		descriptor.superclass.as_ref().is_some_and(|class_super|
-			class_is_a(class_super,superclass)
-		)
-	)
+#[derive(Debug)]
+pub enum ServicesError{
+	WorkspaceNotFound,
+}
+impl std::fmt::Display for ServicesError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for ServicesError{}
+
+pub struct Services{
+	pub(crate) game:Ref,
+	pub(crate) workspace:Ref,
 }
 
-#[repr(transparent)]
+impl Services{
+	fn find_services(dom:&WeakDom)->Result<Services,ServicesError>{
+		Ok(Services{
+			workspace:*dom.root().children().iter().find(|&&r|
+				dom.get_by_ref(r).is_some_and(|instance|instance.class=="Workspace")
+			).ok_or(ServicesError::WorkspaceNotFound)?,
+			game:dom.root_ref(),
+		})
+	}
+}
+
+pub type LuaAppData=&'static mut WeakDom;
 pub struct Context{
 	pub(crate)dom:WeakDom,
+	pub(crate)services:Services,
 }
 
 impl Context{
-	pub const fn new(dom:WeakDom)->Self{
-		Self{dom}
+	pub fn from_place(dom:WeakDom)->Result<Context,ServicesError>{
+		let services=Services::find_services(&dom)?;
+		Ok(Self{dom,services})
 	}
-	pub fn script_singleton(source:String)->(Context,crate::runner::instance::Instance,Services){
+	pub fn script_singleton(source:String)->(Context,crate::runner::instance::Instance){
 		let script=InstanceBuilder::new("Script")
 			.with_property("Source",rbx_types::Variant::String(source));
 		let script_ref=script.referent();
-		let mut context=Self::new(WeakDom::new(
+		let dom=WeakDom::new(
 			InstanceBuilder::new("DataModel")
 			.with_child(script)
-		));
-		let services=context.convert_into_place();
-		(context,crate::runner::instance::Instance::new(script_ref),services)
-	}
-	pub fn from_ref(dom:&WeakDom)->&Context{
-		unsafe{&*(dom as *const WeakDom as *const Context)}
-	}
-	pub fn from_mut(dom:&mut WeakDom)->&mut Context{
-		unsafe{&mut *(dom as *mut WeakDom as *mut Context)}
+		);
+		let context=Self::from_model(dom);
+		(context,crate::runner::instance::Instance::new_unchecked(script_ref))
 	}
 	/// Creates an iterator over all items of a particular class.
 	pub fn superclass_iter<'a>(&'a self,superclass:&'a str)->impl Iterator<Item=Ref>+'a{
-		self.dom.descendants().filter(|&instance|
-			class_is_a(instance.class.as_ref(),superclass)
-		).map(|instance|instance.referent())
-	}
-	pub fn scripts(&self)->Vec<crate::runner::instance::Instance>{
-		self.superclass_iter("LuaSourceContainer").map(crate::runner::instance::Instance::new).collect()
-	}
-
-	pub fn find_services(&self)->Option<Services>{
-		Some(Services{
-			workspace:*self.dom.root().children().iter().find(|&&r|
-				self.dom.get_by_ref(r).is_some_and(|instance|instance.class=="Workspace")
-			)?,
-			game:self.dom.root_ref(),
+		let db=rbx_reflection_database::get();
+		let Some(superclass)=db.classes.get(superclass)else{
+			panic!("Invalid class");
+		};
+		self.dom.descendants().filter_map(|instance|{
+			let class=db.classes.get(instance.class.as_str())?;
+			db.has_superclass(class,superclass).then(||instance.referent())
 		})
 	}
-	pub fn convert_into_place(&mut self)->Services{
+	pub fn scripts(&self)->Vec<crate::runner::instance::Instance>{
+		self.superclass_iter("Script")
+			.filter_map(|script_ref|{
+				let script=self.dom.get_by_ref(script_ref)?;
+				if let None|Some(rbx_dom_weak::types::Variant::Bool(false))=script.properties.get(&static_ustr("Disabled")){
+					return Some(crate::runner::instance::Instance::new_unchecked(script_ref));
+				}
+				None
+			})
+			.collect()
+	}
+
+	pub fn from_model(mut dom:WeakDom)->Context{
 		//snapshot root instances
-		let children=self.dom.root().children().to_owned();
+		let children=dom.root().children().to_owned();
 
 		//insert services
-		let game=self.dom.root_ref();
-		let terrain_bldr=InstanceBuilder::new("Terrain");
-		let workspace=self.dom.insert(game,
+		let game=dom.root_ref();
+		let terrain_bldr=InstanceBuilder::new("Terrain")
+		.with_properties([
+			("CFrame",rbx_dom_weak::types::Variant::CFrame(rbx_dom_weak::types::CFrame::new(rbx_dom_weak::types::Vector3::new(0.0,0.0,0.0),rbx_dom_weak::types::Matrix3::identity()))),
+			("Size",rbx_dom_weak::types::Variant::Vector3(rbx_dom_weak::types::Vector3::new(1.0,1.0,1.0))),
+			("Velocity",rbx_dom_weak::types::Variant::Vector3(rbx_dom_weak::types::Vector3::new(0.0,0.0,0.0))),
+			("Transparency",rbx_dom_weak::types::Variant::Float32(0.0)),
+			("Color",rbx_dom_weak::types::Variant::Color3uint8(rbx_dom_weak::types::Color3uint8::new(255,255,255))),
+			("CanCollide",rbx_dom_weak::types::Variant::Bool(true)),
+		]);
+		let workspace=dom.insert(game,
 			InstanceBuilder::new("Workspace")
 				//Set Workspace.Terrain property equal to Terrain
 				.with_property("Terrain",terrain_bldr.referent())
 				.with_child(terrain_bldr)
 		);
-		{
-			//Lowercase and upper case workspace property!
-			let game=self.dom.root_mut();
-			game.properties.insert("workspace".to_owned(),rbx_types::Variant::Ref(workspace));
-			game.properties.insert("Workspace".to_owned(),rbx_types::Variant::Ref(workspace));
-		}
-		self.dom.insert(game,InstanceBuilder::new("Lighting"));
 
 		//transfer original root instances into workspace
 		for instance in children{
-			self.dom.transfer_within(instance,workspace);
+			dom.transfer_within(instance,workspace);
 		}
 
-		Services{
-			game,
-			workspace,
+		{
+			//Lowercase and upper case workspace property!
+			let game=dom.root_mut();
+			// TODO: DELETE THIS!
+			game.properties.insert(static_ustr("workspace"),rbx_types::Variant::Ref(workspace));
+			game.properties.insert(static_ustr("Workspace"),rbx_types::Variant::Ref(workspace));
 		}
+		dom.insert(game,InstanceBuilder::new("Lighting"));
+
+		let services=Services{game,workspace};
+		Self{dom,services}
 	}
 }
 
-pub struct Services{
-	pub game:Ref,
-	pub workspace:Ref,
+impl AsRef<WeakDom> for Context{
+	fn as_ref(&self)->&WeakDom{
+		&self.dom
+	}
 }

lib/roblox_emulator/src/lib.rs

@@ -1,3 +1,4 @@
+mod util;
 pub mod runner;
 pub mod context;
 #[cfg(feature="run-service")]
@@ -5,3 +6,7 @@ pub(crate) mod scheduler;
 
 #[cfg(test)]
 mod tests;
+
+pub mod mlua{
+	pub use mlua::{Result,Error};
+}

lib/roblox_emulator/src/runner/brickcolor.rs

@@ -0,0 +1,59 @@
+use super::color3::Color3;
+
+#[derive(Clone,Copy)]
+pub struct BrickColor(rbx_types::BrickColor);
+impl BrickColor{
+	pub fn from_name(name:&str)->Option<Self>{
+		Some(BrickColor(rbx_types::BrickColor::from_name(name)?))
+	}
+	pub fn from_number(number:u16)->Option<Self>{
+		Some(BrickColor(rbx_types::BrickColor::from_number(number)?))
+	}
+}
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let table=lua.create_table()?;
+
+	table.raw_set("new",
+		lua.create_function(|_,r:mlua::Value|
+			match r{
+				mlua::Value::String(name)=>Ok(BrickColor::from_name(&*name.to_str()?)),
+				mlua::Value::Integer(number)=>Ok(BrickColor::from_number(number as u16)),
+				_=>Err(mlua::Error::runtime("Unsupported arguments"))
+			}
+
+		)?
+	)?;
+
+	macro_rules! brickcolor_constructor{
+		($fname:expr,$internal:ident)=>{
+			table.raw_set($fname,
+				lua.create_function(|_,_:()|
+					Ok(BrickColor(rbx_types::BrickColor::$internal))
+				)?
+			)?;
+		};
+	}
+	brickcolor_constructor!("White",White);
+	brickcolor_constructor!("Gray",MediumStoneGrey);
+	brickcolor_constructor!("DarkGray",DarkStoneGrey);
+	brickcolor_constructor!("Black",Black);
+	brickcolor_constructor!("Red",BrightRed);
+	brickcolor_constructor!("Yellow",BrightYellow);
+	brickcolor_constructor!("Green",DarkGreen);
+	brickcolor_constructor!("Blue",BrightBlue);
+
+	globals.set("BrickColor",table)?;
+
+	Ok(())
+}
+
+impl mlua::UserData for BrickColor{
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
+		fields.add_field_method_get("Color",|_,BrickColor(this)|{
+			let rbx_types::Color3uint8{r,g,b}=this.to_color3uint8();
+			Ok(Color3::from_rgb(r,g,b))
+		});
+	}
+}
+type_from_lua_userdata!(BrickColor);

lib/roblox_emulator/src/runner/cframe.rs

@@ -1,7 +1,10 @@
+use mlua::FromLua;
+
+use super::number::Number;
 use super::vector3::Vector3;
 
 #[derive(Clone,Copy)]
-pub struct CFrame(pub(crate)glam::Affine3A);
+pub struct CFrame(glam::Affine3A);
 
 impl CFrame{
 	pub fn new(
@@ -34,14 +37,14 @@ fn vec3_from_glam(v:rbx_types::Vector3)->glam::Vec3A{
 	glam::vec3a(v.x,v.y,v.z)
 }
 
-impl Into<rbx_types::CFrame> for CFrame{
-	fn into(self)->rbx_types::CFrame{
+impl From<CFrame> for rbx_types::CFrame{
+	fn from(CFrame(cf):CFrame)->rbx_types::CFrame{
 		rbx_types::CFrame::new(
-			vec3_to_glam(self.0.translation),
+			vec3_to_glam(cf.translation),
 			rbx_types::Matrix3::new(
-				vec3_to_glam(self.0.matrix3.x_axis),
-				vec3_to_glam(self.0.matrix3.y_axis),
-				vec3_to_glam(self.0.matrix3.z_axis),
+				vec3_to_glam(cf.matrix3.x_axis),
+				vec3_to_glam(cf.matrix3.y_axis),
+				vec3_to_glam(cf.matrix3.z_axis),
 			)
 		)
 	}
@@ -60,16 +63,25 @@ impl From<rbx_types::CFrame> for CFrame{
 }
 
 pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let cframe_table=lua.create_table()?;
+	let table=lua.create_table()?;
 
 	//CFrame.new
-	cframe_table.raw_set("new",
-		lua.create_function(|_,tuple:(
-			mlua::Value,mlua::Value,Option<f32>,
-			Option<f32>,Option<f32>,Option<f32>,
-			Option<f32>,Option<f32>,Option<f32>,
-			Option<f32>,Option<f32>,Option<f32>,
+	table.raw_set("new",
+		lua.create_function(|lua,tuple:(
+			mlua::Value,mlua::Value,Option<Number>,
+			Option<Number>,Option<Number>,Option<Number>,
+			Option<Number>,Option<Number>,Option<Number>,
+			Option<Number>,Option<Number>,Option<Number>,
 		)|match tuple{
+			//CFrame.new()
+			(
+				mlua::Value::Nil,mlua::Value::Nil,None,
+				None,None,None,
+				None,None,None,
+				None,None,None,
+			)=>{
+				Ok(CFrame(glam::Affine3A::IDENTITY))
+			},
 			//CFrame.new(pos)
 			(
 				mlua::Value::UserData(pos),mlua::Value::Nil,None,
@@ -77,8 +89,8 @@ pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
 				None,None,None,
 				None,None,None,
 			)=>{
-				let pos:Vector3=pos.take()?;
-				Ok(CFrame::point(pos.0.x,pos.0.y,pos.0.z))
+				let Vector3(pos):&Vector3=&*pos.borrow()?;
+				Ok(CFrame::point(pos.x,pos.y,pos.z))
 			},
 			//TODO: CFrame.new(pos,look)
 			(
@@ -87,85 +99,99 @@ pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
 				None,None,None,
 				None,None,None,
 			)=>{
-				let _pos:Vector3=pos.take()?;
-				let _look:Vector3=look.take()?;
+				let _pos:&Vector3=&*pos.borrow()?;
+				let _look:&Vector3=&*look.borrow()?;
 				Err(mlua::Error::runtime("Not yet implemented"))
 			},
 			//CFrame.new(x,y,z)
 			(
-				mlua::Value::Number(x),mlua::Value::Number(y),Some(z),
+				x,y,Some(z),
 				None,None,None,
 				None,None,None,
 				None,None,None,
-			)=>Ok(CFrame::point(x as f32,y as f32,z)),
+			)=>Ok(CFrame::point(Number::from_lua(x,lua)?.into(),Number::from_lua(y,lua)?.into(),z.into())),
 			//CFrame.new(x,y,z,xx,yx,zx,xy,yy,zy,xz,yz,zz)
 			(
-				mlua::Value::Number(x),mlua::Value::Number(y),Some(z),
+				x,y,Some(z),
 				Some(xx),Some(yx),Some(zx),
 				Some(xy),Some(yy),Some(zy),
 				Some(xz),Some(yz),Some(zz),
-			)=>Ok(CFrame::new(x as f32,y as f32,z,
-				xx,yx,zx,
-				xy,yy,zy,
-				xz,yz,zz,
+			)=>Ok(CFrame::new(Number::from_lua(x,lua)?.into(),Number::from_lua(y,lua)?.into(),z.into(),
+				xx.into(),yx.into(),zx.into(),
+				xy.into(),yy.into(),zy.into(),
+				xz.into(),yz.into(),zz.into(),
 			)),
 			_=>Err(mlua::Error::runtime("Invalid arguments"))
 		})?
 	)?;
 
 	//CFrame.Angles
-	cframe_table.raw_set("Angles",
-		lua.create_function(|_,(x,y,z):(f32,f32,f32)|
-			Ok(CFrame::angles(x,y,z))
-		)?
+	let from_euler_angles=lua.create_function(|_,(x,y,z):(Number,Number,Number)|
+		Ok(CFrame::angles(x.into(),y.into(),z.into()))
 	)?;
+	table.raw_set("Angles",from_euler_angles.clone())?;
+	table.raw_set("fromEulerAnglesXYZ",from_euler_angles.clone())?;
+	table.raw_set("FromEulerAnglesXYZ",from_euler_angles)?;
 
-	globals.set("CFrame",cframe_table)?;
+	globals.set("CFrame",table)?;
 
 	Ok(())
 }
 
 impl mlua::UserData for CFrame{
 	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
-		//CFrame.p
-		fields.add_field_method_get("p",|_,this|Ok(Vector3(this.0.translation)));
+		fields.add_field_method_get("p",|_,CFrame(this)|Ok(Vector3(this.translation)));
+		fields.add_field_method_get("x",|_,CFrame(this)|Ok(this.translation.x));
+		fields.add_field_method_get("X",|_,CFrame(this)|Ok(this.translation.x));
+		fields.add_field_method_get("y",|_,CFrame(this)|Ok(this.translation.y));
+		fields.add_field_method_get("Y",|_,CFrame(this)|Ok(this.translation.y));
+		fields.add_field_method_get("z",|_,CFrame(this)|Ok(this.translation.z));
+		fields.add_field_method_get("Z",|_,CFrame(this)|Ok(this.translation.z));
+		fields.add_field_method_get("rightVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.x_axis)));
+		fields.add_field_method_get("RightVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.x_axis)));
+		fields.add_field_method_get("upVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.y_axis)));
+		fields.add_field_method_get("UpVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.y_axis)));
+		fields.add_field_method_get("lookVector",|_,CFrame(this)|Ok(Vector3(-this.matrix3.z_axis)));
+		fields.add_field_method_get("LookVector",|_,CFrame(this)|Ok(Vector3(-this.matrix3.z_axis)));
+		fields.add_field_method_get("XVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.row(0))));
+		fields.add_field_method_get("YVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.row(1))));
+		fields.add_field_method_get("ZVector",|_,CFrame(this)|Ok(Vector3(this.matrix3.row(2))));
 	}
 
 	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
-		methods.add_method("components",|_,this,()|Ok((
-			this.0.translation.x,
-			this.0.translation.y,
-			this.0.translation.z,
-			this.0.matrix3.x_axis.x,
-			this.0.matrix3.y_axis.x,
-			this.0.matrix3.z_axis.x,
-			this.0.matrix3.x_axis.y,
-			this.0.matrix3.y_axis.y,
-			this.0.matrix3.z_axis.y,
-			this.0.matrix3.x_axis.z,
-			this.0.matrix3.y_axis.z,
-			this.0.matrix3.z_axis.z,
+		methods.add_method("components",|_,CFrame(this),()|Ok((
+			this.translation.x,
+			this.translation.y,
+			this.translation.z,
+			this.matrix3.x_axis.x,
+			this.matrix3.y_axis.x,
+			this.matrix3.z_axis.x,
+			this.matrix3.x_axis.y,
+			this.matrix3.y_axis.y,
+			this.matrix3.z_axis.y,
+			this.matrix3.x_axis.z,
+			this.matrix3.y_axis.z,
+			this.matrix3.z_axis.z,
 		)));
-		methods.add_method("VectorToWorldSpace",|_,this,v:Vector3|
-			Ok(Vector3(this.0.transform_vector3a(v.0)))
+		methods.add_method("VectorToWorldSpace",|_,CFrame(this),Vector3(v):Vector3|
+			Ok(Vector3(this.transform_vector3a(v)))
 		);
 
-		//methods.add_meta_method(mlua::MetaMethod::Mul,|_,this,val:&Vector3|Ok(Vector3(this.0.matrix3*val.0+this.0.translation)));
-		methods.add_meta_function(mlua::MetaMethod::Mul,|_,(this,val):(Self,Self)|Ok(Self(this.0*val.0)));
-		methods.add_meta_function(mlua::MetaMethod::ToString,|_,this:Self|
+		methods.add_meta_function(mlua::MetaMethod::Mul,|_,(CFrame(this),CFrame(val)):(Self,Self)|Ok(Self(this*val)));
+		methods.add_meta_function(mlua::MetaMethod::ToString,|_,CFrame(this):Self|
 			Ok(format!("CFrame.new({},{},{},{},{},{},{},{},{},{},{},{})",
-				this.0.translation.x,
-				this.0.translation.y,
-				this.0.translation.z,
-				this.0.matrix3.x_axis.x,
-				this.0.matrix3.y_axis.x,
-				this.0.matrix3.z_axis.x,
-				this.0.matrix3.x_axis.y,
-				this.0.matrix3.y_axis.y,
-				this.0.matrix3.z_axis.y,
-				this.0.matrix3.x_axis.z,
-				this.0.matrix3.y_axis.z,
-				this.0.matrix3.z_axis.z,
+				this.translation.x,
+				this.translation.y,
+				this.translation.z,
+				this.matrix3.x_axis.x,
+				this.matrix3.y_axis.x,
+				this.matrix3.z_axis.x,
+				this.matrix3.x_axis.y,
+				this.matrix3.y_axis.y,
+				this.matrix3.z_axis.y,
+				this.matrix3.x_axis.z,
+				this.matrix3.y_axis.z,
+				this.matrix3.z_axis.z,
 			))
 		);
 	}

lib/roblox_emulator/src/runner/color3.rs

@@ -1,3 +1,5 @@
+use super::number::Number;
+
 #[derive(Clone,Copy)]
 pub struct Color3{
 	r:f32,
@@ -8,28 +10,37 @@ impl Color3{
 	pub const fn new(r:f32,g:f32,b:f32)->Self{
 		Self{r,g,b}
 	}
+	pub const fn from_rgb(r:u8,g:u8,b:u8)->Self{
+		Color3::new(r as f32/255.0,g as f32/255.0,b as f32/255.0)
+	}
 }
-impl Into<rbx_types::Color3> for Color3{
-	fn into(self)->rbx_types::Color3{
-		rbx_types::Color3::new(self.r,self.g,self.b)
+impl From<rbx_types::Color3> for Color3{
+	fn from(value:rbx_types::Color3)->Color3{
+		Color3::new(value.r,value.g,value.b)
+	}
+}
+impl From<Color3> for rbx_types::Color3{
+	fn from(value:Color3)->rbx_types::Color3{
+		rbx_types::Color3::new(value.r,value.g,value.b)
 	}
 }
 
 pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let color3_table=lua.create_table()?;
+	let table=lua.create_table()?;
 
-	color3_table.raw_set("new",
-		lua.create_function(|_,(r,g,b):(f32,f32,f32)|
-			Ok(Color3::new(r,g,b))
-		)?
-	)?;
-	color3_table.raw_set("fromRGB",
-		lua.create_function(|_,(r,g,b):(u8,u8,u8)|
-			Ok(Color3::new(r as f32/255.0,g as f32/255.0,b as f32/255.0))
+	table.raw_set("new",
+		lua.create_function(|_,(r,g,b):(Number,Number,Number)|
+			Ok(Color3::new(r.into(),g.into(),b.into()))
 		)?
 	)?;
 
-	globals.set("Color3",color3_table)?;
+	let from_rgb=lua.create_function(|_,(r,g,b):(u8,u8,u8)|
+		Ok(Color3::from_rgb(r,g,b))
+	)?;
+	table.raw_set("fromRGB",from_rgb.clone())?;
+	table.raw_set("FromRGB",from_rgb)?;
+
+	globals.set("Color3",table)?;
 
 	Ok(())
 }

lib/roblox_emulator/src/runner/color_sequence.rs

@@ -1,31 +1,29 @@
-#[derive(Clone,Copy)]
-pub struct ColorSequence{}
+#[derive(Clone)]
+pub struct ColorSequence(rbx_types::ColorSequence);
 impl ColorSequence{
-	pub const fn new()->Self{
-		Self{}
+	pub const fn new(keypoints:Vec<rbx_types::ColorSequenceKeypoint>)->Self{
+		Self(rbx_types::ColorSequence{keypoints})
 	}
 }
-impl Into<rbx_types::ColorSequence> for ColorSequence{
-	fn into(self)->rbx_types::ColorSequence{
-		rbx_types::ColorSequence{
-			keypoints:Vec::new()
-		}
+impl From<ColorSequence> for rbx_types::ColorSequence{
+	fn from(ColorSequence(value):ColorSequence)->rbx_types::ColorSequence{
+		value
 	}
 }
 
 pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let number_sequence_table=lua.create_table()?;
+	let table=lua.create_table()?;
 
-	number_sequence_table.raw_set("new",
+	table.raw_set("new",
 		lua.create_function(|_,_:mlua::MultiValue|
-			Ok(ColorSequence::new())
+			Ok(ColorSequence::new(Vec::new()))
 		)?
 	)?;
 
-	globals.set("ColorSequence",number_sequence_table)?;
+	globals.set("ColorSequence",table)?;
 
 	Ok(())
 }
 
 impl mlua::UserData for ColorSequence{}
-type_from_lua_userdata!(ColorSequence);
+type_from_lua_userdata_clone!(ColorSequence);

lib/roblox_emulator/src/runner/enum.rs

@@ -1,63 +1,136 @@
-use mlua::IntoLua;
-
-#[derive(Clone,Copy)]
-pub struct Enum(u32);
-#[derive(Clone,Copy)]
-pub struct EnumItems;
 #[derive(Clone,Copy)]
 pub struct EnumItem<'a>{
-	ed:&'a rbx_reflection::EnumDescriptor<'a>,
+	name:Option<&'a str>,
+	value:u32,
 }
-
-impl Into<rbx_types::Enum> for Enum{
-	fn into(self)->rbx_types::Enum{
-		rbx_types::Enum::from_u32(self.0)
+impl<'a> EnumItem<'a>{
+	fn known_name((name,&value):(&'a std::borrow::Cow<'a,str>,&u32))->Self{
+		Self{name:Some(name.as_ref()),value}
+	}
+}
+impl<'a> From<rbx_types::Enum> for EnumItem<'a>{
+	fn from(e:rbx_types::Enum)->Self{
+		EnumItem{
+			name:None,
+			value:e.to_u32(),
+		}
+	}
+}
+impl From<EnumItem<'_>> for rbx_types::Enum{
+	fn from(e:EnumItem)->rbx_types::Enum{
+		rbx_types::Enum::from_u32(e.value)
+	}
+}
+impl PartialEq for EnumItem<'_>{
+	fn eq(&self,other:&EnumItem<'_>)->bool{
+		self.value==other.value&&{
+			// if both names are known, they must match, otherwise whatever
+			match (self.name,other.name){
+				(Some(lhs),Some(rhs))=>lhs==rhs,
+				_=>true,
+			}
+		}
 	}
 }
 
-impl<'a> EnumItem<'a>{
-	const fn new(ed:&'a rbx_reflection::EnumDescriptor)->Self{
-		Self{ed}
+#[derive(Clone,Copy)]
+pub struct Enums;
+impl Enums{
+	pub fn get(&self,index:&str)->Option<EnumItems<'static>>{
+		let db=rbx_reflection_database::get();
+		db.enums.get(index).map(|ed|EnumItems{ed})
+	}
+}
+#[derive(Clone,Copy)]
+pub struct EnumItems<'a>{
+	ed:&'a rbx_reflection::EnumDescriptor<'a>,
+}
+
+impl<'a> EnumItems<'a>{
+	pub fn from_value(&self,value:u32)->Option<EnumItem<'a>>{
+		self.ed.items.iter().find(|&(_,&v)|v==value).map(EnumItem::known_name)
+	}
+	pub fn from_name(&self,name:&str)->Option<EnumItem<'a>>{
+		self.ed.items.get_key_value(name).map(EnumItem::known_name)
+	}
+	pub fn from_enum(&self,enum_item:EnumItem)->Option<EnumItem<'a>>{
+		match enum_item.name{
+			Some(s)=>{
+				let got=self.from_name(s)?;
+				(got.value==enum_item.value).then_some(got)
+			},
+			None=>self.from_value(enum_item.value)
+		}
+	}
+}
+
+pub enum CoerceEnum<'a>{
+	Integer(i32),
+	String(mlua::String),
+	Enum(EnumItem<'a>),
+}
+impl CoerceEnum<'_>{
+	pub fn coerce_to<'a>(self,enum_items:EnumItems<'a>)->mlua::Result<EnumItem<'a>>{
+		match self{
+			CoerceEnum::Integer(int)=>enum_items.from_value(int as u32),
+			CoerceEnum::String(s)=>enum_items.from_name(&*s.to_str()?),
+			CoerceEnum::Enum(enum_item)=>enum_items.from_enum(enum_item),
+		}.ok_or_else(||mlua::Error::runtime(format!("Bad {} EnumItem",enum_items.ed.name)))
+	}
+}
+
+impl mlua::FromLua for CoerceEnum<'_>{
+	fn from_lua(value:mlua::Value,_lua:&mlua::Lua)->Result<Self,mlua::Error>{
+		match value{
+			mlua::Value::Integer(int)=>Ok(CoerceEnum::Integer(int)),
+			mlua::Value::String(s)=>Ok(CoerceEnum::String(s)),
+			mlua::Value::UserData(ud)=>Ok(CoerceEnum::Enum(*ud.borrow()?)),
+			other=>Err(mlua::Error::runtime(format!("Expected {} got {:?}",stringify!(Enum),other))),
+		}
 	}
 }
 
 pub fn set_globals(_lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	globals.set("Enum",EnumItems)
+	globals.set("Enum",Enums)
 }
 
-impl mlua::UserData for EnumItem<'_>{
+impl mlua::UserData for EnumItems<'static>{
 	fn add_fields<F:mlua::UserDataFields<Self>>(_fields:&mut F){
 	}
 	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
-		methods.add_meta_function(mlua::MetaMethod::Index,|lua,(this,val):(EnumItem<'_>,mlua::String)|{
-			match this.ed.items.get(&*val.to_str()?){
-				Some(&id)=>Enum(id).into_lua(lua),
-				None=>mlua::Value::Nil.into_lua(lua),
-			}
+		methods.add_method("FromName",|_,this:&EnumItems,name:mlua::String|Ok(this.from_name(&*name.to_str()?)));
+		methods.add_method("FromValue",|_,this:&EnumItems,value:u32|Ok(this.from_value(value)));
+		methods.add_method("GetEnumItems",|_,this:&EnumItems,()|->mlua::Result<Vec<EnumItem>>{
+			Ok(this.ed.items.iter().map(EnumItem::known_name).collect())
+		});
+		methods.add_meta_function(mlua::MetaMethod::Index,|_,(this,val):(EnumItems,mlua::String)|{
+			let index=&*val.to_str()?;
+			Ok(this.ed.items.get_key_value(index).map(EnumItem::known_name))
+		});
+	}
+}
+type_from_lua_userdata_lua_lifetime!(EnumItems);
+
+impl mlua::UserData for Enums{
+	fn add_fields<F:mlua::UserDataFields<Self>>(_fields:&mut F){
+	}
+	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
+		methods.add_meta_function(mlua::MetaMethod::Index,|_,(enums,val):(Self,mlua::String)|{
+			Ok(enums.get(&*val.to_str()?))
+		});
+	}
+}
+type_from_lua_userdata!(Enums);
+
+impl mlua::UserData for EnumItem<'_>{
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
+		fields.add_field_method_get("Name",|_,this|Ok(this.name));
+		fields.add_field_method_get("Value",|_,this|Ok(this.value));
+	}
+	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
+		methods.add_meta_function(mlua::MetaMethod::Eq,|_,(lhs,rhs):(EnumItem<'_>,EnumItem<'_>)|{
+			Ok(lhs==rhs)
 		});
 	}
 }
 type_from_lua_userdata_lua_lifetime!(EnumItem);
-
-impl mlua::UserData for EnumItems{
-	fn add_fields<F:mlua::UserDataFields<Self>>(_fields:&mut F){
-	}
-	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
-		methods.add_meta_function(mlua::MetaMethod::Index,|lua,(_,val):(Self,mlua::String)|{
-			let db=rbx_reflection_database::get();
-			match db.enums.get(&*val.to_str()?){
-				Some(ed)=>EnumItem::new(ed).into_lua(lua),
-				None=>mlua::Value::Nil.into_lua(lua),
-			}
-		});
-	}
-}
-type_from_lua_userdata!(EnumItems);
-
-impl mlua::UserData for Enum{
-	fn add_fields<F:mlua::UserDataFields<Self>>(_fields:&mut F){
-	}
-	fn add_methods<M:mlua::UserDataMethods<Self>>(_methods:&mut M){
-	}
-}
-type_from_lua_userdata!(Enum);

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

@@ -2,48 +2,47 @@ use std::collections::{hash_map::Entry,HashMap};
 
 use mlua::{FromLua,FromLuaMulti,IntoLua,IntoLuaMulti};
 use rbx_types::Ref;
-use rbx_dom_weak::{InstanceBuilder,WeakDom};
+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 instance_table=lua.create_table()?;
+	let table=lua.create_table()?;
 
 	//Instance.new
-	instance_table.raw_set("new",
+	table.raw_set("new",
 		lua.create_function(|lua,(class_name,parent):(mlua::String,Option<Instance>)|{
 			let class_name_str=&*class_name.to_str()?;
-			let parent=parent.ok_or_else(||mlua::Error::runtime("Nil Parent not yet supported"))?;
+			let parent_ref=parent.map_or(Ref::none(),|instance|instance.referent);
 			dom_mut(lua,|dom|{
-				//TODO: Nil instances
-				Ok(Instance::new(dom.insert(parent.referent,InstanceBuilder::new(class_name_str))))
+				Ok(Instance::new_unchecked(dom.insert(parent_ref,InstanceBuilder::new(class_name_str))))
 			})
 		})?
 	)?;
 
-	globals.set("Instance",instance_table)?;
+	globals.set("Instance",table)?;
 
 	Ok(())
 }
 
 // LMAO look at this function!
 pub fn dom_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut WeakDom)->mlua::Result<T>)->mlua::Result<T>{
-	let mut dom=lua.app_data_mut::<&'static mut WeakDom>().ok_or_else(||mlua::Error::runtime("DataModel missing"))?;
+	let mut dom=lua.app_data_mut::<crate::context::LuaAppData>().ok_or_else(||mlua::Error::runtime("DataModel missing"))?;
 	f(*dom)
 }
 
-fn coerce_float32(value:&mlua::Value)->Option<f32>{
-	match value{
-		&mlua::Value::Integer(i)=>Some(i as f32),
-		&mlua::Value::Number(f)=>Some(f as f32),
-		_=>None,
-	}
+pub fn class_is_a(class:&str,superclass:&str)->bool{
+	let db=rbx_reflection_database::get();
+	let (Some(class),Some(superclass))=(db.classes.get(class),db.classes.get(superclass))else{
+		return false;
+	};
+	db.has_superclass(class,superclass)
 }
-
 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();
@@ -58,7 +57,7 @@ fn get_full_name(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->S
 pub fn get_name_source(lua:&mlua::Lua,script:Instance)->Result<(String,String),mlua::Error>{
 	dom_mut(lua,|dom|{
 		let instance=script.get(dom)?;
-		let source=match instance.properties.get("Source"){
+		let source=match instance.properties.get(&static_ustr("Source")){
 			Some(rbx_dom_weak::types::Variant::String(s))=>s.clone(),
 			_=>Err(mlua::Error::external("Missing script.Source"))?,
 		};
@@ -80,14 +79,32 @@ pub fn find_first_descendant_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance
 	dom.descendants_of(instance.referent()).find(|&inst|inst.class==class)
 }
 
+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 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|{
+		db.classes.get(inst.class.as_str()).is_some_and(|descriptor|db.has_superclass(descriptor,superclass_descriptor))
+	})
+}
+
 #[derive(Clone,Copy)]
 pub struct Instance{
 	referent:Ref,
 }
 impl Instance{
-	pub const fn new(referent:Ref)->Self{
+	pub const fn new_unchecked(referent:Ref)->Self{
 		Self{referent}
 	}
+	pub fn new(referent:Ref)->Option<Self>{
+		referent.is_some().then_some(Self{referent})
+	}
 	pub fn get<'a>(&self,dom:&'a WeakDom)->mlua::Result<&'a rbx_dom_weak::Instance>{
 		dom.get_by_ref(self.referent).ok_or_else(||mlua::Error::runtime("Instance missing"))
 	}
@@ -97,40 +114,25 @@ impl Instance{
 }
 type_from_lua_userdata!(Instance);
 
-//TODO: update rbx_reflection and use dom.superclasses_iter
-pub struct SuperClassIter<'a> {
-    database: &'a rbx_reflection::ReflectionDatabase<'a>,
-    descriptor: Option<&'a rbx_reflection::ClassDescriptor<'a>>,
-}
-impl<'a> SuperClassIter<'a> {
-    fn next_descriptor(&self) -> Option<&'a rbx_reflection::ClassDescriptor<'a>> {
-        let superclass = self.descriptor?.superclass.as_ref()?;
-        self.database.classes.get(superclass)
-    }
-}
-impl<'a> Iterator for SuperClassIter<'a> {
-    type Item = &'a rbx_reflection::ClassDescriptor<'a>;
-    fn next(&mut self) -> Option<Self::Item> {
-        let next_descriptor = self.next_descriptor();
-        std::mem::replace(&mut self.descriptor, next_descriptor)
-    }
-}
-
 impl mlua::UserData for Instance{
 	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
-		fields.add_field_method_get("Parent",|lua,this|{
+		fn get_parent(lua:&mlua::Lua,this:&Instance)->mlua::Result<Option<Instance>>{
 			dom_mut(lua,|dom|{
 				let instance=this.get(dom)?;
 				Ok(Instance::new(instance.parent()))
 			})
-		});
-		fields.add_field_method_set("Parent",|lua,this,val:Option<Instance>|{
-			let parent=val.ok_or_else(||mlua::Error::runtime("Nil Parent not yet supported"))?;
+		}
+		fields.add_field_method_get("parent",get_parent);
+		fields.add_field_method_get("Parent",get_parent);
+		fn set_parent(lua:&mlua::Lua,this:&mut Instance,new_parent:Option<Instance>)->mlua::Result<()>{
+			let parent_ref=new_parent.map_or(Ref::none(),|instance|instance.referent);
 			dom_mut(lua,|dom|{
-				dom.transfer_within(this.referent,parent.referent);
+				dom.transfer_within(this.referent,parent_ref);
 				Ok(())
 			})
-		});
+		}
+		fields.add_field_method_set("parent",set_parent);
+		fields.add_field_method_set("Parent",set_parent);
 		fields.add_field_method_get("Name",|lua,this|{
 			dom_mut(lua,|dom|{
 				let instance=this.get(dom)?;
@@ -148,22 +150,38 @@ impl mlua::UserData for Instance{
 		fields.add_field_method_get("ClassName",|lua,this|{
 			dom_mut(lua,|dom|{
 				let instance=this.get(dom)?;
-				Ok(instance.class.clone())
+				Ok(instance.class.to_owned())
 			})
 		});
 	}
 	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
-		methods.add_method("GetChildren",|lua,this,_:()|
+		fn clone(lua:&mlua::Lua,this:&Instance,_:())->mlua::Result<Instance>{
+			dom_mut(lua,|dom|{
+				let instance_ref=dom.clone_within(this.referent);
+				Ok(Instance::new_unchecked(instance_ref))
+			})
+		}
+		methods.add_method("clone",clone);
+		methods.add_method("Clone",clone);
+		fn get_children(lua:&mlua::Lua,this:&Instance,_:())->mlua::Result<Vec<Instance>>{
 			dom_mut(lua,|dom|{
 				let instance=this.get(dom)?;
 				let children:Vec<_>=instance
 					.children()
 					.iter()
 					.copied()
-					.map(Instance::new)
+					.map(Instance::new_unchecked)
 					.collect();
 				Ok(children)
 			})
+		}
+		methods.add_method("children",get_children);
+		methods.add_method("GetChildren",get_children);
+		methods.add_method("GetFullName",|lua,this,()|
+			dom_mut(lua,|dom|{
+				let instance=this.get(dom)?;
+				Ok(get_full_name(dom,instance))
+			})
 		);
 		fn ffc(lua:&mlua::Lua,this:&Instance,(name,search_descendants):(mlua::String,Option<bool>))->mlua::Result<Option<Instance>>{
 			let name_str=&*name.to_str()?;
@@ -175,7 +193,7 @@ impl mlua::UserData for Instance{
 						false=>find_first_child(dom,instance,name_str),
 					}
 					.map(|instance|
-						Instance::new(instance.referent())
+						Instance::new_unchecked(instance.referent())
 					)
 				)
 			})
@@ -185,13 +203,29 @@ impl mlua::UserData for Instance{
 		methods.add_method("FindFirstChildOfClass",|lua,this,(class,search_descendants):(mlua::String,Option<bool>)|{
 			let class_str=&*class.to_str()?;
 			dom_mut(lua,|dom|{
+				let inst=this.get(dom)?;
 				Ok(
 					match search_descendants.unwrap_or(false){
-						true=>find_first_descendant_of_class(dom,this.get(dom)?,class_str),
-						false=>find_first_child_of_class(dom,this.get(dom)?,class_str),
+						true=>find_first_descendant_of_class(dom,inst,class_str),
+						false=>find_first_child_of_class(dom,inst,class_str),
 					}
 					.map(|instance|
-						Instance::new(instance.referent())
+						Instance::new_unchecked(instance.referent())
+					)
+				)
+			})
+		});
+		methods.add_method("FindFirstChildWhichIsA",|lua,this,(class,search_descendants):(mlua::String,Option<bool>)|{
+			let class_str=&*class.to_str()?;
+			dom_mut(lua,|dom|{
+				let inst=this.get(dom)?;
+				Ok(
+					match search_descendants.unwrap_or(false){
+						true=>find_first_descendant_which_is_a(dom,inst,class_str),
+						false=>find_first_child_which_is_a(dom,inst,class_str),
+					}
+					.map(|instance|
+						Instance::new_unchecked(instance.referent())
 					)
 				)
 			})
@@ -201,24 +235,42 @@ impl mlua::UserData for Instance{
 				let children:Vec<_>=dom
 					.descendants_of(this.referent)
 					.map(|instance|
-						Instance::new(instance.referent())
+						Instance::new_unchecked(instance.referent())
 					)
 					.collect();
 				Ok(children)
 			})
 		);
-		methods.add_method("IsA",|lua,this,classname:mlua::String|
+		methods.add_method("IsAncestorOf",|lua,this,descendant:Instance|
+			dom_mut(lua,|dom|{
+				let instance=descendant.get(dom)?;
+				Ok(std::iter::successors(Some(instance),|inst|dom.get_by_ref(inst.parent())).any(|inst|inst.referent()==this.referent))
+			})
+		);
+		methods.add_method("IsDescendantOf",|lua,this,ancestor:Instance|
 			dom_mut(lua,|dom|{
 				let instance=this.get(dom)?;
-				Ok(crate::context::class_is_a(instance.class.as_str(),&*classname.to_str()?))
+				Ok(std::iter::successors(Some(instance),|inst|dom.get_by_ref(inst.parent())).any(|inst|inst.referent()==ancestor.referent))
 			})
 		);
-		methods.add_method("Destroy",|lua,this,()|
+		fn is_a(lua:&mlua::Lua,this:&Instance,classname:mlua::String)->mlua::Result<bool>{
 			dom_mut(lua,|dom|{
-				dom.destroy(this.referent);
+				let instance=this.get(dom)?;
+				Ok(class_is_a(instance.class.as_str(),&*classname.to_str()?))
+			})
+		}
+		methods.add_method("isA",is_a);
+		methods.add_method("IsA",is_a);
+		fn destroy(lua:&mlua::Lua,this:&Instance,_:())->mlua::Result<()>{
+			dom_mut(lua,|dom|{
+				dom.transfer_within(this.referent,Ref::none());
 				Ok(())
 			})
-		);
+		}
+		methods.add_method("remove",destroy);
+		methods.add_method("Remove",destroy);
+		methods.add_method("destroy",destroy);
+		methods.add_method("Destroy",destroy);
 		methods.add_meta_function(mlua::MetaMethod::ToString,|lua,this:Instance|{
 			dom_mut(lua,|dom|{
 				let instance=this.get(dom)?;
@@ -232,39 +284,38 @@ impl mlua::UserData for Instance{
 				//println!("__index t={} i={index:?}",instance.name);
 				let db=rbx_reflection_database::get();
 				let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
-				//Find existing property
-				match instance.properties.get(index_str)
-					.cloned()
+				// Find existing property
+				// Interestingly, ustr can know ahead of time if
+				// a property does not exist in any runtime instance
+				match Ustr::from_existing(index_str)
+					.and_then(|index_ustr|
+						instance.properties.get(&index_ustr).cloned()
+					)
 					//Find default value
 					.or_else(||db.find_default_property(class,index_str).cloned())
 					//Find virtual property
-					.or_else(||{
-						SuperClassIter{
-							database:db,
-							descriptor:Some(class),
-						}
-						.find_map(|class|
-							find_virtual_property(&instance.properties,class,index_str)
-						)
-					})
+					.or_else(||db.superclasses_iter(class).find_map(|class|
+						find_virtual_property(&instance.properties,class,index_str)
+					))
 				{
+					Some(rbx_types::Variant::Bool(val))=>return val.into_lua(lua),
 					Some(rbx_types::Variant::Int32(val))=>return val.into_lua(lua),
 					Some(rbx_types::Variant::Int64(val))=>return val.into_lua(lua),
 					Some(rbx_types::Variant::Float32(val))=>return val.into_lua(lua),
 					Some(rbx_types::Variant::Float64(val))=>return val.into_lua(lua),
-					Some(rbx_types::Variant::Ref(val))=>return Instance::new(val).into_lua(lua),
-					Some(rbx_types::Variant::CFrame(cf))=>return Into::<crate::runner::cframe::CFrame>::into(cf).into_lua(lua),
-					Some(rbx_types::Variant::Vector3(v))=>return Into::<crate::runner::vector3::Vector3>::into(v).into_lua(lua),
+					Some(rbx_types::Variant::String(val))=>return val.into_lua(lua),
+					Some(rbx_types::Variant::Ref(val))=>return Instance::new_unchecked(val).into_lua(lua),
+					Some(rbx_types::Variant::Enum(e))=>return crate::runner::r#enum::EnumItem::from(e).into_lua(lua),
+					Some(rbx_types::Variant::Color3(c))=>return crate::runner::color3::Color3::from(c).into_lua(lua),
+					Some(rbx_types::Variant::CFrame(cf))=>return crate::runner::cframe::CFrame::from(cf).into_lua(lua),
+					Some(rbx_types::Variant::Vector2(v))=>return crate::runner::vector2::Vector2::from(v).into_lua(lua),
+					Some(rbx_types::Variant::Vector3(v))=>return crate::runner::vector3::Vector3::from(v).into_lua(lua),
 					None=>(),
 					other=>return Err(mlua::Error::runtime(format!("Instance.__index Unsupported property type instance={} index={index_str} value={other:?}",instance.name))),
 				}
 				//find a function with a matching name
 				if let Some(function)=class_methods_store_mut(lua,|cf|{
-					let mut iter=SuperClassIter{
-						database:db,
-						descriptor:Some(class),
-					};
-					iter.find_map(|class|{
+					db.superclasses_iter(class).find_map(|class|{
 						let mut class_methods=cf.get_or_create_class_methods(&class.name)?;
 						class_methods.get_or_create_function(lua,index_str)
 							.transpose()
@@ -274,80 +325,114 @@ 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(instance.referent()))
+				.map(|instance|Instance::new_unchecked(instance.referent()))
 				.into_lua(lua)
 			})
 		});
 		methods.add_meta_function(mlua::MetaMethod::NewIndex,|lua,(this,index,value):(Instance,mlua::String,mlua::Value)|{
+			let index_str=&*index.to_str()?;
 			dom_mut(lua,|dom|{
 				let instance=this.get_mut(dom)?;
-				//println!("__newindex t={} i={index:?} v={value:?}",instance.name);
-				let index_str=&*index.to_str()?;
 				let db=rbx_reflection_database::get();
 				let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
-				let mut iter=SuperClassIter{
-					database:db,
-					descriptor:Some(class),
-				};
-				let property=iter.find_map(|cls|cls.properties.get(index_str)).ok_or_else(||mlua::Error::runtime(format!("Property '{index_str}' missing on class '{}'",class.name)))?;
-				match &property.data_type{
-					rbx_reflection::DataType::Value(rbx_types::VariantType::Vector3)=>{
-						let typed_value:Vector3=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected Userdata"))?.borrow()?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Vector3(typed_value.into()));
-					},
+				let property=db.superclasses_iter(class).find_map(|cls|
+					cls.properties.get(index_str)
+				).ok_or_else(||
+					mlua::Error::runtime(format!("Property '{index_str}' missing on class '{}'",class.name))
+				)?;
+				let value=match &property.data_type{
 					rbx_reflection::DataType::Value(rbx_types::VariantType::Float32)=>{
-						let typed_value:f32=coerce_float32(&value).ok_or_else(||mlua::Error::runtime("Expected f32"))?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Float32(typed_value));
+						let typed_value=Number::from_lua(value.clone(),lua)?.to_f32();
+						rbx_types::Variant::Float32(typed_value)
 					},
 					rbx_reflection::DataType::Enum(enum_name)=>{
 						let typed_value=match &value{
 							&mlua::Value::Integer(int)=>Ok(rbx_types::Enum::from_u32(int as u32)),
 							&mlua::Value::Number(num)=>Ok(rbx_types::Enum::from_u32(num as u32)),
 							mlua::Value::String(s)=>{
-								let e=db.enums.get(enum_name).ok_or_else(||mlua::Error::runtime("Database DataType Enum name  does not exist"))?;
+								let e=db.enums.get(enum_name).ok_or_else(||mlua::Error::runtime("Database DataType Enum name does not exist"))?;
 								Ok(rbx_types::Enum::from_u32(*e.items.get(&*s.to_str()?).ok_or_else(||mlua::Error::runtime("Invalid enum item"))?))
 							},
 							mlua::Value::UserData(any_user_data)=>{
-								let e:crate::runner::r#enum::Enum=*any_user_data.borrow()?;
+								let e:crate::runner::r#enum::EnumItem=*any_user_data.borrow()?;
 								Ok(e.into())
 							},
 							_=>Err(mlua::Error::runtime("Expected Enum")),
 						}?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Enum(typed_value));
+						rbx_types::Variant::Enum(typed_value)
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::Color3)=>{
 						let typed_value:crate::runner::color3::Color3=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected Color3"))?.borrow()?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Color3(typed_value.into()));
+						rbx_types::Variant::Color3(typed_value.into())
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::Bool)=>{
 						let typed_value=value.as_boolean().ok_or_else(||mlua::Error::runtime("Expected boolean"))?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Bool(typed_value));
+						rbx_types::Variant::Bool(typed_value)
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::Int32)=>{
+						let typed_value=value.as_i32().ok_or_else(||mlua::Error::runtime("Expected Int32"))?;
+						rbx_types::Variant::Int32(typed_value)
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::String)=>{
-						let typed_value=value.as_str().ok_or_else(||mlua::Error::runtime("Expected boolean"))?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::String(typed_value.to_owned()));
+						let typed_value=match &value{
+							mlua::Value::Integer(i)=>i.to_string(),
+							mlua::Value::Number(n)=>n.to_string(),
+							mlua::Value::String(s)=>s.to_str()?.to_owned(),
+							_=>return Err(mlua::Error::runtime("Expected string")),
+						};
+						rbx_types::Variant::String(typed_value)
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::UDim2)=>{
+						let typed_value:&crate::runner::udim2::UDim2=&*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected UDim2"))?.borrow()?;
+						rbx_types::Variant::UDim2(typed_value.clone().into())
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::NumberRange)=>{
+						let typed_value:&crate::runner::number_range::NumberRange=&*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected NumberRange"))?.borrow()?;
+						rbx_types::Variant::NumberRange(typed_value.clone().into())
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::NumberSequence)=>{
-						let typed_value:crate::runner::number_sequence::NumberSequence=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected NumberSequence"))?.borrow()?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::NumberSequence(typed_value.into()));
+						let typed_value:&crate::runner::number_sequence::NumberSequence=&*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected NumberSequence"))?.borrow()?;
+						rbx_types::Variant::NumberSequence(typed_value.clone().into())
 					},
 					rbx_reflection::DataType::Value(rbx_types::VariantType::ColorSequence)=>{
-						let typed_value:crate::runner::color_sequence::ColorSequence=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected ColorSequence"))?.borrow()?;
-						instance.properties.insert(index_str.to_owned(),rbx_types::Variant::ColorSequence(typed_value.into()));
+						let typed_value:&crate::runner::color_sequence::ColorSequence=&*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected ColorSequence"))?.borrow()?;
+						rbx_types::Variant::ColorSequence(typed_value.clone().into())
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::Vector2)=>{
+						let typed_value:crate::runner::vector2::Vector2=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected Vector2"))?.borrow()?;
+						rbx_types::Variant::Vector2(typed_value.clone().into())
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::Vector3)=>{
+						let typed_value:crate::runner::vector3::Vector3=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected Vector3"))?.borrow()?;
+						rbx_types::Variant::Vector3(typed_value.clone().into())
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::CFrame)=>{
+						let typed_value:crate::runner::cframe::CFrame=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected CFrame"))?.borrow()?;
+						rbx_types::Variant::CFrame(typed_value.clone().into())
+					},
+					rbx_reflection::DataType::Value(rbx_types::VariantType::ContentId)=>{
+						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)=>{
+						// why clone?
+						let typed_value=Option::<Instance>::from_lua(value.clone(),lua)?;
+						rbx_types::Variant::Ref(typed_value.map_or(Ref::none(),|instance|instance.referent))
 					},
 					other=>return Err(mlua::Error::runtime(format!("Unimplemented property type: {other:?}"))),
-				}
+				};
+				// the index is known to be a real property at this point
+				// allow creating a permanent ustr (memory leak)
+				let index_ustr=rbx_dom_weak::ustr(index_str);
+				instance.properties.insert(index_ustr,value);
 				Ok(())
 			})
 		});
@@ -372,28 +457,53 @@ type CFD=phf::Map<&'static str,// Class name
 		ClassFunctionPointer
 	>
 >;
+const GET_SERVICE:ClassFunctionPointer=cf!(|lua,_this,service:mlua::String|{
+	dom_mut(lua,|dom|{
+		//dom.root_ref()==this.referent ?
+		let service=&*service.to_str()?;
+		match service{
+			"Lighting"|"RunService"|"Players"|"Workspace"|"MaterialService"|"TweenService"=>{
+				let referent=find_first_child_of_class(dom,dom.root(),service)
+				.map(|instance|instance.referent())
+				.unwrap_or_else(||
+					dom.insert(dom.root_ref(),InstanceBuilder::new(service))
+				);
+				Ok(Instance::new_unchecked(referent))
+			},
+			other=>Err(mlua::Error::runtime(format!("Service '{other}' not supported"))),
+		}
+	})
+});
+const GET_PLAYERS:ClassFunctionPointer=cf!(|_lua,_this,()|->mlua::Result<_>{
+	Ok(Vec::<Instance>::new())
+});
+const NO_OP:ClassFunctionPointer=cf!(|_lua,_this,_:mlua::MultiValue|->mlua::Result<_>{Ok(())});
 static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
 	"DataModel"=>phf::phf_map!{
-		"GetService"=>cf!(|lua,_this,service:mlua::String|{
-			dom_mut(lua,|dom|{
-				//dom.root_ref()==this.referent ?
-				let service=&*service.to_str()?;
-				match service{
-					"Lighting"|"RunService"=>{
-						let referent=find_first_child_of_class(dom,dom.root(),service)
-        				.map(|instance|instance.referent())
-						.unwrap_or_else(||
-							dom.insert(dom.root_ref(),InstanceBuilder::new(service))
-						);
-						Ok(Instance::new(referent))
-					},
-					other=>Err::<Instance,_>(mlua::Error::runtime(format!("Service '{other}' not supported"))),
-				}
-			})
-		}),
+		"service"=>GET_SERVICE,
+		"GetService"=>GET_SERVICE,
 	},
 	"Terrain"=>phf::phf_map!{
-		"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Vector3,crate::runner::r#enum::Enum)|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(())),
+	},
+	"Players"=>phf::phf_map!{
+		"players"=>GET_PLAYERS,
+		"GetPlayers"=>GET_PLAYERS,
+	},
+	"Sound"=>phf::phf_map!{
+		"Play"=>NO_OP,
+	},
+	"TweenService"=>phf::phf_map!{
+		"Create"=>cf!(|_lua,_,(instance,tween_info,goal):(Instance,crate::runner::tween_info::TweenInfo,mlua::Table)|->mlua::Result<_>{
+			Ok(crate::runner::tween::Tween::create(
+				instance,
+				tween_info,
+				goal,
+			))
+		}),
 	},
 };
 
@@ -409,7 +519,7 @@ struct ClassMethodsStore{
 }
 impl ClassMethodsStore{
 	/// return self.classes[class] or create the ClassMethods and then return it
-	fn get_or_create_class_methods(&mut self,class:&str)->Option<ClassMethods>{
+	fn get_or_create_class_methods(&mut self,class:&str)->Option<ClassMethods<'_>>{
 		// Use get_entry to get the &'static str keys of the database
 		// and use it as a key for the classes hashmap
 		CLASS_FUNCTION_DATABASE.get_entry(class)
@@ -480,78 +590,70 @@ static VIRTUAL_PROPERTY_DATABASE:VPD=phf::phf_map!{
 };
 
 fn find_virtual_property(
-	properties:&HashMap<String,rbx_types::Variant>,
+	properties:&rbx_dom_weak::UstrMap<rbx_types::Variant>,
 	class:&rbx_reflection::ClassDescriptor,
-	index:&str
+	index:&str,
 )->Option<rbx_types::Variant>{
 	//Find virtual property
 	let class_virtual_properties=VIRTUAL_PROPERTY_DATABASE.get(&class.name)?;
 	let virtual_property=class_virtual_properties.get(index)?;
 
 	//Get source property
-	let variant=properties.get(virtual_property.property)?;
+	let variant=properties.get(&static_ustr(virtual_property.property))?;
 
 	//Transform Source property with provided function
 	(virtual_property.pointer)(variant)
 }
 
 // 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
 		CreateUserData
 	>
 >;
+fn create_script_signal(lua:&mlua::Lua)->mlua::Result<mlua::AnyUserData>{
+	lua.create_any_userdata(crate::runner::script_signal::ScriptSignal::new())
+}
 static LAZY_USER_DATA:LUD=phf::phf_map!{
 	"RunService"=>phf::phf_map!{
-		"RenderStepped"=>|lua|{
-			lua.create_any_userdata(crate::runner::script_signal::ScriptSignal::new())
-		},
+		"Stepped"=>create_script_signal,
+		"Heartbeat"=>create_script_signal,
+		"RenderStepped"=>create_script_signal,
+	},
+	"Players"=>phf::phf_map!{
+		"PlayerAdded"=>create_script_signal,
+	},
+	"BasePart"=>phf::phf_map!{
+		"Touched"=>create_script_signal,
+		"TouchEnded"=>create_script_signal,
+	},
+	"Instance"=>phf::phf_map!{
+		"ChildAdded"=>create_script_signal,
+		"ChildRemoved"=>create_script_signal,
+		"DescendantAdded"=>create_script_signal,
+		"DescendantRemoved"=>create_script_signal,
+	},
+	"ClickDetector"=>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/macros.rs

@@ -10,6 +10,18 @@ macro_rules! type_from_lua_userdata{
 		}
 	};
 }
+macro_rules! type_from_lua_userdata_clone{
+	($ty:ident)=>{
+		impl mlua::FromLua for $ty{
+			fn from_lua(value:mlua::Value,_lua:&mlua::Lua)->Result<Self,mlua::Error>{
+				match value{
+					mlua::Value::UserData(ud)=>Ok(ud.borrow::<Self>()?.clone()),
+					other=>Err(mlua::Error::runtime(format!("Expected {} got {:?}",stringify!($ty),other))),
+				}
+			}
+		}
+	};
+}
 macro_rules! type_from_lua_userdata_lua_lifetime{
 	($ty:ident)=>{
 		impl mlua::FromLua for $ty<'static>{

lib/roblox_emulator/src/runner/mod.rs

@@ -3,10 +3,19 @@ mod macros;
 mod runner;
 
 mod r#enum;
+mod task;
+mod udim;
+mod tween;
+mod udim2;
 mod color3;
 mod cframe;
+mod number;
+mod vector2;
 mod vector3;
+mod brickcolor;
+mod tween_info;
 pub mod instance;
+mod number_range;
 mod script_signal;
 mod color_sequence;
 mod number_sequence;

lib/roblox_emulator/src/runner/number.rs

@@ -0,0 +1,43 @@
+// the goal of this module is to provide an intermediate type
+// that is guaranteed to be some kind of number, and provide
+// methods to coerce it into various more specific types.
+
+#[derive(Clone,Copy)]
+pub enum Number{
+	Integer(i32),
+	Number(f64),
+}
+macro_rules! impl_ty{
+	($ident:ident,$ty:ty)=>{
+		impl Number{
+			#[inline]
+			pub fn $ident(self)->$ty{
+				match self{
+					Self::Integer(int)=>int as $ty,
+					Self::Number(num)=>num as $ty,
+				}
+			}
+		}
+		impl From<Number> for $ty{
+			fn from(value:Number)->$ty{
+				value.$ident()
+			}
+		}
+	};
+}
+impl_ty!(to_u32,u32);
+impl_ty!(to_i32,i32);
+impl_ty!(to_f32,f32);
+impl_ty!(to_u64,u64);
+impl_ty!(to_i64,i64);
+impl_ty!(to_f64,f64);
+
+impl mlua::FromLua for Number{
+	fn from_lua(value:mlua::Value,_lua:&mlua::Lua)->Result<Self,mlua::Error>{
+		match value{
+			mlua::Value::Integer(int)=>Ok(Number::Integer(int)),
+			mlua::Value::Number(num)=>Ok(Number::Number(num)),
+			other=>Err(mlua::Error::runtime(format!("Expected {} got {:?}",stringify!(Number),other))),
+		}
+	}
+}

lib/roblox_emulator/src/runner/number_range.rs

@@ -0,0 +1,34 @@
+use super::number::Number;
+
+#[derive(Clone)]
+pub struct NumberRange(rbx_types::NumberRange);
+impl NumberRange{
+	pub const fn new(min:f32,max:f32)->Self{
+		Self(rbx_types::NumberRange{min,max})
+	}
+}
+impl From<NumberRange> for rbx_types::NumberRange{
+	fn from(NumberRange(value):NumberRange)->rbx_types::NumberRange{
+		value
+	}
+}
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let table=lua.create_table()?;
+
+	table.raw_set("new",
+		lua.create_function(|_,(min,max):(Number,Option<Number>)|{
+			Ok(match max{
+				Some(max)=>NumberRange::new(min.into(),max.into()),
+				None=>NumberRange::new(min.into(),min.into()),
+			})
+		})?
+	)?;
+
+	globals.set("NumberRange",table)?;
+
+	Ok(())
+}
+
+impl mlua::UserData for NumberRange{}
+type_from_lua_userdata_clone!(NumberRange);

lib/roblox_emulator/src/runner/number_sequence.rs

@@ -1,31 +1,36 @@
-#[derive(Clone,Copy)]
-pub struct NumberSequence{}
+#[derive(Clone)]
+pub struct NumberSequence(rbx_types::NumberSequence);
 impl NumberSequence{
-	pub const fn new()->Self{
-		Self{}
+	pub const fn new(keypoints:Vec<rbx_types::NumberSequenceKeypoint>)->Self{
+		Self(rbx_types::NumberSequence{keypoints})
 	}
 }
-impl Into<rbx_types::NumberSequence> for NumberSequence{
-	fn into(self)->rbx_types::NumberSequence{
-		rbx_types::NumberSequence{
-			keypoints:Vec::new()
-		}
+impl From<NumberSequence> for rbx_types::NumberSequence{
+	fn from(NumberSequence(value):NumberSequence)->rbx_types::NumberSequence{
+		value
 	}
 }
 
 pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let number_sequence_table=lua.create_table()?;
+	let table=lua.create_table()?;
 
-	number_sequence_table.raw_set("new",
+	table.raw_set("new",
 		lua.create_function(|_,_:mlua::MultiValue|
-			Ok(NumberSequence::new())
+			Ok(NumberSequence::new(Vec::new()))
 		)?
 	)?;
 
-	globals.set("NumberSequence",number_sequence_table)?;
+	globals.set("NumberSequence",table)?;
 
 	Ok(())
 }
 
 impl mlua::UserData for NumberSequence{}
-type_from_lua_userdata!(NumberSequence);
+impl mlua::FromLua for NumberSequence{
+	fn from_lua(value:mlua::Value,_lua:&mlua::Lua)->Result<Self,mlua::Error>{
+		match value{
+			mlua::Value::UserData(ud)=>Ok(ud.borrow::<Self>()?.clone()),
+			other=>Err(mlua::Error::runtime(format!("Expected {} got {:?}",stringify!(NumberSequence),other))),
+		}
+	}
+}

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;
 
@@ -12,14 +13,12 @@ pub enum Error{
 		error:mlua::Error
 	},
 	RustLua(mlua::Error),
-	NoServices,
 }
 impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		match self{
 			Self::Lua{source,error}=>write!(f,"lua error: source:\n{source}\n{error}"),
 			Self::RustLua(error)=>write!(f,"rust-side lua error: {error}"),
-			other=>write!(f,"{other:?}"),
 		}
 	}
 }
@@ -31,14 +30,19 @@ fn init(lua:&mlua::Lua)->mlua::Result<()>{
 	//global environment
 	let globals=lua.globals();
 
-	#[cfg(feature="run-service")]
-	crate::scheduler::set_globals(lua,&globals)?;
+	super::task::set_globals(lua,&globals)?;
 	super::script_signal::set_globals(lua,&globals)?;
 	super::r#enum::set_globals(lua,&globals)?;
+	super::udim::set_globals(lua,&globals)?;
+	super::udim2::set_globals(lua,&globals)?;
 	super::color3::set_globals(lua,&globals)?;
+	super::brickcolor::set_globals(lua,&globals)?;
+	super::vector2::set_globals(lua,&globals)?;
 	super::vector3::set_globals(lua,&globals)?;
 	super::cframe::set_globals(lua,&globals)?;
 	super::instance::instance::set_globals(lua,&globals)?;
+	super::tween_info::set_globals(lua,&globals)?;
+	super::number_range::set_globals(lua,&globals)?;
 	super::number_sequence::set_globals(lua,&globals)?;
 	super::color_sequence::set_globals(lua,&globals)?;
 
@@ -54,22 +58,21 @@ impl Runner{
 		Ok(runner)
 	}
 	pub fn runnable_context<'a>(self,context:&'a mut Context)->Result<Runnable<'a>,Error>{
-		let services=context.find_services().ok_or(Error::NoServices)?;
-		self.runnable_context_with_services(context,&services)
-	}
-	pub fn runnable_context_with_services<'a>(self,context:&'a mut Context,services:&crate::context::Services)->Result<Runnable<'a>,Error>{
 		{
 			let globals=self.lua.globals();
-			globals.set("game",super::instance::Instance::new(services.game)).map_err(Error::RustLua)?;
-			globals.set("workspace",super::instance::Instance::new(services.workspace)).map_err(Error::RustLua)?;
+			globals.set("game",super::instance::Instance::new_unchecked(context.services.game)).map_err(Error::RustLua)?;
+			globals.set("workspace",super::instance::Instance::new_unchecked(context.services.workspace)).map_err(Error::RustLua)?;
 		}
-		//this makes set_app_data shut up about the lifetime
-		self.lua.set_app_data::<&'static mut rbx_dom_weak::WeakDom>(unsafe{core::mem::transmute(&mut context.dom)});
+		// 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.
+		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{
 			lua:self.lua,
-			_lifetime:&std::marker::PhantomData
+			_lifetime:std::marker::PhantomData
 		})
 	}
 }
@@ -77,11 +80,11 @@ impl Runner{
 //Runnable is the same thing but has context set, which it holds the lifetime for.
 pub struct Runnable<'a>{
 	lua:mlua::Lua,
-	_lifetime:&'a std::marker::PhantomData<()>
+	_lifetime:std::marker::PhantomData<&'a ()>
 }
 impl Runnable<'_>{
 	pub fn drop_context(self)->Runner{
-		self.lua.remove_app_data::<&'static mut rbx_dom_weak::WeakDom>();
+		self.lua.remove_app_data::<crate::context::LuaAppData>();
 		#[cfg(feature="run-service")]
 		self.lua.remove_app_data::<crate::scheduler::Scheduler>();
 		Runner{
@@ -123,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

@@ -98,12 +98,9 @@ impl ScriptConnection{
 
 impl mlua::UserData for ScriptSignal{
 	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
-		methods.add_method("Connect",|_lua,this,f:mlua::Function|
-			Ok(this.connect(f))
-		);
-		methods.add_method("Once",|_lua,this,f:mlua::Function|
-			Ok(this.once(f))
-		);
+		methods.add_method("connect",|_lua,this,f:mlua::Function|Ok(this.connect(f)));
+		methods.add_method("Connect",|_lua,this,f:mlua::Function|Ok(this.connect(f)));
+		methods.add_method("Once",|_lua,this,f:mlua::Function|Ok(this.once(f)));
 		// Fire is not allowed to be called from Lua
 		// methods.add_method("Fire",|_lua,this,args:mlua::MultiValue|
 		// 	Ok(this.fire(args))
@@ -164,6 +161,7 @@ pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
 	.call::<mlua::Function>(())?;
 
 	lua.register_userdata_type::<ScriptSignal>(|reg|{
+		reg.add_field("wait",wait.clone());
 		reg.add_field("Wait",wait);
 		mlua::UserData::register(reg);
 	})?;

lib/roblox_emulator/src/runner/task.rs

@@ -0,0 +1,42 @@
+#[cfg(not(feature="run-service"))]
+fn no_op(_lua:&mlua::Lua,_time:Option<super::number::Number>)->mlua::Result<f64>{
+	Ok(0.0)
+}
+fn tick(_lua:&mlua::Lua,_:())->mlua::Result<f64>{
+	Ok(0.0)
+}
+// This is used to avoid calling coroutine.yield from the rust side.
+const LUA_WAIT:&str=
+"local coroutine_yield=coroutine.yield
+local schedule_thread=schedule_thread
+return function(dt)
+	schedule_thread(dt)
+	return coroutine_yield()
+end";
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let coroutine_table=globals.get::<mlua::Table>("coroutine")?;
+	#[cfg(feature="run-service")]
+	let schedule_thread=lua.create_function(crate::scheduler::schedule_thread)?;
+	#[cfg(not(feature="run-service"))]
+	let schedule_thread=lua.create_function(no_op)?;
+
+	//create wait function environment
+	let wait_env=lua.create_table()?;
+	wait_env.raw_set("coroutine",coroutine_table)?;
+	wait_env.raw_set("schedule_thread",schedule_thread)?;
+
+	//construct wait function from Lua code
+	let wait=lua.load(LUA_WAIT)
+	.set_name("wait")
+	.set_environment(wait_env)
+	.call::<mlua::Function>(())?;
+
+	globals.raw_set("wait",wait)?;
+
+	// TODO: move this somewhere it belongs
+	let tick=lua.create_function(tick)?;
+	globals.raw_set("tick",tick)?;
+
+	Ok(())
+}

lib/roblox_emulator/src/runner/tween.rs

@@ -0,0 +1,35 @@
+use super::instance::Instance;
+use super::tween_info::TweenInfo;
+
+#[expect(dead_code)]
+#[derive(Clone)]
+pub struct Tween{
+	instance:Instance,
+	tween_info:TweenInfo,
+	goal:mlua::Table,
+	playback_state:rbx_types::Enum,
+}
+impl Tween{
+	pub fn create(
+		instance:Instance,
+		tween_info:TweenInfo,
+		goal:mlua::Table,
+	)->Self{
+		Self{
+			instance,
+			tween_info,
+			goal,
+			// Enum.PlaybackState.Begin
+			playback_state:rbx_types::Enum::from_u32(0),
+		}
+	}
+	pub fn play(&mut self){
+	}
+}
+
+impl mlua::UserData for Tween{
+	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
+		methods.add_method_mut("Play",|_,this,()|Ok(this.play()))
+	}
+}
+type_from_lua_userdata_clone!(Tween);

lib/roblox_emulator/src/runner/tween_info.rs

@@ -0,0 +1,45 @@
+use super::number::Number;
+use super::r#enum::{CoerceEnum,Enums};
+
+#[expect(dead_code)]
+#[derive(Clone)]
+pub struct TweenInfo{
+	time:f64,
+	easing_style:rbx_types::Enum,
+	easing_direction:rbx_types::Enum,
+	repeat_count:u32,
+	reverses:bool,
+	delay_time:f64,
+}
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let table=lua.create_table()?;
+
+	table.raw_set("new",
+		lua.create_function(|_,(time,easing_style,easing_direction,repeat_count,reverses,delay_time):(Option<Number>,Option<CoerceEnum>,Option<CoerceEnum>,Option<u32>,Option<bool>,Option<Number>)|{
+			Ok(TweenInfo{
+				time:time.map_or(1.0,Number::to_f64),
+				easing_style:match easing_style{
+					// Enum.EasingStyle.Quad
+					None=>rbx_types::Enum::from_u32(3),
+					Some(e)=>e.coerce_to(Enums.get("EasingStyle").unwrap())?.into(),
+				},
+				easing_direction:match easing_direction{
+					// Enum.EasingDirection.Out
+					None=>rbx_types::Enum::from_u32(1),
+					Some(e)=>e.coerce_to(Enums.get("EasingDirection").unwrap())?.into(),
+				},
+				repeat_count:repeat_count.unwrap_or(0),
+				reverses:reverses.unwrap_or(false),
+				delay_time:delay_time.map_or(0.0,Number::to_f64),
+			})
+		})?
+	)?;
+
+	globals.set("TweenInfo",table)?;
+
+	Ok(())
+}
+
+impl mlua::UserData for TweenInfo{}
+type_from_lua_userdata_clone!(TweenInfo);

lib/roblox_emulator/src/runner/udim.rs

@@ -0,0 +1,36 @@
+use super::number::Number;
+
+#[derive(Clone,Copy)]
+pub struct UDim(rbx_types::UDim);
+impl UDim{
+	pub fn new(scale:f32,offset:i32)->Self{
+		UDim(rbx_types::UDim::new(scale,offset))
+	}
+}
+impl From<rbx_types::UDim> for UDim{
+	fn from(value:rbx_types::UDim)->Self{
+		Self(value)
+	}
+}
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let table=lua.create_table()?;
+
+	table.raw_set("new",
+		lua.create_function(|_,(scale,offset):(Number,i32)|
+			Ok(UDim::new(scale.into(),offset))
+		)?
+	)?;
+
+	globals.set("UDim",table)?;
+
+	Ok(())
+}
+
+impl mlua::UserData for UDim{
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
+		fields.add_field_method_get("Scale",|_,UDim(this)|Ok(this.scale));
+		fields.add_field_method_get("Offset",|_,UDim(this)|Ok(this.offset));
+	}
+}
+type_from_lua_userdata!(UDim);

lib/roblox_emulator/src/runner/udim2.rs

@@ -0,0 +1,40 @@
+use super::udim::UDim;
+use super::number::Number;
+
+#[derive(Clone,Copy)]
+pub struct UDim2(rbx_types::UDim2);
+impl UDim2{
+	pub fn new(sx:f32,ox:i32,sy:f32,oy:i32)->Self{
+		UDim2(rbx_types::UDim2::new(
+			rbx_types::UDim::new(sx,ox),
+			rbx_types::UDim::new(sy,oy),
+		))
+	}
+}
+impl From<UDim2> for rbx_types::UDim2{
+	fn from(UDim2(value):UDim2)->rbx_types::UDim2{
+		value
+	}
+}
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let table=lua.create_table()?;
+
+	table.raw_set("new",
+		lua.create_function(|_,(sx,ox,sy,oy):(Number,i32,Number,i32)|
+			Ok(UDim2::new(sx.into(),ox,sy.into(),oy))
+		)?
+	)?;
+
+	globals.set("UDim2",table)?;
+
+	Ok(())
+}
+
+impl mlua::UserData for UDim2{
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
+		fields.add_field_method_get("X",|_,UDim2(this)|Ok(UDim::from(this.x)));
+		fields.add_field_method_get("Y",|_,UDim2(this)|Ok(UDim::from(this.y)));
+	}
+}
+type_from_lua_userdata!(UDim2);

lib/roblox_emulator/src/runner/vector2.rs

@@ -0,0 +1,93 @@
+use mlua::FromLua;
+
+use super::number::Number;
+
+#[derive(Clone,Copy)]
+pub struct Vector2(glam::Vec2);
+
+impl Vector2{
+	pub const fn new(x:f32,y:f32)->Self{
+		Self(glam::vec2(x,y))
+	}
+}
+
+pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
+	let table=lua.create_table()?;
+
+	//Vector2.new
+	table.raw_set("new",
+		lua.create_function(|_,(x,y):(Option<Number>,Option<Number>)|
+			match (x,y){
+				(Some(x),Some(y))=>Ok(Vector2::new(x.into(),y.into())),
+				(None,None)=>Ok(Vector2(glam::Vec2::ZERO)),
+				_=>Err(mlua::Error::runtime("Unsupported arguments to Vector2.new")),
+			}
+		)?
+	)?;
+
+	globals.set("Vector2",table)?;
+
+	Ok(())
+}
+
+impl From<Vector2> for rbx_types::Vector2{
+	fn from(Vector2(v):Vector2)->rbx_types::Vector2{
+		rbx_types::Vector2::new(v.x,v.y)
+	}
+}
+
+impl From<rbx_types::Vector2> for Vector2{
+	fn from(value:rbx_types::Vector2)->Vector2{
+		Vector2::new(value.x,value.y)
+	}
+}
+
+impl mlua::UserData for Vector2{
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
+		fields.add_field_method_get("magnitude",|_,Vector2(this)|Ok(this.length()));
+		fields.add_field_method_get("Magnitude",|_,Vector2(this)|Ok(this.length()));
+		fields.add_field_method_get("unit",|_,Vector2(this)|Ok(Vector2(this.normalize())));
+		fields.add_field_method_get("Unit",|_,Vector2(this)|Ok(Vector2(this.normalize())));
+		fields.add_field_method_get("x",|_,Vector2(this)|Ok(this.x));
+		fields.add_field_method_get("X",|_,Vector2(this)|Ok(this.x));
+		fields.add_field_method_get("y",|_,Vector2(this)|Ok(this.y));
+		fields.add_field_method_get("Y",|_,Vector2(this)|Ok(this.y));
+	}
+
+	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
+		//methods.add_method("area",|_,this,()| Ok(this.length * this.width));
+
+		methods.add_meta_function(mlua::MetaMethod::Add,|_,(Vector2(this),Vector2(val)):(Self,Self)|Ok(Self(this+val)));
+		methods.add_meta_function(mlua::MetaMethod::Sub,|_,(Vector2(this),Vector2(val)):(Self,Self)|Ok(Self(this-val)));
+		methods.add_meta_function(mlua::MetaMethod::Mul,|lua,(lhs,rhs):(mlua::Value,mlua::Value)|{
+			match (lhs,rhs){
+				(mlua::Value::UserData(lhs),mlua::Value::UserData(rhs))=>lhs.borrow_scoped(|Vector2(lhs):&Vector2|rhs.borrow_scoped(|Vector2(rhs):&Vector2|Self(lhs*rhs)))?,
+				(lhs,mlua::Value::UserData(rhs))=>{
+					let lhs=Number::from_lua(lhs,lua)?;
+					rhs.borrow_scoped(|Vector2(rhs):&Vector2|Self(lhs.to_f32()*rhs))
+				},
+				(mlua::Value::UserData(lhs),rhs)=>{
+					let rhs=Number::from_lua(rhs,lua)?;
+					lhs.borrow_scoped(|Vector2(lhs):&Vector2|Self(lhs*rhs.to_f32()))
+				},
+				_=>Err(mlua::Error::runtime(format!("Expected Vector2")))
+			}
+		});
+		methods.add_meta_function(mlua::MetaMethod::Div,|_,(Vector2(this),val):(Self,mlua::Value)|{
+			match val{
+				mlua::Value::Integer(n)=>Ok(Self(this/(n as f32))),
+				mlua::Value::Number(n)=>Ok(Self(this/(n as f32))),
+				mlua::Value::UserData(ud)=>ud.borrow_scoped(|Vector2(rhs):&Vector2|Self(this/rhs)),
+				other=>Err(mlua::Error::runtime(format!("Attempt to divide Vector2 by {other:?}"))),
+			}
+		});
+		methods.add_meta_function(mlua::MetaMethod::ToString,|_,Vector2(this):Self|
+			Ok(format!("Vector2.new({},{})",
+				this.x,
+				this.y,
+			))
+		);
+	}
+}
+
+type_from_lua_userdata!(Vector2);

lib/roblox_emulator/src/runner/vector3.rs

@@ -1,3 +1,7 @@
+use mlua::FromLua;
+
+use super::number::Number;
+
 #[derive(Clone,Copy)]
 pub struct Vector3(pub(crate)glam::Vec3A);
 
@@ -8,23 +12,27 @@ impl Vector3{
 }
 
 pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let vector3_table=lua.create_table()?;
+	let table=lua.create_table()?;
 
 	//Vector3.new
-	vector3_table.raw_set("new",
-		lua.create_function(|_,(x,y,z):(f32,f32,f32)|
-			Ok(Vector3::new(x,y,z))
+	table.raw_set("new",
+		lua.create_function(|_,(x,y,z):(Option<Number>,Option<Number>,Option<Number>)|
+			match (x,y,z){
+				(Some(x),Some(y),Some(z))=>Ok(Vector3::new(x.into(),y.into(),z.into())),
+				(None,None,None)=>Ok(Vector3(glam::Vec3A::ZERO)),
+				_=>Err(mlua::Error::runtime("Unsupported arguments to Vector3.new")),
+			}
 		)?
 	)?;
 
-	globals.set("Vector3",vector3_table)?;
+	globals.set("Vector3",table)?;
 
 	Ok(())
 }
 
-impl Into<rbx_types::Vector3> for Vector3{
-	fn into(self)->rbx_types::Vector3{
-		rbx_types::Vector3::new(self.0.x,self.0.y,self.0.z)
+impl From<Vector3> for rbx_types::Vector3{
+	fn from(Vector3(v):Vector3)->rbx_types::Vector3{
+		rbx_types::Vector3::new(v.x,v.y,v.z)
 	}
 }
 
@@ -36,44 +44,50 @@ impl From<rbx_types::Vector3> for Vector3{
 
 impl mlua::UserData for Vector3{
 	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
-		fields.add_field_method_get("magnitude",|_,this|Ok(this.0.length()));
-		fields.add_field_method_get("x",|_,this|Ok(this.0.x));
-		fields.add_field_method_set("x",|_,this,val|{
-			this.0.x=val;
-			Ok(())
-		});
-		fields.add_field_method_get("y",|_,this|Ok(this.0.y));
-		fields.add_field_method_set("y",|_,this,val|{
-			this.0.y=val;
-			Ok(())
-		});
-		fields.add_field_method_get("z",|_,this|Ok(this.0.z));
-		fields.add_field_method_set("z",|_,this,val|{
-			this.0.z=val;
-			Ok(())
-		});
+		fields.add_field_method_get("magnitude",|_,Vector3(this)|Ok(this.length()));
+		fields.add_field_method_get("Magnitude",|_,Vector3(this)|Ok(this.length()));
+		fields.add_field_method_get("unit",|_,Vector3(this)|Ok(Vector3(this.normalize())));
+		fields.add_field_method_get("Unit",|_,Vector3(this)|Ok(Vector3(this.normalize())));
+		fields.add_field_method_get("x",|_,Vector3(this)|Ok(this.x));
+		fields.add_field_method_get("X",|_,Vector3(this)|Ok(this.x));
+		fields.add_field_method_get("y",|_,Vector3(this)|Ok(this.y));
+		fields.add_field_method_get("Y",|_,Vector3(this)|Ok(this.y));
+		fields.add_field_method_get("z",|_,Vector3(this)|Ok(this.z));
+		fields.add_field_method_get("Z",|_,Vector3(this)|Ok(this.z));
 	}
 
 	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
 		//methods.add_method("area",|_,this,()| Ok(this.length * this.width));
 
-		methods.add_meta_function(mlua::MetaMethod::Add,|_,(this,val):(Self,Self)|Ok(Self(this.0+val.0)));
-		methods.add_meta_function(mlua::MetaMethod::Div,|_,(this,val):(Self,mlua::Value)|{
-			match val{
-				mlua::Value::Integer(n)=>Ok(Self(this.0/(n as f32))),
-				mlua::Value::Number(n)=>Ok(Self(this.0/(n as f32))),
-				mlua::Value::UserData(ud)=>{
-					let rhs:Vector3=ud.take()?;
-					Ok(Self(this.0/rhs.0))
+		methods.add_meta_function(mlua::MetaMethod::Add,|_,(Vector3(this),Vector3(val)):(Self,Self)|Ok(Self(this+val)));
+		methods.add_meta_function(mlua::MetaMethod::Sub,|_,(Vector3(this),Vector3(val)):(Self,Self)|Ok(Self(this-val)));
+		methods.add_meta_function(mlua::MetaMethod::Mul,|lua,(lhs,rhs):(mlua::Value,mlua::Value)|{
+			match (lhs,rhs){
+				(mlua::Value::UserData(lhs),mlua::Value::UserData(rhs))=>lhs.borrow_scoped(|Vector3(lhs):&Vector3|rhs.borrow_scoped(|Vector3(rhs):&Vector3|Self(lhs*rhs)))?,
+				(lhs,mlua::Value::UserData(rhs))=>{
+					let lhs=Number::from_lua(lhs,lua)?;
+					rhs.borrow_scoped(|Vector3(rhs):&Vector3|Self(lhs.to_f32()*rhs))
 				},
+				(mlua::Value::UserData(lhs),rhs)=>{
+					let rhs=Number::from_lua(rhs,lua)?;
+					lhs.borrow_scoped(|Vector3(lhs):&Vector3|Self(lhs*rhs.to_f32()))
+				},
+				_=>Err(mlua::Error::runtime(format!("Expected Vector3")))
+			}
+		});
+		methods.add_meta_function(mlua::MetaMethod::Div,|_,(Vector3(this),val):(Self,mlua::Value)|{
+			match val{
+				mlua::Value::Integer(n)=>Ok(Self(this/(n as f32))),
+				mlua::Value::Number(n)=>Ok(Self(this/(n as f32))),
+				mlua::Value::UserData(ud)=>ud.borrow_scoped(|Vector3(rhs):&Vector3|Self(this/rhs)),
 				other=>Err(mlua::Error::runtime(format!("Attempt to divide Vector3 by {other:?}"))),
 			}
 		});
-		methods.add_meta_function(mlua::MetaMethod::ToString,|_,this:Self|
+		methods.add_meta_function(mlua::MetaMethod::ToString,|_,Vector3(this):Self|
 			Ok(format!("Vector3.new({},{},{})",
-				this.0.x,
-				this.0.y,
-				this.0.z,
+				this.x,
+				this.y,
+				this.z,
 			))
 		);
 	}

lib/roblox_emulator/src/scheduler.rs

@@ -51,7 +51,7 @@ pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut crate::scheduler::S
 	f(&mut *scheduler)
 }
 
-fn schedule_thread(lua:&mlua::Lua,dt:mlua::Value)->Result<(),mlua::Error>{
+pub fn schedule_thread(lua:&mlua::Lua,dt:mlua::Value)->Result<(),mlua::Error>{
 	let delay=match dt{
 		mlua::Value::Integer(i)=>i.max(0) as u64*60,
 		mlua::Value::Number(f)=>{
@@ -75,32 +75,3 @@ fn schedule_thread(lua:&mlua::Lua,dt:mlua::Value)->Result<(),mlua::Error>{
 		Ok(())
 	})
 }
-
-// This is used to avoid calling coroutine.yield from the rust side.
-const LUA_WAIT:&str=
-"local coroutine_yield=coroutine.yield
-local schedule_thread=schedule_thread
-return function(dt)
-	schedule_thread(dt)
-	return coroutine_yield()
-end";
-
-pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let coroutine_table=globals.get::<mlua::Table>("coroutine")?;
-	let schedule_thread=lua.create_function(schedule_thread)?;
-
-	//create wait function environment
-	let wait_env=lua.create_table()?;
-	wait_env.raw_set("coroutine",coroutine_table)?;
-	wait_env.raw_set("schedule_thread",schedule_thread)?;
-
-	//construct wait function from Lua code
-	let wait=lua.load(LUA_WAIT)
-	.set_name("wait")
-	.set_environment(wait_env)
-	.call::<mlua::Function>(())?;
-
-	globals.raw_set("wait",wait)?;
-
-	Ok(())
-}

lib/roblox_emulator/src/util.rs

@@ -0,0 +1,3 @@
+pub fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
+	rbx_dom_weak::ustr(s)
+}

lib/snf/Cargo.toml

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

lib/snf/src/bot.rs

@@ -85,6 +85,7 @@ pub struct Segment{
 #[derive(Clone,Copy,Debug)]
 pub struct SegmentInfo{
 	/// time of the first instruction in this segment.
+	#[expect(dead_code)]
 	time:Time,
 	instruction_count:u32,
 	/// How many total instructions in segments up to and including this segment
@@ -116,6 +117,7 @@ impl<R:BinReaderExt> StreamableBot<R>{
 			segment_map,
 		})
 	}
+	#[expect(dead_code)]
 	fn get_segment_info(&self,segment_id:SegmentId)->Result<SegmentInfo,Error>{
 		Ok(*self.segment_map.get(segment_id.get() as usize).ok_or(Error::InvalidSegmentId(segment_id))?)
 	}

lib/snf/src/file.rs

@@ -53,8 +53,6 @@ pub(crate) enum FourCC{
 	Map,
 	#[brw(magic=b"SNFB")]
 	Bot,
-	#[brw(magic=b"SNFD")]
-	Demo,
 }
 #[binrw]
 #[brw(little)]

lib/snf/src/lib.rs

@@ -5,7 +5,6 @@ mod newtypes;
 mod file;
 pub mod map;
 pub mod bot;
-pub mod demo;
 
 #[derive(Debug)]
 pub enum Error{
@@ -13,7 +12,6 @@ pub enum Error{
 	Header(file::Error),
 	Map(map::Error),
 	Bot(bot::Error),
-	Demo(demo::Error),
 }
 impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -25,7 +23,6 @@ impl std::error::Error for Error{}
 pub enum SNF<R:BinReaderExt>{
 	Map(map::StreamableMap<R>),
 	Bot(bot::StreamableBot<R>),
-	Demo(demo::StreamableDemo<R>),
 }
 
 pub fn read_snf<R:BinReaderExt>(input:R)->Result<SNF<R>,Error>{
@@ -33,7 +30,6 @@ pub fn read_snf<R:BinReaderExt>(input:R)->Result<SNF<R>,Error>{
 	Ok(match file.fourcc(){
 		file::FourCC::Map=>SNF::Map(map::StreamableMap::new(file).map_err(Error::Map)?),
 		file::FourCC::Bot=>SNF::Bot(bot::StreamableBot::new(file).map_err(Error::Bot)?),
-		file::FourCC::Demo=>SNF::Demo(demo::StreamableDemo::new(file).map_err(Error::Demo)?),
 	})
 }
 pub fn read_map<R:BinReaderExt>(input:R)->Result<map::StreamableMap<R>,Error>{
@@ -50,13 +46,6 @@ pub fn read_bot<R:BinReaderExt>(input:R)->Result<bot::StreamableBot<R>,Error>{
 		_=>Err(Error::UnexpectedFourCC)
 	}
 }
-pub fn read_demo<R:BinReaderExt>(input:R)->Result<demo::StreamableDemo<R>,Error>{
-	let file=file::File::new(input).map_err(Error::Header)?;
-	match file.fourcc(){
-		file::FourCC::Demo=>Ok(demo::StreamableDemo::new(file).map_err(Error::Demo)?),
-		_=>Err(Error::UnexpectedFourCC)
-	}
-}
 
 #[cfg(test)]
 mod tests {

lib/snf/src/map.rs

@@ -386,7 +386,7 @@ pub fn write_map<W:BinWriterExt>(mut writer:W,map:strafesnet_common::map::Comple
 		let mesh=map.meshes.get(model.mesh.get() as usize).ok_or(Error::InvalidMeshId(model.mesh))?;
 		let mut aabb=strafesnet_common::aabb::Aabb::default();
 		for &pos in &mesh.unique_pos{
-			aabb.grow(model.transform.transform_point3(pos).fix_1());
+			aabb.grow(model.transform.transform_point3(pos).narrow_1().unwrap());
 		}
 		Ok(((model::ModelId::new(model_id as u32),model.into()),aabb))
 	}).collect::<Result<Vec<_>,_>>()?;

lib/snf/src/newtypes/gameplay_style.rs

@@ -104,6 +104,7 @@ impl From<strafesnet_common::gameplay_style::StyleModifiers> for StyleModifiers{
 
 #[binrw::binrw]
 #[brw(little,repr=u8)]
+#[expect(dead_code)]
 pub enum JumpCalculation{
 	Max,
 	BoostThenJump,
@@ -128,6 +129,7 @@ impl From<strafesnet_common::gameplay_style::JumpCalculation> for JumpCalculatio
 	}
 }
 
+#[expect(dead_code)]
 pub enum JumpImpulse{
 	Time(Time),
 	Height(Planar64),

lib/snf/src/newtypes/integer.rs

@@ -56,8 +56,6 @@ impl From<strafesnet_common::integer::Ratio64Vec2> for Ratio64Vec2{
 	}
 }
 
-pub type Angle32=i32;
 pub type Planar64=i64;
 pub type Planar64Vec3=[i64;3];
-pub type Planar64Mat3=[i64;9];
 pub type Planar64Affine3=[i64;12];

map-tool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "map-tool"
-version = "1.7.0"
+version = "1.7.2"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,19 +13,19 @@ futures = "0.3.31"
 image = "0.25.2"
 image_dds = "0.7.1"
 lazy-regex = "3.1.0"
-rbx_asset = { version = "0.2.5", registry = "strafesnet" }
-rbx_binary = { version = "0.7.4", registry = "strafesnet" }
-rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
-rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
-rbx_xml = { version = "0.13.3", registry = "strafesnet" }
+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.1.0-sn4", registry = "strafesnet" }
 rbxassetid = { version = "0.1.0", registry = "strafesnet" }
-strafesnet_bsp_loader = { version = "0.3.0", path = "../lib/bsp_loader", registry = "strafesnet" }
-strafesnet_deferred_loader = { version = "0.5.0", path = "../lib/deferred_loader", registry = "strafesnet" }
-strafesnet_rbx_loader = { version = "0.6.0", path = "../lib/rbx_loader", registry = "strafesnet" }
-strafesnet_snf = { version = "0.3.0", path = "../lib/snf", registry = "strafesnet" }
+strafesnet_bsp_loader = { version = "0.3.1", path = "../lib/bsp_loader", registry = "strafesnet" }
+strafesnet_deferred_loader = { version = "0.5.1", path = "../lib/deferred_loader", registry = "strafesnet" }
+strafesnet_rbx_loader = { version = "0.7.0", path = "../lib/rbx_loader", registry = "strafesnet" }
+strafesnet_snf = { version = "0.3.1", path = "../lib/snf", registry = "strafesnet" }
 thiserror = "2.0.11"
 tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread", "fs"] }
-vbsp = "0.8.0"
+vbsp = "0.9.1"
 vbsp-entities-css = "0.6.0"
 vmdl = "0.2.0"
 vmt-parser = "0.2.0"

map-tool/src/roblox.rs

@@ -8,6 +8,11 @@ use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
 use rbxassetid::RobloxAssetId;
 use tokio::io::AsyncReadExt;
 
+// disallow non-static lifetimes
+fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
+	rbx_dom_weak::ustr(s)
+}
+
 const DOWNLOAD_LIMIT:usize=16;
 
 #[derive(Subcommand)]
@@ -27,8 +32,12 @@ pub struct RobloxToSNFSubcommand {
 pub struct DownloadAssetsSubcommand{
 	#[arg(required=true)]
 	roblox_files:Vec<PathBuf>,
-	// #[arg(long)]
-	// cookie_file:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_literal:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_envvar:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_file:Option<PathBuf>,
 }
 
 impl Commands{
@@ -37,13 +46,27 @@ impl Commands{
 			Commands::RobloxToSNF(subcommand)=>roblox_to_snf(subcommand.input_files,subcommand.output_folder).await,
 			Commands::DownloadAssets(subcommand)=>download_assets(
 				subcommand.roblox_files,
-				rbx_asset::cookie::Cookie::new("".to_string()),
+				cookie_from_args(
+					subcommand.cookie_literal,
+					subcommand.cookie_envvar,
+					subcommand.cookie_file,
+				).await?,
 			).await,
 		}
 	}
 }
 
-#[allow(unused)]
+async fn cookie_from_args(literal:Option<String>,environment:Option<String>,file:Option<PathBuf>)->AResult<rbx_asset::cookie::Cookie>{
+	let cookie=match (literal,environment,file){
+		(Some(cookie_literal),None,None)=>cookie_literal,
+		(None,Some(cookie_environment),None)=>std::env::var(cookie_environment)?,
+		(None,None,Some(cookie_file))=>tokio::fs::read_to_string(cookie_file).await?,
+		_=>Err(anyhow::Error::msg("Illegal cookie argument triple"))?,
+	};
+	Ok(rbx_asset::cookie::Cookie::new(cookie))
+}
+
+#[expect(dead_code)]
 #[derive(Debug)]
 enum LoadDomError{
 	IO(std::io::Error),
@@ -88,17 +111,45 @@ SurfaceAppearance.NormalMap
 SurfaceAppearance.RoughnessMap
 SurfaceAppearance.TexturePack
 */
-fn accumulate_content_id(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&str){
-	if let Some(rbx_dom_weak::types::Variant::Content(content))=object.properties.get(property){
-		let url:&str=content.as_ref();
-		if let Ok(asset_id)=url.parse(){
-			content_list.insert(asset_id);
-		}else{
-			println!("Content failed to parse into AssetID: {:?}",content);
-		}
-	}else{
+/* These properties now use Content
+BaseWrap.CageMeshContent
+Decal.TextureContent
+ImageButton.ImageContent
+ImageLabel.ImageContent
+MeshPart.MeshContent
+MeshPart.TextureContent
+SurfaceAppearance.ColorMapContent
+SurfaceAppearance.MetalnessMapContent
+SurfaceAppearance.NormalMapContent
+SurfaceAppearance.RoughnessMapContent
+WrapLayer.ReferenceMeshContent
+*/
+
+fn accumulate_content(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&'static str){
+	let Some(rbx_dom_weak::types::Variant::Content(content))=object.properties.get(&static_ustr(property))else{
 		println!("property={} does not exist for class={}",property,object.class.as_str());
-	}
+		return;
+	};
+	let rbx_dom_weak::types::ContentType::Uri(uri)=content.value()else{
+		println!("ContentType is not Uri");
+		return;
+	};
+	let Ok(asset_id)=uri.parse()else{
+		println!("Content failed to parse into AssetID: {:?}",content);
+		return;
+	};
+	content_list.insert(asset_id);
+}
+fn accumulate_content_id(content_list:&mut HashSet<RobloxAssetId>,object:&Instance,property:&'static str){
+	let Some(rbx_dom_weak::types::Variant::ContentId(content))=object.properties.get(&static_ustr(property))else{
+		println!("property={} does not exist for class={}",property,object.class.as_str());
+		return;
+	};
+	let Ok(asset_id)=content.as_str().parse()else{
+		println!("Content failed to parse into AssetID: {:?}",content);
+		return;
+	};
+	content_list.insert(asset_id);
 }
 async fn read_entire_file(path:impl AsRef<Path>)->Result<Cursor<Vec<u8>>,std::io::Error>{
 	let mut file=tokio::fs::File::open(path).await?;
@@ -116,12 +167,12 @@ impl UniqueAssets{
 	fn collect(&mut self,object:&Instance){
 		match object.class.as_str(){
 			"Beam"=>accumulate_content_id(&mut self.textures,object,"Texture"),
-			"Decal"=>accumulate_content_id(&mut self.textures,object,"Texture"),
-			"Texture"=>accumulate_content_id(&mut self.textures,object,"Texture"),
+			"Decal"=>accumulate_content(&mut self.textures,object,"TextureContent"),
+			"Texture"=>accumulate_content(&mut self.textures,object,"TextureContent"),
 			"FileMesh"=>accumulate_content_id(&mut self.textures,object,"TextureId"),
 			"MeshPart"=>{
-				accumulate_content_id(&mut self.textures,object,"TextureID");
-				accumulate_content_id(&mut self.meshes,object,"MeshId");
+				accumulate_content(&mut self.textures,object,"TextureContent");
+				accumulate_content(&mut self.meshes,object,"MeshContent");
 			},
 			"SpecialMesh"=>accumulate_content_id(&mut self.meshes,object,"MeshId"),
 			"ParticleEmitter"=>accumulate_content_id(&mut self.textures,object,"Texture"),
@@ -141,7 +192,7 @@ impl UniqueAssets{
 	}
 }
 
-#[allow(unused)]
+#[expect(dead_code)]
 #[derive(Debug)]
 enum UniqueAssetError{
 	IO(std::io::Error),
@@ -165,16 +216,16 @@ enum DownloadType{
 impl DownloadType{
 	fn path(&self)->PathBuf{
 		match self{
-			DownloadType::Texture(asset_id)=>format!("downloaded_textures/{}",asset_id.0.to_string()).into(),
-			DownloadType::Mesh(asset_id)=>format!("meshes/{}",asset_id.0.to_string()).into(),
-			DownloadType::Union(asset_id)=>format!("unions/{}",asset_id.0.to_string()).into(),
+			DownloadType::Texture(RobloxAssetId(asset_id))=>format!("downloaded_textures/{asset_id}").into(),
+			DownloadType::Mesh(RobloxAssetId(asset_id))=>format!("meshes/{asset_id}").into(),
+			DownloadType::Union(RobloxAssetId(asset_id))=>format!("unions/{asset_id}").into(),
 		}
 	}
 	fn asset_id(&self)->u64{
 		match self{
-			DownloadType::Texture(asset_id)=>asset_id.0,
-			DownloadType::Mesh(asset_id)=>asset_id.0,
-			DownloadType::Union(asset_id)=>asset_id.0,
+			&DownloadType::Texture(RobloxAssetId(asset_id))=>asset_id,
+			&DownloadType::Mesh(RobloxAssetId(asset_id))=>asset_id,
+			&DownloadType::Union(RobloxAssetId(asset_id))=>asset_id,
 		}
 	}
 }
@@ -191,9 +242,8 @@ struct Stats{
 	failed_downloads:u32,
 	timed_out_downloads:u32,
 }
-async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::CookieContext,download_instruction:DownloadType)->Result<DownloadResult,std::io::Error>{
+async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::Context,download_instruction:DownloadType)->Result<DownloadResult,std::io::Error>{
 	stats.total_assets+=1;
-	let download_instruction=download_instruction;
 	// check if file exists on disk
 	let path=download_instruction.path();
 	if tokio::fs::try_exists(path.as_path()).await?{
@@ -213,11 +263,12 @@ async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::CookieConte
 		match asset_result{
 			Ok(asset_result)=>{
 				stats.downloaded_assets+=1;
-				tokio::fs::write(path,&asset_result).await?;
-				break Ok(DownloadResult::Data(asset_result));
+				let data=asset_result.to_vec()?;
+				tokio::fs::write(path,&data).await?;
+				break Ok(DownloadResult::Data(data));
 			},
-			Err(rbx_asset::cookie::GetError::Response(rbx_asset::ResponseError::StatusCodeWithUrlAndBody(scwuab)))=>{
-				if scwuab.status_code.as_u16()==429{
+			Err(rbx_asset::cookie::GetError::Response(rbx_asset::types::ResponseError::Details{status_code,url_and_body}))=>{
+				if status_code.as_u16()==429{
 					if retry==12{
 						println!("Giving up asset download {asset_id}");
 						stats.timed_out_downloads+=1;
@@ -229,7 +280,7 @@ async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::CookieConte
 					retry+=1;
 				}else{
 					stats.failed_downloads+=1;
-					println!("weird scuwab error: {scwuab:?}");
+					println!("weird status_code error: status_code={status_code} url={} body={}",url_and_body.url,url_and_body.body);
 					break Ok(DownloadResult::Failed);
 				}
 			},
@@ -252,7 +303,7 @@ enum ConvertTextureError{
 	#[error("DDS write error {0:?}")]
 	DDSWrite(#[from]image_dds::ddsfile::Error),
 }
-async fn convert_texture(asset_id:RobloxAssetId,download_result:DownloadResult)->Result<(),ConvertTextureError>{
+async fn convert_texture(RobloxAssetId(asset_id):RobloxAssetId,download_result:DownloadResult)->Result<(),ConvertTextureError>{
 	let data=match download_result{
 		DownloadResult::Cached(path)=>tokio::fs::read(path).await?,
 		DownloadResult::Data(data)=>data,
@@ -277,7 +328,7 @@ async fn convert_texture(asset_id:RobloxAssetId,download_result:DownloadResult)-
 		image_dds::Mipmaps::GeneratedAutomatic,
 	)?;
 
-	let file_name=format!("textures/{}.dds",asset_id.0);
+	let file_name=format!("textures/{asset_id}.dds");
 	let mut file=std::fs::File::create(file_name)?;
 	dds.write(&mut file)?;
 	Ok(())
@@ -315,7 +366,7 @@ async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->A
 	// insert into global unique assets guy
 	// add to download queue if the asset is globally unique and does not already exist on disk
 	let mut stats=Stats::default();
-	let context=rbx_asset::cookie::CookieContext::new(cookie);
+	let context=rbx_asset::cookie::Context::new(cookie);
 	let mut globally_unique_assets=UniqueAssets::default();
 	// pop a job = retry_queue.pop_front() or ingest(recv.recv().await)
 	// SLOW MODE:
@@ -370,7 +421,7 @@ async fn download_assets(paths:Vec<PathBuf>,cookie:rbx_asset::cookie::Cookie)->A
 }
 
 #[derive(Debug)]
-#[allow(dead_code)]
+#[expect(dead_code)]
 enum ConvertError{
 	IO(std::io::Error),
 	SNFMap(strafesnet_snf::map::Error),
@@ -383,17 +434,23 @@ impl std::fmt::Display for ConvertError{
 	}
 }
 impl std::error::Error for ConvertError{}
-async fn convert_to_snf(path:&Path,output_folder:PathBuf)->AResult<()>{
-	let entire_file=tokio::fs::read(path).await?;
+
+struct Errors{
+	script_errors:Vec<strafesnet_rbx_loader::RunnerError>,
+	convert_errors:strafesnet_rbx_loader::RecoverableErrors,
+}
+
+fn convert_to_snf(path:&Path,output_folder:PathBuf)->Result<Errors,ConvertError>{
+	let entire_file=std::fs::read(path).map_err(ConvertError::IO)?;
 
 	let model=strafesnet_rbx_loader::read(
-		std::io::Cursor::new(entire_file)
+		entire_file.as_slice()
 	).map_err(ConvertError::RobloxRead)?;
 
-	let mut place=model.into_place();
-	place.run_scripts();
+	let mut place=strafesnet_rbx_loader::Place::from(model);
+	let script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]);
 
-	let map=place.to_snf(LoadFailureMode::DefaultToNone).map_err(ConvertError::RobloxLoad)?;
+	let (map,convert_errors)=place.to_snf(LoadFailureMode::DefaultToNone).map_err(ConvertError::RobloxLoad)?;
 
 	let mut dest=output_folder;
 	dest.push(path.file_stem().unwrap());
@@ -402,7 +459,10 @@ async fn convert_to_snf(path:&Path,output_folder:PathBuf)->AResult<()>{
 
 	strafesnet_snf::map::write_map(file,map).map_err(ConvertError::SNFMap)?;
 
-	Ok(())
+	Ok(Errors{
+		script_errors,
+		convert_errors,
+	})
 }
 
 async fn roblox_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf)->AResult<()>{
@@ -411,15 +471,25 @@ async fn roblox_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf)->ARe
 	let thread_limit=std::thread::available_parallelism()?.get();
 	let mut it=paths.into_iter();
 	static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(0);
+	// This is wrong! Calling roblox_to_snf multiple times keeps adding permits
 	SEM.add_permits(thread_limit);
 
 	while let (Ok(permit),Some(path))=(SEM.acquire().await,it.next()){
 		let output_folder=output_folder.clone();
-		tokio::spawn(async move{
-			let result=convert_to_snf(path.as_path(),output_folder).await;
+		tokio::task::spawn_blocking(move||{
+			let result=convert_to_snf(path.as_path(),output_folder);
 			drop(permit);
 			match result{
-				Ok(())=>(),
+				Ok(errors)=>{
+					for error in errors.script_errors{
+						println!("Script error: {error}");
+					}
+					let error_count=errors.convert_errors.count();
+					if error_count!=0{
+						println!("Error count: {error_count}");
+						println!("Errors: {}",errors.convert_errors);
+					}
+				},
 				Err(e)=>println!("Convert error: {e:?}"),
 			}
 		});

map-tool/src/source.rs

@@ -452,7 +452,7 @@ fn bsp_contents(path:PathBuf)->AResult<()>{
 }
 
 #[derive(Debug)]
-#[allow(dead_code)]
+#[expect(dead_code)]
 enum ConvertError{
 	IO(std::io::Error),
 	SNFMap(strafesnet_snf::map::Error),

strafe-client/Cargo.toml

@@ -28,5 +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 = "24.0.0"
+wgpu = "26.0.1"
 winit = "0.30.7"
+
+[profile.dev]
+strip = false
+opt-level = 3

strafe-client/src/compat_worker.rs

@@ -2,14 +2,12 @@ pub type QNWorker<'a,Task>=CompatNWorker<'a,Task>;
 pub type INWorker<'a,Task>=CompatNWorker<'a,Task>;
 
 pub struct CompatNWorker<'a,Task>{
-	data:std::marker::PhantomData<Task>,
 	f:Box<dyn FnMut(Task)+Send+'a>,
 }
 
 impl<'a,Task> CompatNWorker<'a,Task>{
 	pub fn new(f:impl FnMut(Task)+Send+'a)->CompatNWorker<'a,Task>{
 		Self{
-			data:std::marker::PhantomData,
 			f:Box::new(f),
 		}
 	}

strafe-client/src/file.rs

@@ -3,7 +3,7 @@ use std::io::Read;
 #[cfg(any(feature="roblox",feature="source"))]
 use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
 
-#[allow(dead_code)]
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum ReadError{
 	#[cfg(feature="roblox")]
@@ -63,7 +63,7 @@ pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
 	}
 }
 
-#[allow(dead_code)]
+#[expect(dead_code)]
 #[derive(Debug)]
 pub enum LoadError{
 	ReadError(ReadError),
@@ -97,11 +97,16 @@ pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<LoadFormat,LoadError>{
 		ReadFormat::SNFM(map)=>Ok(LoadFormat::Map(map)),
 		#[cfg(feature="roblox")]
 		ReadFormat::Roblox(model)=>{
-			let mut place=model.into_place();
-			place.run_scripts();
-			Ok(LoadFormat::Map(
-				place.to_snf(LoadFailureMode::DefaultToNone).map_err(LoadError::LoadRoblox)?
-			))
+			let mut place=strafesnet_rbx_loader::Place::from(model);
+			let script_errors=place.run_scripts().unwrap();
+			for error in script_errors{
+				println!("Script error: {error}");
+			}
+			let (map,errors)=place.to_snf(LoadFailureMode::DefaultToNone).map_err(LoadError::LoadRoblox)?;
+			if errors.count()!=0{
+				print!("Errors encountered while loading the map:\n{}",errors);
+			}
+			Ok(LoadFormat::Map(map))
 		},
 		#[cfg(feature="source")]
 		ReadFormat::Source(bsp)=>Ok(LoadFormat::Map(

strafe-client/src/graphics_worker.rs

@@ -21,7 +21,7 @@ WorkerDescription{
 pub fn new(
 	mut graphics:graphics::GraphicsState,
 	mut config:wgpu::SurfaceConfiguration,
-	surface:wgpu::Surface,
+	surface:wgpu::Surface<'_>,
 	device:wgpu::Device,
 	queue:wgpu::Queue,
 )->crate::compat_worker::INWorker<'_,Instruction>{

strafe-client/src/setup.rs

@@ -117,7 +117,6 @@ impl<'a> SetupContextPartial3<'a>{
 		// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
 		let needed_limits=strafesnet_graphics::graphics::required_limits().using_resolution(self.adapter.limits());
 
-		let trace_dir=std::env::var("WGPU_TRACE");
 		let (device, queue)=pollster::block_on(self.adapter
 			.request_device(
 				&wgpu::DeviceDescriptor {
@@ -125,8 +124,8 @@ impl<'a> SetupContextPartial3<'a>{
 					required_features: (optional_features & self.adapter.features()) | required_features,
 					required_limits: needed_limits,
 					memory_hints:wgpu::MemoryHints::Performance,
+					trace: wgpu::Trace::Off,
 				},
-				trace_dir.ok().as_ref().map(std::path::Path::new),
 			))
 			.expect("Unable to find a suitable GPU adapter!");
 

tools/clarion

@@ -0,0 +1 @@
+mangohud ../target/release/strafe-client bhop_maps/5692098704.snfm "$@"

tools/dev

@@ -0,0 +1 @@
+RUST_BACKTRACE=1 mangohud ../target/debug/strafe-client "$@"