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

Merge pull request #62605 from Calinou/internal-group-names-prefix-underscore

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-02 00:16:38 +02:00 committed by GitHub
commit d67691fbd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene/main/node.cpp
View file

@ -439,9 +439,9 @@ void Node::set_physics_process(bool p_process) {
data.physics_process = p_process;
if (data.physics_process) {
add_to_group("physics_process", false);
add_to_group(SNAME("_physics_process"), false);
} else {
remove_from_group("physics_process");
remove_from_group(SNAME("_physics_process"));
}
}
@ -457,9 +457,9 @@ void Node::set_physics_process_internal(bool p_process_internal) {
data.physics_process_internal = p_process_internal;
if (data.physics_process_internal) {
add_to_group("physics_process_internal", false);
add_to_group(SNAME("_physics_process_internal"), false);
} else {
remove_from_group("physics_process_internal");
remove_from_group(SNAME("_physics_process_internal"));
}
}
@ -770,9 +770,9 @@ void Node::set_process(bool p_process) {
data.process = p_process;
if (data.process) {
add_to_group("process", false);
add_to_group(SNAME("_process"), false);
} else {
remove_from_group("process");
remove_from_group(SNAME("_process"));
}
}
@ -788,9 +788,9 @@ void Node::set_process_internal(bool p_process_internal) {
data.process_internal = p_process_internal;
if (data.process_internal) {
add_to_group("process_internal", false);
add_to_group(SNAME("_process_internal"), false);
} else {
remove_from_group("process_internal");
remove_from_group(SNAME("_process_internal"));
}
}
@ -807,19 +807,19 @@ void Node::set_process_priority(int p_priority) {
}
if (is_processing()) {
data.tree->make_group_changed("process");
data.tree->make_group_changed(SNAME("_process"));
}
if (is_processing_internal()) {
data.tree->make_group_changed("process_internal");
data.tree->make_group_changed(SNAME("_process_internal"));
}
if (is_physics_processing()) {
data.tree->make_group_changed("physics_process");
data.tree->make_group_changed(SNAME("_physics_process"));
}
if (is_physics_processing_internal()) {
data.tree->make_group_changed("physics_process_internal");
data.tree->make_group_changed(SNAME("_physics_process_internal"));
}
}

8
scene/main/scene_tree.cpp
View file

@ -412,9 +412,9 @@ bool SceneTree::physics_process(double p_time) {
emit_signal(SNAME("physics_frame"));
_notify_group_pause(SNAME("physics_process_internal"), Node::NOTIFICATION_INTERNAL_PHYSICS_PROCESS);
_notify_group_pause(SNAME("_physics_process_internal"), Node::NOTIFICATION_INTERNAL_PHYSICS_PROCESS);
call_group(SNAME("_picking_viewports"), SNAME("_process_picking"));
_notify_group_pause(SNAME("physics_process"), Node::NOTIFICATION_PHYSICS_PROCESS);
_notify_group_pause(SNAME("_physics_process"), Node::NOTIFICATION_PHYSICS_PROCESS);
_flush_ugc();
MessageQueue::get_singleton()->flush(); //small little hack
@ -449,8 +449,8 @@ bool SceneTree::process(double p_time) {
flush_transform_notifications();
_notify_group_pause(SNAME("process_internal"), Node::NOTIFICATION_INTERNAL_PROCESS);
_notify_group_pause(SNAME("process"), Node::NOTIFICATION_PROCESS);
_notify_group_pause(SNAME("_process_internal"), Node::NOTIFICATION_INTERNAL_PROCESS);
_notify_group_pause(SNAME("_process"), Node::NOTIFICATION_PROCESS);
_flush_ugc();
MessageQueue::get_singleton()->flush(); //small little hack