noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #44593 from madmiraal/rename-mainloop-methods

Browse Source 
Rename MainLoop methods to match Node methods
This commit is contained in:
Rémi Verschelde
2020-12-28 14:44:28 +01:00
committed by GitHub
parent 891b1cdf28 d9e9eb8d04
commit e4c0572385
27 changed files with 179 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/main/node.cpp
+21 -21
View File
@@ -797,9 +797,9 @@ bool Node::can_process_notification(int p_what) const {
case NOTIFICATION_PHYSICS_PROCESS:
return data.physics_process;
case NOTIFICATION_PROCESS:
return data.idle_process;
return data.process;
case NOTIFICATION_INTERNAL_PROCESS:
return data.idle_process_internal;
return data.process_internal;
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS:
return data.physics_process_internal;
}
@@ -845,50 +845,50 @@ float Node::get_physics_process_delta_time() const {
float Node::get_process_delta_time() const {
if (data.tree) {
return data.tree->get_idle_process_time();
return data.tree->get_process_time();
} else {
return 0;
}
}
void Node::set_process(bool p_idle_process) {
if (data.idle_process == p_idle_process) {
void Node::set_process(bool p_process) {
if (data.process == p_process) {
return;
}
data.idle_process = p_idle_process;
data.process = p_process;
if (data.idle_process) {
add_to_group("idle_process", false);
if (data.process) {
add_to_group("process", false);
} else {
remove_from_group("idle_process");
remove_from_group("process");
}
_change_notify("idle_process");
_change_notify("process");
}
bool Node::is_processing() const {
return data.idle_process;
return data.process;
}
void Node::set_process_internal(bool p_idle_process_internal) {
if (data.idle_process_internal == p_idle_process_internal) {
void Node::set_process_internal(bool p_process_internal) {
if (data.process_internal == p_process_internal) {
return;
}
data.idle_process_internal = p_idle_process_internal;
data.process_internal = p_process_internal;
if (data.idle_process_internal) {
add_to_group("idle_process_internal", false);
if (data.process_internal) {
add_to_group("process_internal", false);
} else {
remove_from_group("idle_process_internal");
remove_from_group("process_internal");
}
_change_notify("idle_process_internal");
_change_notify("process_internal");
}
bool Node::is_processing_internal() const {
return data.idle_process_internal;
return data.process_internal;
}
void Node::set_process_priority(int p_priority) {
@@ -900,11 +900,11 @@ void Node::set_process_priority(int p_priority) {
}
if (is_processing()) {
data.tree->make_group_changed("idle_process");
data.tree->make_group_changed("process");
}
if (is_processing_internal()) {
data.tree->make_group_changed("idle_process_internal");
data.tree->make_group_changed("process_internal");
}
if (is_physics_processing()) {