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

Merge pull request #45184 from lawnjelly/bvh_plusone

Browse Source 
BVH - fix physics expecting plus one based IDs.
This commit is contained in:
Rémi Verschelde 2021-01-14 15:47:43 +01:00 committed by GitHub
commit aa3bdade4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/math/bvh_debug.inc
View File

@ -7,19 +7,19 @@ void _debug_recursive_print_tree(int p_tree_id) const {
String _debug_aabb_to_string(const BVH_ABB &aabb) const { String _debug_aabb_to_string(const BVH_ABB &aabb) const {
String sz = "("; String sz = "(";
sz += itos(-aabb.neg_min.x); sz += itos(aabb.min.x);
sz += " ~ "; sz += " ~ ";
sz += itos(aabb.max.x); sz += itos(-aabb.neg_max.x);
sz += ") ("; sz += ") (";
sz += itos(-aabb.neg_min.y); sz += itos(aabb.min.y);
sz += " ~ "; sz += " ~ ";
sz += itos(aabb.max.y); sz += itos(-aabb.neg_max.y);
sz += ") ("; sz += ") (";
sz += itos(-aabb.neg_min.z); sz += itos(aabb.min.z);
sz += " ~ "; sz += " ~ ";
sz += itos(aabb.max.z); sz += itos(-aabb.neg_max.z);
sz += ") "; sz += ") ";
Vector3 size = aabb.calculate_size(); Vector3 size = aabb.calculate_size();
@ -41,14 +41,14 @@ void _debug_recursive_print_tree_node(uint32_t p_node_id, int depth = 0) const {
if (tnode.is_leaf()) { if (tnode.is_leaf()) {
sz += " L"; sz += " L";
sz += itos(tnode.height) + " "; sz += itos(tnode.height) + " ";
const TLeaf *leaf = node_get_leaf(tnode); const TLeaf &leaf = _node_get_leaf(tnode);
sz += "["; sz += "[";
for (int n = 0; n < leaf->num_items; n++) { for (int n = 0; n < leaf.num_items; n++) {
if (n) if (n)
sz += ", "; sz += ", ";
sz += "r"; sz += "r";
sz += itos(leaf->get_item_ref_id(n)); sz += itos(leaf.get_item_ref_id(n));
} }
sz += "] "; sz += "] ";
} else { } else {

7
core/math/bvh_public.inc
View File

@ -2,7 +2,7 @@ public:
BVHHandle item_add(T *p_userdata, const AABB &p_aabb, int32_t p_subindex, bool p_pairable, uint32_t p_pairable_type, uint32_t p_pairable_mask, bool p_invisible = false) { BVHHandle item_add(T *p_userdata, const AABB &p_aabb, int32_t p_subindex, bool p_pairable, uint32_t p_pairable_type, uint32_t p_pairable_mask, bool p_invisible = false) {
#ifdef BVH_VERBOSE_TREE #ifdef BVH_VERBOSE_TREE
VERBOSE_PRINT("\nitem_add BEFORE"); VERBOSE_PRINT("\nitem_add BEFORE");
_recursive_print_tree(); _debug_recursive_print_tree(0);
VERBOSE_PRINT("\n"); VERBOSE_PRINT("\n");
#endif #endif
@ -182,7 +182,7 @@ void item_remove(BVHHandle p_handle) {
//refit_all(_current_tree); //refit_all(_current_tree);
#ifdef BVH_VERBOSE_TREE #ifdef BVH_VERBOSE_TREE
_recursive_print_tree(tree_id); _debug_recursive_print_tree(_current_tree);
#endif #endif
} }
@ -281,6 +281,7 @@ void incremental_optimize() {
_logic_item_remove_and_reinsert(ref_id); _logic_item_remove_and_reinsert(ref_id);
#ifdef BVH_VERBOSE #ifdef BVH_VERBOSE
/*
// memory use // memory use
int mem_refs = _refs.estimate_memory_use(); int mem_refs = _refs.estimate_memory_use();
int mem_nodes = _nodes.estimate_memory_use(); int mem_nodes = _nodes.estimate_memory_use();
@ -292,7 +293,7 @@ void incremental_optimize() {
sz += "mem_leaves : " + itos(mem_leaves) + " "; sz += "mem_leaves : " + itos(mem_leaves) + " ";
sz += ", num nodes : " + itos(_nodes.size()); sz += ", num nodes : " + itos(_nodes.size());
print_line(sz); print_line(sz);
*/
#endif #endif
} }

16
servers/physics/broad_phase_bvh.cpp
View File

@ -35,37 +35,37 @@
BroadPhaseSW::ID BroadPhaseBVH::create(CollisionObjectSW *p_object, int p_subindex) { BroadPhaseSW::ID BroadPhaseBVH::create(CollisionObjectSW *p_object, int p_subindex) {
ID oid = bvh.create(p_object, AABB(), p_subindex, false, 1 << p_object->get_type(), 0); ID oid = bvh.create(p_object, AABB(), p_subindex, false, 1 << p_object->get_type(), 0);
return oid; return oid + 1;
} }
void BroadPhaseBVH::move(ID p_id, const AABB &p_aabb) { void BroadPhaseBVH::move(ID p_id, const AABB &p_aabb) {
bvh.move(p_id, p_aabb); bvh.move(p_id - 1, p_aabb);
} }
void BroadPhaseBVH::set_static(ID p_id, bool p_static) { void BroadPhaseBVH::set_static(ID p_id, bool p_static) {
CollisionObjectSW *it = bvh.get(p_id); CollisionObjectSW *it = bvh.get(p_id - 1);
bvh.set_pairable(p_id, !p_static, 1 << it->get_type(), p_static ? 0 : 0xFFFFF); //pair everything, don't care 1? bvh.set_pairable(p_id - 1, !p_static, 1 << it->get_type(), p_static ? 0 : 0xFFFFF); //pair everything, don't care 1?
} }
void BroadPhaseBVH::remove(ID p_id) { void BroadPhaseBVH::remove(ID p_id) {
bvh.erase(p_id); bvh.erase(p_id - 1);
} }
CollisionObjectSW *BroadPhaseBVH::get_object(ID p_id) const { CollisionObjectSW *BroadPhaseBVH::get_object(ID p_id) const {
CollisionObjectSW *it = bvh.get(p_id); CollisionObjectSW *it = bvh.get(p_id - 1);
ERR_FAIL_COND_V(!it, NULL); ERR_FAIL_COND_V(!it, NULL);
return it; return it;
} }
bool BroadPhaseBVH::is_static(ID p_id) const { bool BroadPhaseBVH::is_static(ID p_id) const {
return !bvh.is_pairable(p_id); return !bvh.is_pairable(p_id - 1);
} }
int BroadPhaseBVH::get_subindex(ID p_id) const { int BroadPhaseBVH::get_subindex(ID p_id) const {
return bvh.get_subindex(p_id); return bvh.get_subindex(p_id - 1);
} }
int BroadPhaseBVH::cull_point(const Vector3 &p_point, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { int BroadPhaseBVH::cull_point(const Vector3 &p_point, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) {