From ac4ba19ed3a766052fe97765599d57f27fea05ca Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Thu, 28 Sep 2023 16:15:12 -0700
Subject: [PATCH] calculate vertex extents for accurate mesh aabb hitboxes

---
 src/body.rs | 26 ++++++++++++++------------
 src/main.rs | 10 ++++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/body.rs b/src/body.rs
index 10f1def3..3ec10d31 100644
--- a/src/body.rs
+++ b/src/body.rs
@@ -284,7 +284,7 @@ pub enum AabbFace{
 	Bottom,
 	Front,
 }
-
+#[derive(Clone)]
 pub struct Aabb {
 	min: glam::Vec3,
 	max: glam::Vec3,
@@ -387,28 +387,30 @@ type TreyMesh = Aabb;
 pub struct ModelPhysics {
 	//A model is a thing that has a hitbox. can be represented by a list of TreyMesh-es
 	//in this iteration, all it needs is extents.
-	model_transform: glam::Affine3A,
+	mesh: TreyMesh,
 }
 
 impl ModelPhysics {
-	pub fn new(model_transform:glam::Affine3A) -> Self {
-		Self{model_transform}
+	pub fn from_model(model:&crate::model::IndexedModel,model_transform:glam::Affine3A) -> Self {
+		let mut aabb=Aabb::new();
+		for indexed_vertex in &model.unique_vertices {
+			aabb.grow(model_transform.transform_point3(glam::Vec3::from_array(model.unique_pos[indexed_vertex.pos as usize])));
+		}
+		Self{
+			mesh:aabb,
+		}
 	}
 	pub fn unit_vertices(&self) -> [glam::Vec3;8] {
 		Aabb::unit_vertices()
 	}
-	pub fn mesh(&self) -> TreyMesh {
-		let mut aabb=Aabb::new();
-		for &vertex in self.unit_vertices().iter() {
-			aabb.grow(self.model_transform.transform_point3(vertex));
-		}
-		return aabb;
+	pub fn mesh(&self) -> &TreyMesh {
+		return &self.mesh;
 	}
 	pub fn unit_face_vertices(&self,face:TreyMeshFace) -> [glam::Vec3;4] {
 		Aabb::unit_face_vertices(face)
 	}
 	pub fn face_mesh(&self,face:TreyMeshFace) -> TreyMesh {
-		let mut aabb=self.mesh();
+		let mut aabb=self.mesh.clone();
 		//in this implementation face = worldspace aabb face
 		match face {
 			AabbFace::Right => aabb.min.x=aabb.max.x,
@@ -435,7 +437,7 @@ pub struct RelativeCollision {
 
 impl RelativeCollision {
 	pub fn mesh(&self,models:&Vec<ModelPhysics>) -> TreyMesh {
-		return models.get(self.model as usize).unwrap().face_mesh(self.face)
+		return models.get(self.model as usize).unwrap().face_mesh(self.face).clone()
 	}
 	pub fn normal(&self,models:&Vec<ModelPhysics>) -> glam::Vec3 {
 		return models.get(self.model as usize).unwrap().face_normal(self.face)
diff --git a/src/main.rs b/src/main.rs
index 6fb60d4c..46648c50 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -83,11 +83,13 @@ impl GraphicsData {
 		depth_texture.create_view(&wgpu::TextureViewDescriptor::default())
 	}
 
-	fn generate_model_physics(&mut self,modeldatas:&Vec<ModelData>){
-		self.physics.models.append(&mut modeldatas.iter().map(|m|
+	fn generate_model_physics(&mut self,indexed_models:&model::IndexedModelInstances){
+		for model in &indexed_models.models{
 			//make aabb and run vertices to get realistic bounds
-			m.instances.iter().map(|t|body::ModelPhysics::new(t.model_transform))
-		).flatten().collect());
+			for model_instance in &model.instances{
+				self.physics.models.push(body::ModelPhysics::from_model(&model,model_instance.model_transform));
+			}
+		}
 		println!("Physics Objects: {}",self.physics.models.len());
 	}
 	fn generate_model_graphics(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,mut indexed_models:model::IndexedModelInstances){