godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63448 from rburing/bvh_debug_fixup_3.x 

[3.x] Fixup BVH debugging statements
This commit is contained in:
Rémi Verschelde 2022-07-25 21:29:09 +02:00 committed by GitHub
parent 5ad86fc830 90725964a4
commit 44eca8ef24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/math/bvh.h
View File

@ -295,7 +295,7 @@ public:
tree.update(); tree.update();
_check_for_collisions(); _check_for_collisions();
#ifdef BVH_INTEGRITY_CHECKS #ifdef BVH_INTEGRITY_CHECKS
tree.integrity_check_all(); tree._integrity_check_all();
#endif #endif
} }
@ -465,13 +465,6 @@ private:
continue; continue;
} }
#ifdef BVH_CHECKS
// if neither are pairable, they should ignore each other
// THIS SHOULD NEVER HAPPEN .. now we only test the pairable tree
// if the changed item is not pairable
CRASH_COND(params.test_pairable_only && !tree._extra[ref_id].pairable);
#endif
// checkmasks is already done in the cull routine. // checkmasks is already done in the cull routine.
BVHHandle h_collidee; BVHHandle h_collidee;
h_collidee.set_id(ref_id); h_collidee.set_id(ref_id);

6
core/math/bvh_public.inc
View File

@ -2,7 +2,7 @@ public:
BVHHandle item_add(T *p_userdata, bool p_active, const BOUNDS &p_aabb, int32_t p_subindex, uint32_t p_tree_id, uint32_t p_tree_collision_mask, bool p_invisible = false) { BVHHandle item_add(T *p_userdata, bool p_active, const BOUNDS &p_aabb, int32_t p_subindex, uint32_t p_tree_id, uint32_t p_tree_collision_mask, bool p_invisible = false) {
#ifdef BVH_VERBOSE_TREE #ifdef BVH_VERBOSE_TREE
VERBOSE_PRINT("\nitem_add BEFORE"); VERBOSE_PRINT("\nitem_add BEFORE");
_debug_recursive_print_tree(0); _debug_recursive_print_tree(p_tree_id);
VERBOSE_PRINT("\n"); VERBOSE_PRINT("\n");
#endif #endif
@ -78,8 +78,8 @@ BVHHandle item_add(T *p_userdata, bool p_active, const BOUNDS &p_aabb, int32_t p
mem += _nodes.estimate_memory_use(); mem += _nodes.estimate_memory_use();
String sz = _debug_aabb_to_string(abb); String sz = _debug_aabb_to_string(abb);
VERBOSE_PRINT("\titem_add [" + itos(ref_id) + "] " + itos(_refs.size()) + " refs,\t" + itos(_nodes.size()) + " nodes " + sz); VERBOSE_PRINT("\titem_add [" + itos(ref_id) + "] " + itos(_refs.used_size()) + " refs,\t" + itos(_nodes.used_size()) + " nodes " + sz);
VERBOSE_PRINT("mem use : " + itos(mem) + ", num nodes : " + itos(_nodes.size())); VERBOSE_PRINT("mem use : " + itos(mem) + ", num nodes reserved : " + itos(_nodes.reserved_size()));
#endif #endif