asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #44651 from lawnjelly/bvh_world_aabb

Browse source 
Fix BVH to world_aabb, and call update
This commit is contained in:
Juan Linietsky 2020-12-24 08:45:19 -03:00 committed by GitHub
commit 4d9b95f3a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/math/dynamic_bvh.cpp
View file

@ -354,10 +354,17 @@ void DynamicBVH::_update(Node *leaf, int lookahead) {
void DynamicBVH::update(const ID &p_id, const AABB &p_box) { void DynamicBVH::update(const ID &p_id, const AABB &p_box) {
ERR_FAIL_COND(!p_id.is_valid()); ERR_FAIL_COND(!p_id.is_valid());
Node *leaf = p_id.node; Node *leaf = p_id.node;
Node *base = _remove_leaf(leaf);
Volume volume; Volume volume;
volume.min = p_box.position; volume.min = p_box.position;
volume.max = p_box.position + p_box.size; volume.max = p_box.position + p_box.size;
if ((leaf->volume.min == volume.min) && (leaf->volume.max == volume.max)) {
// noop
return;
}
Node *base = _remove_leaf(leaf);
if (base) { if (base) {
if (lkhd >= 0) { if (lkhd >= 0) {
for (int i = 0; (i < lkhd) && base->parent; ++i) { for (int i = 0; (i < lkhd) && base->parent; ++i) {

10
servers/rendering/renderer_scene_cull.cpp
View file

@ -1070,9 +1070,15 @@ void RendererSceneCull::_update_instance(Instance *p_instance) {
if (!p_instance->indexer_id.is_valid()) { if (!p_instance->indexer_id.is_valid()) {
if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) { if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
p_instance->indexer_id = p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY].insert(p_instance->aabb, p_instance); p_instance->indexer_id = p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY].insert(p_instance->transformed_aabb, p_instance);
} else { } else {
p_instance->indexer_id = p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES].insert(p_instance->aabb, p_instance); p_instance->indexer_id = p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES].insert(p_instance->transformed_aabb, p_instance);
}
} else {
if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY].update(p_instance->indexer_id, p_instance->transformed_aabb);
} else {
p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES].update(p_instance->indexer_id, p_instance->transformed_aabb);
} }
} }