From 49931a40fc3e198c3a021d9048113ebf39683340 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Wed, 1 Nov 2023 16:40:05 -0700 Subject: [PATCH] make aabb_list with silly iterator to avoid pub-ing Vert --- src/model_physics.rs | 5 +++++ src/physics.rs | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/model_physics.rs b/src/model_physics.rs index e6c9f42..9051133 100644 --- a/src/model_physics.rs +++ b/src/model_physics.rs @@ -167,6 +167,11 @@ pub trait MeshQuery{ fn edge_verts(&self,edge_id:EDGE)->Cow<[VERT;2]>; fn vert_edges(&self,vert_id:VERT)->Cow>; } +impl PhysicsMesh{ + pub fn verts<'a>(&'a self)->impl Iterator+'a{ + self.verts.iter().map(|Vert(pos)|*pos) + } +} impl MeshQuery for PhysicsMesh{ fn closest_fev(&self,point:Planar64Vec3)->FEV{ //TODO: put some genius code right here diff --git a/src/physics.rs b/src/physics.rs index 0c02a15..6cd68bd 100644 --- a/src/physics.rs +++ b/src/physics.rs @@ -168,6 +168,15 @@ impl PhysicsModels{ self.attributes.clear(); self.model_id_from_wormhole_id.clear(); } + fn aabb_list(&self)->Vec{ + self.models.iter().map(|model|{ + let mut aabb=crate::aabb::Aabb::default(); + for pos in self.meshes[model.mesh_id].verts(){ + aabb.grow(model.transform.transform_point3(pos)); + } + aabb + }).collect() + } //TODO: "statically" verify the maps don't refer to any nonexistant data, if they do delete the references. //then I can make these getter functions unchecked. fn mesh(&self,model_id:usize)->TransformedMesh{ @@ -853,7 +862,7 @@ impl PhysicsState { self.meshes.push(PhysicsMesh::from(model)); } } - self.bvh=crate::bvh::generate_bvh(self.models.aabb_list(&self.meshes)); + self.bvh=crate::bvh::generate_bvh(self.models.aabb_list()); //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.1.mode_id);