From fe440249c3f699f4d60035654bed82d5d261c104 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Mon, 20 Jan 2025 09:01:32 -0800
Subject: [PATCH] move tests to physics

---
 strafe-client/src/physics.rs | 82 ++++++++++++++++++++++++++++++++++-
 strafe-client/src/session.rs | 84 ------------------------------------
 2 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/strafe-client/src/physics.rs b/strafe-client/src/physics.rs
index 9f8ca750..21fd44ed 100644
--- a/strafe-client/src/physics.rs
+++ b/strafe-client/src/physics.rs
@@ -1902,8 +1902,9 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
 
 #[cfg(test)]
 mod test{
-	use strafesnet_common::integer::{vec3::{self,int as int3},mat3};
+	use crate::file;
 	use crate::body::VirtualBody;
+	use strafesnet_common::integer::{vec3::{self,int as int3},mat3};
 	use super::*;
 	fn test_collision_axis_aligned(relative_body:Body,expected_collision_time:Option<Time>){
 		let h0=HitboxMesh::new(PhysicsMesh::unit_cube(),integer::Planar64Affine3::new(mat3::from_diagonal(int3(5,1,5)>>1),vec3::ZERO));
@@ -2116,4 +2117,83 @@ mod test{
 			Time::ZERO
 		),None);
 	}
+	#[test]
+	fn run_replay(){
+		println!("loading map file..");
+		let map=file::load("../tools/bhop_maps/5692113331.snfm");
+		println!("loading bot file..");
+		let bot=file::load("../tools/replays/534s+997497968ns.snfb");
+		if let (Ok(file::Format2::Map(map)),Ok(file::Format2::Bot(bot)))=(map,bot){
+			// create recording
+			let mut physics_data=PhysicsData::default();
+			println!("generating models..");
+			physics_data.generate_models(&map);
+			println!("simulating...");
+			let mut physics=PhysicsState::default();
+			for ins in bot.instructions{
+				PhysicsContext::run_input_instruction(&mut physics,&physics_data,ins);
+			}
+			match physics.get_finish_time(){
+				Some(time)=>println!("finish time:{}",time),
+				None=>println!("simulation did not end in finished state"),
+			}
+		}else{
+			panic!("missing files");
+		}
+	}
+	#[test]
+	fn test_determinism(){
+		println!("loading map file..");
+		let map=file::load("../tools/bhop_maps/5692113331.snfm");
+		println!("loading bot file..");
+		let bot=file::load("../tools/replays/340s+821216061ns.snfb");
+		if let (Ok(file::Format2::Map(map)),Ok(file::Format2::Bot(bot)))=(map,bot){
+
+			// create default physics state
+			let mut physics_deterministic=PhysicsState::default();
+			// create a second physics state
+			let mut physics_filtered=PhysicsState::default();
+
+			// invent a new bot id and insert the replay
+			let mut physics_data=PhysicsData::default();
+			println!("generating models..");
+			physics_data.generate_models(&map);
+			println!("simulating...");
+
+			for (i,ins) in bot.instructions.into_iter().enumerate(){
+				let state_deterministic=physics_deterministic.clone();
+				let state_filtered=physics_filtered.clone();
+				PhysicsContext::run_input_instruction(&mut physics_deterministic,&physics_data,ins.clone());
+				match ins{
+					strafesnet_common::instruction::TimedInstruction{instruction:strafesnet_common::physics::Instruction::Idle,..}=>(),
+					other=>{
+						// run
+						PhysicsContext::run_input_instruction(&mut physics_filtered,&physics_data,other.clone());
+						// check if position matches
+						let b0=physics_deterministic.camera_body();
+						let b1=physics_filtered.camera_body();
+						if b0.position!=b1.position{
+							println!("instruction #{i}={:?}",other);
+							println!("desync at instruction #{}",i);
+							println!("deterministic state0:\n{state_deterministic:?}");
+							println!("filtered state0:\n{state_filtered:?}");
+							println!("deterministic state1:\n{:?}",physics_deterministic);
+							println!("filtered state1:\n{:?}",physics_filtered);
+							panic!("oh no bro");
+						}
+					},
+				}
+			}
+			match physics_deterministic.get_finish_time(){
+				Some(time)=>println!("[with idle] finish time:{}",time),
+				None=>println!("[with idle] simulation did not end in finished state"),
+			}
+			match physics_filtered.get_finish_time(){
+				Some(time)=>println!("[filtered] finish time:{}",time),
+				None=>println!("[filtered] simulation did not end in finished state"),
+			}
+		}else{
+			panic!("missing files");
+		}
+	}
 }
