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

Fix non functional Node3D op_level property

Browse source 
Fixes #50813.
This commit is contained in:
Christian Ringshofer 2023-05-29 22:52:53 +02:00
parent 72f7131be1
commit 20e8189f5d
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/3d/node_3d.cpp
View file

@ -110,7 +110,7 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) {
} }
for (Node3D *&E : data.children) { for (Node3D *&E : data.children) {
if (E->data.top_level_active) { if (E->data.top_level) {
continue; //don't propagate to a top_level continue; //don't propagate to a top_level
} }
E->_propagate_transform_changed(p_origin); E->_propagate_transform_changed(p_origin);
@ -153,7 +153,7 @@ void Node3D::_notification(int p_what) {
data.local_transform = data.parent->get_global_transform() * get_transform(); data.local_transform = data.parent->get_global_transform() * get_transform();
_replace_dirty_mask(DIRTY_EULER_ROTATION_AND_SCALE); // As local transform was updated, rot/scale should be dirty. _replace_dirty_mask(DIRTY_EULER_ROTATION_AND_SCALE); // As local transform was updated, rot/scale should be dirty.
} }
data.top_level_active = true; data.top_level = true;
} }
_set_dirty_bits(DIRTY_GLOBAL_TRANSFORM); // Global is always dirty upon entering a scene. _set_dirty_bits(DIRTY_GLOBAL_TRANSFORM); // Global is always dirty upon entering a scene.
@ -173,7 +173,7 @@ void Node3D::_notification(int p_what) {
} }
data.parent = nullptr; data.parent = nullptr;
data.C = nullptr; data.C = nullptr;
data.top_level_active = false; data.top_level = false;
_update_visibility_parent(true); _update_visibility_parent(true);
} break; } break;
@ -305,7 +305,7 @@ Quaternion Node3D::get_quaternion() const {
void Node3D::set_global_transform(const Transform3D &p_transform) { void Node3D::set_global_transform(const Transform3D &p_transform) {
ERR_THREAD_GUARD; ERR_THREAD_GUARD;
Transform3D xform = (data.parent && !data.top_level_active) Transform3D xform = (data.parent && !data.top_level)
? data.parent->get_global_transform().affine_inverse() * p_transform ? data.parent->get_global_transform().affine_inverse() * p_transform
: p_transform; : p_transform;
@ -337,7 +337,7 @@ Transform3D Node3D::get_global_transform() const {
} }
Transform3D new_global; Transform3D new_global;
if (data.parent && !data.top_level_active) { if (data.parent && !data.top_level) {
new_global = data.parent->get_global_transform() * data.local_transform; new_global = data.parent->get_global_transform() * data.local_transform;
} else { } else {
new_global = data.local_transform; new_global = data.local_transform;
@ -727,12 +727,8 @@ void Node3D::set_as_top_level(bool p_enabled) {
} else if (data.parent) { } else if (data.parent) {
set_transform(data.parent->get_global_transform().affine_inverse() * get_global_transform()); set_transform(data.parent->get_global_transform().affine_inverse() * get_global_transform());
} }
data.top_level = p_enabled;
data.top_level_active = p_enabled;
} else {
data.top_level = p_enabled;
} }
data.top_level = p_enabled;
} }
bool Node3D::is_set_as_top_level() const { bool Node3D::is_set_as_top_level() const {

1
scene/3d/node_3d.h
View file

@ -101,7 +101,6 @@ private:
Viewport *viewport = nullptr; Viewport *viewport = nullptr;
bool top_level_active = false;
bool top_level = false; bool top_level = false;
bool inside_world = false; bool inside_world = false;