bvh: remove unnecessary work

This commit is contained in:
Quaternions 2024-08-18 14:42:02 -07:00
parent 88b87b1859
commit 2b8bb0b705

View File

@ -121,13 +121,11 @@ fn generate_bvh_node<T>(boxen:Vec<(T,Aabb)>,force:bool)->BvhNode<T>{
aabb, aabb,
} }
}else{ }else{
let mut octant=std::collections::HashMap::with_capacity(n);//this ids which octant the boxen is put in
let mut sort_x=Vec::with_capacity(n); let mut sort_x=Vec::with_capacity(n);
let mut sort_y=Vec::with_capacity(n); let mut sort_y=Vec::with_capacity(n);
let mut sort_z=Vec::with_capacity(n); let mut sort_z=Vec::with_capacity(n);
for (i,(_,aabb)) in boxen.iter().enumerate(){ for (i,(_,aabb)) in boxen.iter().enumerate(){
let center=aabb.center(); let center=aabb.center();
octant.insert(i,0);
sort_x.push((i,center.x())); sort_x.push((i,center.x()));
sort_y.push((i,center.y())); sort_y.push((i,center.y()));
sort_z.push((i,center.z())); sort_z.push((i,center.z()));
@ -139,26 +137,26 @@ fn generate_bvh_node<T>(boxen:Vec<(T,Aabb)>,force:bool)->BvhNode<T>{
let median_x=sort_x[h].1; let median_x=sort_x[h].1;
let median_y=sort_y[h].1; let median_y=sort_y[h].1;
let median_z=sort_z[h].1; let median_z=sort_z[h].1;
for (i,c) in sort_x{ //partition point gives the first index for which the predicate evaluates to false
if median_x<c{ let first_index_gt_median_x=sort_x.partition_point(|tup|!(median_x<tup.1));
octant.insert(i,octant[&i]+1<<0); let first_index_gt_median_y=sort_y.partition_point(|tup|!(median_y<tup.1));
} let first_index_gt_median_z=sort_z.partition_point(|tup|!(median_z<tup.1));
//this ids which octant the boxen is put in
let mut octant=vec![0;n];
for &(i,_) in &sort_x[first_index_gt_median_x..]{
octant[i]+=1<<0;
} }
for (i,c) in sort_y{ for &(i,_) in &sort_y[first_index_gt_median_y..]{
if median_y<c{ octant[i]+=1<<1;
octant.insert(i,octant[&i]+1<<1);
}
} }
for (i,c) in sort_z{ for &(i,_) in &sort_z[first_index_gt_median_z..]{
if median_z<c{ octant[i]+=1<<2;
octant.insert(i,octant[&i]+1<<2);
}
} }
//generate lists for unique octant values //generate lists for unique octant values
let mut list_list=Vec::with_capacity(8); let mut list_list=Vec::with_capacity(8);
let mut octant_list=Vec::with_capacity(8); let mut octant_list=Vec::with_capacity(8);
for (i,(data,aabb)) in boxen.into_iter().enumerate(){ for (i,(data,aabb)) in boxen.into_iter().enumerate(){
let octant_id=octant[&i]; let octant_id=octant[i];
let list_id=if let Some(list_id)=octant_list.iter().position(|&id|id==octant_id){ let list_id=if let Some(list_id)=octant_list.iter().position(|&id|id==octant_id){
list_id list_id
}else{ }else{