diff --git a/strafe-client/src/session.rs b/strafe-client/src/session.rs
index 8eb38580..e9d10a58 100644
--- a/strafe-client/src/session.rs
+++ b/strafe-client/src/session.rs
@@ -430,87 +430,3 @@ impl InstructionEmitter<StepInstruction> for Session{
 		self.mouse_interpolator.next_instruction(time_limit)
 	}
 }
-
-#[cfg(test)]
-mod test{
-	use crate::{file,physics};
-	#[test]
-	fn run_replay(){
-		println!("loading map file..");
-		let map=file::load("../tools/bhop_maps/5692113331.snfm");
-		println!("loading bot file..");
-		let bot=file::load("../tools/replays/534s+997497968ns.snfb");
-		if let (Ok(file::Format2::Map(map)),Ok(file::Format2::Bot(bot)))=(map,bot){
-			// create recording
-			let mut physics_data=physics::PhysicsData::default();
-			println!("generating models..");
-			physics_data.generate_models(&map);
-			println!("simulating...");
-			let mut physics=physics::PhysicsState::default();
-			for ins in bot.instructions{
-				physics::PhysicsContext::run_input_instruction(&mut physics,&physics_data,ins);
-			}
-			match physics.get_finish_time(){
-				Some(time)=>println!("finish time:{}",time),
-				None=>println!("simulation did not end in finished state"),
-			}
-		}else{
-			panic!("missing files");
-		}
-	}
-	#[test]
-	fn test_determinism(){
-		println!("loading map file..");
-		let map=file::load("../tools/bhop_maps/5692113331.snfm");
-		println!("loading bot file..");
-		let bot=file::load("../tools/replays/340s+821216061ns.snfb");
-		if let (Ok(file::Format2::Map(map)),Ok(file::Format2::Bot(bot)))=(map,bot){
-
-			// create default physics state
-			let mut physics_deterministic=physics::PhysicsState::default();
-			// create a second physics state
-			let mut physics_filtered=physics::PhysicsState::default();
-
-			// invent a new bot id and insert the replay
-			let mut physics_data=physics::PhysicsData::default();
-			println!("generating models..");
-			physics_data.generate_models(&map);
-			println!("simulating...");
-
-			for (i,ins) in bot.instructions.into_iter().enumerate(){
-				let state_deterministic=physics_deterministic.clone();
-				let state_filtered=physics_filtered.clone();
-				physics::PhysicsContext::run_input_instruction(&mut physics_deterministic,&physics_data,ins.clone());
-				match ins{
-					strafesnet_common::instruction::TimedInstruction{instruction:strafesnet_common::physics::Instruction::Idle,..}=>(),
-					other=>{
-						// run
-						physics::PhysicsContext::run_input_instruction(&mut physics_filtered,&physics_data,other.clone());
-						// check if position matches
-						let b0=physics_deterministic.camera_body();
-						let b1=physics_filtered.camera_body();
-						if b0.position!=b1.position{
-							println!("instruction #{i}={:?}",other);
-							println!("desync at instruction #{}",i);
-							println!("deterministic state0:\n{state_deterministic:?}");
-							println!("filtered state0:\n{state_filtered:?}");
-							println!("deterministic state1:\n{:?}",physics_deterministic);
-							println!("filtered state1:\n{:?}",physics_filtered);
-							panic!("oh no bro");
-						}
-					},
-				}
-			}
-			match physics_deterministic.get_finish_time(){
-				Some(time)=>println!("[with idle] finish time:{}",time),
-				None=>println!("[with idle] simulation did not end in finished state"),
-			}
-			match physics_filtered.get_finish_time(){
-				Some(time)=>println!("[filtered] finish time:{}",time),
-				None=>println!("[filtered] simulation did not end in finished state"),
-			}
-		}else{
-			panic!("missing files");
-		}
-	}
-}