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

Merge pull request #69531 from BastiaanOlij/fix_origin_current_issue 

Fix recurrence issue with setting current origin node
This commit is contained in:
Rémi Verschelde 2022-12-05 10:13:55 +01:00
parent 0697d6f8cd 80824e9858
commit 4211c6d74d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scene/3d/xr_nodes.cpp
View File

@ -627,7 +627,9 @@ void XROrigin3D::set_world_scale(real_t p_world_scale) {
xr_server->set_world_scale(p_world_scale);
}
void XROrigin3D::set_current(bool p_enabled) {
void XROrigin3D::_set_current(bool p_enabled, bool p_update_others) {
// We run this logic even if current already equals p_enabled as we may have set this previously before we entered our tree.
// This is then called a second time on NOTIFICATION_ENTER_TREE where we actually process activating this origin node.
current = p_enabled;
if (!is_inside_tree() || Engine::get_singleton()->is_editor_hint()) {
@ -638,29 +640,37 @@ void XROrigin3D::set_current(bool p_enabled) {
set_notify_local_transform(current);
set_notify_transform(current);
if (current) {
for (int i = 0; i < origin_nodes.size(); i++) {
if (origin_nodes[i] != this) {
origin_nodes[i]->set_current(false);
}
}
// update XRServer with our current position
if (current) {
XRServer *xr_server = XRServer::get_singleton();
ERR_FAIL_NULL(xr_server);
xr_server->set_world_origin(get_global_transform());
}
// Check if we need to update our other origin nodes accordingly
if (p_update_others) {
if (current) {
for (int i = 0; i < origin_nodes.size(); i++) {
if (origin_nodes[i] != this && origin_nodes[i]->current) {
origin_nodes[i]->_set_current(false, false);
}
}
} else {
bool found = false;
// We no longer have a current origin so find the first one we can make current
for (int i = 0; !found && i < origin_nodes.size(); i++) {
for (int i = 0; i < origin_nodes.size(); i++) {
if (origin_nodes[i] != this) {
origin_nodes[i]->set_current(true);
found = true;
origin_nodes[i]->_set_current(true, false);
return; // we are done.
}
}
}
}
}
void XROrigin3D::set_current(bool p_enabled) {
_set_current(p_enabled, true);
}
bool XROrigin3D::is_current() const {
if (Engine::get_singleton()->is_editor_hint()) {

2
scene/3d/xr_nodes.h
View File

@ -183,6 +183,8 @@ private:
bool current = false;
static Vector<XROrigin3D *> origin_nodes; // all origin nodes in tree
void _set_current(bool p_enabled, bool p_update_others);
protected:
void _notification(int p_what);
static void _bind_methods();