Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

BVH - Sync BVH with 3.x

Browse source 
Templated mask checks and generic NUM_TREES
Fix leaking leaves
This commit is contained in:
lawnjelly 2022-02-04 16:46:10 +00:00
parent 8495be9cec
commit f8eaab5b47
20 changed files with 744 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/math/bvh_split.inc
View file

@ -25,16 +25,16 @@ void _split_leaf_sort_groups_simple(int &num_a, int &num_b, uint16_t *group_a, u
return;
}
Point centre = full_bound.calculate_centre();
Point size = full_bound.calculate_size();
POINT centre = full_bound.calculate_centre();
POINT size = full_bound.calculate_size();
int order[Point::AXIS_COUNT];
int order[POINT::AXIS_COUNT];
order[0] = size.min_axis_index();
order[Point::AXIS_COUNT - 1] = size.max_axis_index();
order[POINT::AXIS_COUNT - 1] = size.max_axis_index();
static_assert(Point::AXIS_COUNT <= 3);
if (Point::AXIS_COUNT == 3) {
static_assert(POINT::AXIS_COUNT <= 3, "BVH POINT::AXIS_COUNT has unexpected size");
if (POINT::AXIS_COUNT == 3) {
order[1] = 3 - (order[0] + order[2]);
}
@ -58,7 +58,7 @@ void _split_leaf_sort_groups_simple(int &num_a, int &num_b, uint16_t *group_a, u
// detect when split on longest axis failed
int min_threshold = MAX_ITEMS / 4;
int min_group_size[Point::AXIS_COUNT];
int min_group_size[POINT::AXIS_COUNT];
min_group_size[0] = MIN(num_a, num_b);
if (min_group_size[0] < min_threshold) {
// slow but sure .. first move everything back into a
@ -68,7 +68,7 @@ void _split_leaf_sort_groups_simple(int &num_a, int &num_b, uint16_t *group_a, u
num_b = 0;
// now calculate the best split
for (int axis = 1; axis < Point::AXIS_COUNT; axis++) {
for (int axis = 1; axis < POINT::AXIS_COUNT; axis++) {
split_axis = order[axis];
int count = 0;
@ -86,7 +86,7 @@ void _split_leaf_sort_groups_simple(int &num_a, int &num_b, uint16_t *group_a, u
// best axis
int best_axis = 0;
int best_min = min_group_size[0];
for (int axis = 1; axis < Point::AXIS_COUNT; axis++) {
for (int axis = 1; axis < POINT::AXIS_COUNT; axis++) {
if (min_group_size[axis] > best_min) {
best_min = min_group_size[axis];
best_axis = axis;