hodasemi/rustray
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Optimize iterative search

Browse source
This commit is contained in:
hodasemi 2019-04-29 08:47:27 +02:00
parent e3dd4861d2
commit f6b11e56b8
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/acceleration_data.rs
View file

@ -96,7 +96,7 @@ impl<'a> AccelerationData<'a> {
if self.recursive { if self.recursive {
self.traverse_tree_recursively(f, 0); self.traverse_tree_recursively(f, 0);
} else { } else {
self.traverse_tree_iteratively(f); self.traverse_tree_iteratively(f, 0);
} }
} }
@ -117,38 +117,27 @@ impl<'a> AccelerationData<'a> {
} }
} }
fn traverse_tree_iteratively<F>(&self, f: &mut F) fn traverse_tree_iteratively<F>(&self, f: &mut F, index: usize)
where where
F: FnMut(usize, &AABB) -> bool, F: FnMut(usize, &AABB) -> bool,
{ {
let mut discovered = vec![false; 1024];
let mut stack = Vec::new(); let mut stack = Vec::new();
// push root node // push root node
stack.push(0); stack.push(index);
while !stack.is_empty() { while !stack.is_empty() {
let v = stack.pop().unwrap(); let v = stack.pop().unwrap();
if discovered[v] {
continue;
}
discovered[v] = true;
if (*f)(v, &self.data[v]) { if (*f)(v, &self.data[v]) {
let left_child = self.data[v].left_child; let left_child = self.data[v].left_child;
if left_child != -1 { if left_child != -1 {
if !discovered[left_child as usize] { stack.push(left_child as usize);
stack.push(left_child as usize);
}
} }
let right_child = self.data[v].right_child; let right_child = self.data[v].right_child;
if right_child != -1 { if right_child != -1 {
if !discovered[right_child as usize] { stack.push(right_child as usize);
stack.push(right_child as usize);
}
} }
} }
} }