model_id is usize + PhysicsModels struct

src/bvh.rs

@@ -12,12 +12,12 @@ use crate::aabb::Aabb;
 #[derive(Default)]
 pub struct BvhNode{
 	children:Vec<Self>,
-	models:Vec<u32>,
+	models:Vec<usize>,
 	aabb:Aabb,
 }
 
 impl BvhNode{
-	pub fn the_tester<F:FnMut(u32)>(&self,aabb:&Aabb,f:&mut F){
+	pub fn the_tester<F:FnMut(usize)>(&self,aabb:&Aabb,f:&mut F){
 		for &model in &self.models{
 			f(model);
 		}
@@ -37,7 +37,7 @@ fn generate_bvh_node(boxen:Vec<(usize,Aabb)>)->BvhNode{
 	let n=boxen.len();
 	if n<20{
 		let mut aabb=Aabb::default();
-		let models=boxen.into_iter().map(|b|{aabb.join(&b.1);b.0 as u32}).collect();
+		let models=boxen.into_iter().map(|b|{aabb.join(&b.1);b.0}).collect();
 		BvhNode{
 			children:Vec::new(),
 			models,

src/model.rs

@@ -50,27 +50,19 @@ pub struct IndexedModelInstances{
 }
 //stage description referencing flattened ids is spooky, but the map loading is meant to be deterministic.
 pub struct ModeDescription{
-	pub start:u32,//start=model_id
+	pub start:usize,//start=model_id
-	pub spawns:Vec<u32>,//spawns[spawn_id]=model_id
+	pub spawns:Vec<usize>,//spawns[spawn_id]=model_id
-	pub ordered_checkpoints:Vec<u32>,//ordered_checkpoints[checkpoint_id]=model_id
+	pub ordered_checkpoints:Vec<usize>,//ordered_checkpoints[checkpoint_id]=model_id
-	pub unordered_checkpoints:Vec<u32>,//unordered_checkpoints[checkpoint_id]=model_id
+	pub unordered_checkpoints:Vec<usize>,//unordered_checkpoints[checkpoint_id]=model_id
 	pub spawn_from_stage_id:std::collections::HashMap::<u32,usize>,
 	pub ordered_checkpoint_from_checkpoint_id:std::collections::HashMap::<u32,usize>,
 }
 impl ModeDescription{
-	pub fn get_spawn_model_id(&self,stage_id:u32)->Option<&u32>{
+	pub fn get_spawn_model_id(&self,stage_id:u32)->Option<&usize>{
-		if let Some(&spawn)=self.spawn_from_stage_id.get(&stage_id){
+		self.spawns.get(*self.spawn_from_stage_id.get(&stage_id)?)
-			self.spawns.get(spawn)
-		}else{
-			None
-		}
 	}
-	pub fn get_ordered_checkpoint_model_id(&self,checkpoint_id:u32)->Option<&u32>{
+	pub fn get_ordered_checkpoint_model_id(&self,checkpoint_id:u32)->Option<&usize>{
-		if let Some(&checkpoint)=self.ordered_checkpoint_from_checkpoint_id.get(&checkpoint_id){
+		self.ordered_checkpoints.get(*self.ordered_checkpoint_from_checkpoint_id.get(&checkpoint_id)?)
-			self.ordered_checkpoints.get(checkpoint)
-		}else{
-			None
-		}
 	}
 }
 pub enum TempIndexedAttributes{

src/physics.rs

@@ -124,7 +124,7 @@ struct WalkState{
 impl WalkEnum{
 	//args going crazy
 	//(walk_enum,body.acceleration)=with_target_velocity();
-	fn with_target_velocity(touching:&TouchingState,body:&Body,style:&StyleModifiers,models:&Vec<ModelPhysics>,mut velocity:Planar64Vec3,normal:&Planar64Vec3)->(WalkEnum,Planar64Vec3){
+	fn with_target_velocity(touching:&TouchingState,body:&Body,style:&StyleModifiers,models:&PhysicsModels,mut velocity:Planar64Vec3,normal:&Planar64Vec3)->(WalkEnum,Planar64Vec3){
 		touching.constrain_velocity(models,&mut velocity);
 		let mut target_diff=velocity-body.velocity;
 		//remove normal component
@@ -150,14 +150,14 @@ impl WalkEnum{
 	}
 }
 impl WalkState{
-	fn ground(touching:&TouchingState,body:&Body,style:&StyleModifiers,models:&Vec<ModelPhysics>,mut velocity:Planar64Vec3)->(Self,Planar64Vec3){
+	fn ground(touching:&TouchingState,body:&Body,style:&StyleModifiers,models:&PhysicsModels,velocity:Planar64Vec3)->(Self,Planar64Vec3){
 		let (walk_enum,a)=WalkEnum::with_target_velocity(touching,body,style,models,velocity,&Planar64Vec3::Y);
 		(Self{
 			state:walk_enum,
 			normal:Planar64Vec3::Y,
 		},a)
 	}
-	fn ladder(touching:&TouchingState,body:&Body,style:&StyleModifiers,models:&Vec<ModelPhysics>,mut velocity:Planar64Vec3,normal:&Planar64Vec3)->(Self,Planar64Vec3){
+	fn ladder(touching:&TouchingState,body:&Body,style:&StyleModifiers,models:&PhysicsModels,velocity:Planar64Vec3,normal:&Planar64Vec3)->(Self,Planar64Vec3){
 		let (walk_enum,a)=WalkEnum::with_target_velocity(touching,body,style,models,velocity,normal);
 		(Self{
 			state:walk_enum,
@@ -193,6 +193,36 @@ impl Default for Modes{
 	}
 }
 
+struct PhysicsModels{
+	models:Vec<ModelPhysics>,
+	model_id_from_wormhole_id:std::collections::HashMap::<u32,usize>,
+}
+impl PhysicsModels{
+	fn clear(&mut self){
+		self.models.clear();
+		self.model_id_from_wormhole_id.clear();
+	}
+	fn get(&self,i:usize)->Option<&ModelPhysics>{
+		self.models.get(i)
+	}
+	fn get_wormhole_model(&self,wormhole_id:u32)->Option<&ModelPhysics>{
+		self.models.get(*self.model_id_from_wormhole_id.get(&wormhole_id)?)
+	}
+	fn push(&mut self,model:ModelPhysics)->usize{
+		let model_id=self.models.len();
+		self.models.push(model);
+		model_id
+	}
+}
+impl Default for PhysicsModels{
+	fn default() -> Self {
+		Self{
+			models:Vec::new(),
+			model_id_from_wormhole_id:std::collections::HashMap::new(),
+		}
+	}
+}
+
 #[derive(Clone)]
 pub struct PhysicsCamera {
 	offset: Planar64Vec3,
@@ -531,7 +561,7 @@ pub struct PhysicsState{
 	controls:u32,
 	move_state:MoveState,
 	//all models
-	models:Vec<ModelPhysics>,
+	models:PhysicsModels,
 	bvh:crate::bvh::BvhNode,
 	
 	modes:Modes,
@@ -610,44 +640,44 @@ impl ModelPhysics {
 //OR have a separate list from contacts for model intersection
 #[derive(Debug,Clone,Eq,Hash,PartialEq)]
 pub struct RelativeCollision {
-	face: TreyMeshFace,//just an id
+	face:TreyMeshFace,//just an id
-	model: u32,//using id to avoid lifetimes
+	model:usize,//using id to avoid lifetimes
 }
 
 impl RelativeCollision {
-	pub fn model<'a>(&self,models:&'a Vec<ModelPhysics>)->Option<&'a ModelPhysics>{
+	fn model<'a>(&self,models:&'a PhysicsModels)->Option<&'a ModelPhysics>{
-		models.get(self.model as usize)
+		models.get(self.model)
 	}
 	// pub fn mesh(&self,models:&Vec<ModelPhysics>) -> TreyMesh {
 	// 	return self.model(models).unwrap().face_mesh(self.face).clone()
 	// }
-	pub fn normal(&self,models:&Vec<ModelPhysics>) -> Planar64Vec3 {
+	fn normal(&self,models:&PhysicsModels) -> Planar64Vec3 {
 		return self.model(models).unwrap().face_normal(self.face)
 	}
 }
 
 struct TouchingState{
-	contacts:std::collections::HashMap::<u32,RelativeCollision>,
+	contacts:std::collections::HashMap::<usize,RelativeCollision>,
-	intersects:std::collections::HashMap::<u32,RelativeCollision>,
+	intersects:std::collections::HashMap::<usize,RelativeCollision>,
 }
 impl TouchingState{
 	fn clear(&mut self){
 		self.contacts.clear();
 		self.intersects.clear();
 	}
-	fn insert_contact(&mut self,model_id:u32,collision:RelativeCollision)->Option<RelativeCollision>{
+	fn insert_contact(&mut self,model_id:usize,collision:RelativeCollision)->Option<RelativeCollision>{
 		self.contacts.insert(model_id,collision)
 	}
-	fn remove_contact(&mut self,model_id:u32)->Option<RelativeCollision>{
+	fn remove_contact(&mut self,model_id:usize)->Option<RelativeCollision>{
 		self.contacts.remove(&model_id)
 	}
-	fn insert_intersect(&mut self,model_id:u32,collision:RelativeCollision)->Option<RelativeCollision>{
+	fn insert_intersect(&mut self,model_id:usize,collision:RelativeCollision)->Option<RelativeCollision>{
 		self.intersects.insert(model_id,collision)
 	}
-	fn remove_intersect(&mut self,model_id:u32)->Option<RelativeCollision>{
+	fn remove_intersect(&mut self,model_id:usize)->Option<RelativeCollision>{
 		self.intersects.remove(&model_id)
 	}
-	fn constrain_velocity(&self,models:&Vec<ModelPhysics>,velocity:&mut Planar64Vec3){
+	fn constrain_velocity(&self,models:&PhysicsModels,velocity:&mut Planar64Vec3){
 		for (_,contact) in &self.contacts {
 			let n=contact.normal(models);
 			let d=velocity.dot(n);
@@ -656,7 +686,7 @@ impl TouchingState{
 			}
 		}
 	}
-	fn constrain_acceleration(&self,models:&Vec<ModelPhysics>,acceleration:&mut Planar64Vec3){
+	fn constrain_acceleration(&self,models:&PhysicsModels,acceleration:&mut Planar64Vec3){
 		for (_,contact) in &self.contacts {
 			let n=contact.normal(models);
 			let d=acceleration.dot(n);
@@ -712,7 +742,7 @@ impl Default for PhysicsState{
 			time: Time::ZERO,
 			style:StyleModifiers::default(),
 			touching:TouchingState::default(),
-			models: Vec::new(),
+			models:PhysicsModels::default(),
 			bvh:crate::bvh::BvhNode::default(),
 			move_state: MoveState::Air,
 			camera: PhysicsCamera::from_offset(Planar64Vec3::int(0,2,0)),//4.5-2.5=2
@@ -835,8 +865,7 @@ impl PhysicsState {
 			//make aabb and run vertices to get realistic bounds
 			for model_instance in &model.instances{
 				if let Some(model_physics)=ModelPhysics::from_model(model,model_instance){
-					let model_id=self.models.len() as u32;
+					let model_id=self.models.push(model_physics) as u32;
-					self.models.push(model_physics);
 					for attr in &model_instance.temp_indexing{
 						match attr{
 							crate::model::TempIndexedAttributes::Start{mode_id}=>starts.push((*mode_id,model_id)),
@@ -848,7 +877,7 @@ impl PhysicsState {
 				}
 			}
 		}
-		self.bvh=crate::bvh::generate_bvh(self.models.iter().map(|m|m.mesh().clone()).collect());
+		self.bvh=crate::bvh::generate_bvh(self.models.models.iter().map(|m|m.mesh().clone()).collect());
 		//I don't wanna write structs for temporary structures
 		//this code builds ModeDescriptions from the unsorted lists at the top of the function
 		starts.sort_by_key(|tup|tup.0);
@@ -888,15 +917,15 @@ impl PhysicsState {
 			let mut eshmep1=std::collections::HashMap::new();
 			let mut eshmep2=std::collections::HashMap::new();
 			crate::model::ModeDescription{
-				start:tup.0,
+				start:tup.0 as usize,
-				spawns:tup.1.into_iter().enumerate().map(|(i,tup)|{eshmep1.insert(tup.0,i);tup.1}).collect(),
+				spawns:tup.1.into_iter().enumerate().map(|(i,tup)|{eshmep1.insert(tup.0,i);tup.1 as usize}).collect(),
-				ordered_checkpoints:tup.2.into_iter().enumerate().map(|(i,tup)|{eshmep2.insert(tup.0,i);tup.1}).collect(),
+				ordered_checkpoints:tup.2.into_iter().enumerate().map(|(i,tup)|{eshmep2.insert(tup.0,i);tup.1 as usize}).collect(),
-				unordered_checkpoints:tup.3,
+				unordered_checkpoints:tup.3.into_iter().map(|v|v as usize).collect(),
 				spawn_from_stage_id:eshmep1,
 				ordered_checkpoint_from_checkpoint_id:eshmep2,
 			}
 		}).collect());
-		println!("Physics Objects: {}",self.models.len());
+		println!("Physics Objects: {}",self.models.models.len());
 	}
 
 	pub fn load_user_settings(&mut self,user_settings:&crate::settings::UserSettings){
@@ -1159,9 +1188,9 @@ impl PhysicsState {
 		}
 		None
 	}
-	fn predict_collision_start(&self,time:Time,time_limit:Time,model_id:u32) -> Option<TimedInstruction<PhysicsInstruction>> {
+	fn predict_collision_start(&self,time:Time,time_limit:Time,model_id:usize) -> Option<TimedInstruction<PhysicsInstruction>> {
 		let mesh0=self.mesh();
-		let mesh1=self.models.get(model_id as usize).unwrap().mesh();
+		let mesh1=self.models.get(model_id).unwrap().mesh();
 		let (p,v,a,body_time)=(self.body.position,self.body.velocity,self.body.acceleration,self.body.time);
 		//find best t
 		let mut best_time=time_limit;
@@ -1266,12 +1295,12 @@ impl PhysicsState {
 			}
 		}
 		//generate instruction
-		if let Some(face) = best_face{
+		if let Some(face)=best_face{
-			return Some(TimedInstruction {
+			return Some(TimedInstruction{
 				time: best_time,
-				instruction: PhysicsInstruction::CollisionStart(RelativeCollision {
+				instruction:PhysicsInstruction::CollisionStart(RelativeCollision{
 					face,
-					model: model_id
+					model:model_id
 				})
 			})
 		}
@@ -1316,7 +1345,7 @@ fn teleport(body:&mut Body,touching:&mut TouchingState,style:&StyleModifiers,poi
 	//touching.recalculate(body);
 }
 
-fn run_teleport_behaviour(teleport_behaviour:&Option<crate::model::TeleportBehaviour>,game:&mut GameMechanicsState,models:&Vec<ModelPhysics>,modes:&Modes,style:&StyleModifiers,touching:&mut TouchingState,body:&mut Body)->Option<MoveState>{
+fn run_teleport_behaviour(teleport_behaviour:&Option<crate::model::TeleportBehaviour>,game:&mut GameMechanicsState,models:&PhysicsModels,modes:&Modes,style:&StyleModifiers,touching:&mut TouchingState,body:&mut Body)->Option<MoveState>{
 	match teleport_behaviour{
 		Some(crate::model::TeleportBehaviour::StageElement(stage_element))=>{
 			if stage_element.force||game.stage_id<stage_element.stage_id{