Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SceneTree debug avoidance hint #78336

Merged
merged 1 commit into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2965,19 +2965,14 @@ bool Main::start() {
}
if (debug_navigation) {
sml->set_debug_navigation_hint(true);
NavigationServer3D::get_singleton()->set_debug_navigation_enabled(true);
}
if (debug_avoidance) {
sml->set_debug_avoidance_hint(true);
NavigationServer3D::get_singleton()->set_debug_avoidance_enabled(true);
}
if (debug_navigation || debug_avoidance) {
NavigationServer3D::get_singleton()->set_active(true);
NavigationServer3D::get_singleton()->set_debug_enabled(true);
if (debug_navigation) {
NavigationServer3D::get_singleton()->set_debug_navigation_enabled(true);
}
if (debug_avoidance) {
NavigationServer3D::get_singleton()->set_debug_avoidance_enabled(true);
}
}
#endif

Expand Down
8 changes: 0 additions & 8 deletions scene/main/scene_tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -737,14 +737,6 @@ void SceneTree::set_debug_navigation_hint(bool p_enabled) {
bool SceneTree::is_debugging_navigation_hint() const {
return debug_navigation_hint;
}

void SceneTree::set_debug_avoidance_hint(bool p_enabled) {
debug_avoidance_hint = p_enabled;
}

bool SceneTree::is_debugging_avoidance_hint() const {
return debug_avoidance_hint;
}
#endif

void SceneTree::set_debug_collisions_color(const Color &p_color) {
Expand Down
4 changes: 0 additions & 4 deletions scene/main/scene_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ class SceneTree : public MainLoop {
bool debug_collisions_hint = false;
bool debug_paths_hint = false;
bool debug_navigation_hint = false;
bool debug_avoidance_hint = false;
#endif
bool paused = false;
int root_lock = 0;
Expand Down Expand Up @@ -347,9 +346,6 @@ class SceneTree : public MainLoop {

void set_debug_navigation_hint(bool p_enabled);
bool is_debugging_navigation_hint() const;

void set_debug_avoidance_hint(bool p_enabled);
bool is_debugging_avoidance_hint() const;
#else
void set_debug_collisions_hint(bool p_enabled) {}
bool is_debugging_collisions_hint() const { return false; }
Expand Down