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

Merge pull request #72922 from smix8/fix_debug_binding_rb_4.x 

Fix NavigationAgent debug functions bindings in release builds
This commit is contained in:
Rémi Verschelde 2023-02-09 09:28:38 +01:00
parent bcee13e82d 820b841fcb
commit ea274af71a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/2d/navigation_agent_2d.cpp
View File

@ -108,7 +108,6 @@ void NavigationAgent2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "time_horizon", PROPERTY_HINT_RANGE, "0.1,10,0.01,suffix:s"), "set_time_horizon", "get_time_horizon"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "time_horizon", PROPERTY_HINT_RANGE, "0.1,10,0.01,suffix:s"), "set_time_horizon", "get_time_horizon");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_speed", PROPERTY_HINT_RANGE, "0.1,10000,0.01,suffix:px/s"), "set_max_speed", "get_max_speed"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_speed", PROPERTY_HINT_RANGE, "0.1,10000,0.01,suffix:px/s"), "set_max_speed", "get_max_speed");
#ifdef DEBUG_ENABLED
ClassDB::bind_method(D_METHOD("set_debug_enabled", "enabled"), &NavigationAgent2D::set_debug_enabled); ClassDB::bind_method(D_METHOD("set_debug_enabled", "enabled"), &NavigationAgent2D::set_debug_enabled);
ClassDB::bind_method(D_METHOD("get_debug_enabled"), &NavigationAgent2D::get_debug_enabled); ClassDB::bind_method(D_METHOD("get_debug_enabled"), &NavigationAgent2D::get_debug_enabled);
ClassDB::bind_method(D_METHOD("set_debug_use_custom", "enabled"), &NavigationAgent2D::set_debug_use_custom); ClassDB::bind_method(D_METHOD("set_debug_use_custom", "enabled"), &NavigationAgent2D::set_debug_use_custom);
@ -126,7 +125,6 @@ void NavigationAgent2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_path_custom_color"), "set_debug_path_custom_color", "get_debug_path_custom_color"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_path_custom_color"), "set_debug_path_custom_color", "get_debug_path_custom_color");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "debug_path_custom_point_size", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_point_size", "get_debug_path_custom_point_size"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "debug_path_custom_point_size", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_point_size", "get_debug_path_custom_point_size");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "debug_path_custom_line_width", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_line_width", "get_debug_path_custom_line_width"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "debug_path_custom_line_width", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_line_width", "get_debug_path_custom_line_width");
#endif // DEBUG_ENABLED
ADD_SIGNAL(MethodInfo("path_changed")); ADD_SIGNAL(MethodInfo("path_changed"));
ADD_SIGNAL(MethodInfo("target_reached")); ADD_SIGNAL(MethodInfo("target_reached"));
@ -670,14 +668,15 @@ void NavigationAgent2D::_check_distance_to_target() {
////////DEBUG//////////////////////////////////////////////////////////// ////////DEBUG////////////////////////////////////////////////////////////
#ifdef DEBUG_ENABLED
void NavigationAgent2D::set_debug_enabled(bool p_enabled) { void NavigationAgent2D::set_debug_enabled(bool p_enabled) {
#ifdef DEBUG_ENABLED
if (debug_enabled == p_enabled) { if (debug_enabled == p_enabled) {
return; return;
} }
debug_enabled = p_enabled; debug_enabled = p_enabled;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
bool NavigationAgent2D::get_debug_enabled() const { bool NavigationAgent2D::get_debug_enabled() const {
@ -685,12 +684,14 @@ bool NavigationAgent2D::get_debug_enabled() const {
} }
void NavigationAgent2D::set_debug_use_custom(bool p_enabled) { void NavigationAgent2D::set_debug_use_custom(bool p_enabled) {
#ifdef DEBUG_ENABLED
if (debug_use_custom == p_enabled) { if (debug_use_custom == p_enabled) {
return; return;
} }
debug_use_custom = p_enabled; debug_use_custom = p_enabled;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
bool NavigationAgent2D::get_debug_use_custom() const { bool NavigationAgent2D::get_debug_use_custom() const {
@ -698,12 +699,14 @@ bool NavigationAgent2D::get_debug_use_custom() const {
} }
void NavigationAgent2D::set_debug_path_custom_color(Color p_color) { void NavigationAgent2D::set_debug_path_custom_color(Color p_color) {
#ifdef DEBUG_ENABLED
if (debug_path_custom_color == p_color) { if (debug_path_custom_color == p_color) {
return; return;
} }
debug_path_custom_color = p_color; debug_path_custom_color = p_color;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
Color NavigationAgent2D::get_debug_path_custom_color() const { Color NavigationAgent2D::get_debug_path_custom_color() const {
@ -711,12 +714,14 @@ Color NavigationAgent2D::get_debug_path_custom_color() const {
} }
void NavigationAgent2D::set_debug_path_custom_point_size(float p_point_size) { void NavigationAgent2D::set_debug_path_custom_point_size(float p_point_size) {
#ifdef DEBUG_ENABLED
if (Math::is_equal_approx(debug_path_custom_point_size, p_point_size)) { if (Math::is_equal_approx(debug_path_custom_point_size, p_point_size)) {
return; return;
} }
debug_path_custom_point_size = MAX(0.1, p_point_size); debug_path_custom_point_size = MAX(0.1, p_point_size);
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
float NavigationAgent2D::get_debug_path_custom_point_size() const { float NavigationAgent2D::get_debug_path_custom_point_size() const {
@ -724,18 +729,21 @@ float NavigationAgent2D::get_debug_path_custom_point_size() const {
} }
void NavigationAgent2D::set_debug_path_custom_line_width(float p_line_width) { void NavigationAgent2D::set_debug_path_custom_line_width(float p_line_width) {
#ifdef DEBUG_ENABLED
if (Math::is_equal_approx(debug_path_custom_line_width, p_line_width)) { if (Math::is_equal_approx(debug_path_custom_line_width, p_line_width)) {
return; return;
} }
debug_path_custom_line_width = p_line_width; debug_path_custom_line_width = p_line_width;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
float NavigationAgent2D::get_debug_path_custom_line_width() const { float NavigationAgent2D::get_debug_path_custom_line_width() const {
return debug_path_custom_line_width; return debug_path_custom_line_width;
} }
#ifdef DEBUG_ENABLED
void NavigationAgent2D::_navigation_debug_changed() { void NavigationAgent2D::_navigation_debug_changed() {
debug_path_dirty = true; debug_path_dirty = true;
} }

10
scene/2d/navigation_agent_2d.h
View File

@ -73,14 +73,16 @@ class NavigationAgent2D : public Node {
// No initialized on purpose // No initialized on purpose
uint32_t update_frame_id = 0; uint32_t update_frame_id = 0;
#ifdef DEBUG_ENABLED // Debug properties for exposed bindings
bool debug_enabled = false; bool debug_enabled = false;
bool debug_path_dirty = true;
RID debug_path_instance;
float debug_path_custom_point_size = 4.0; float debug_path_custom_point_size = 4.0;
float debug_path_custom_line_width = 1.0; float debug_path_custom_line_width = 1.0;
bool debug_use_custom = false; bool debug_use_custom = false;
Color debug_path_custom_color = Color(1.0, 1.0, 1.0, 1.0); Color debug_path_custom_color = Color(1.0, 1.0, 1.0, 1.0);
#ifdef DEBUG_ENABLED
// Debug properties internal only
bool debug_path_dirty = true;
RID debug_path_instance;
private: private:
void _navigation_debug_changed(); void _navigation_debug_changed();
@ -182,7 +184,6 @@ public:
PackedStringArray get_configuration_warnings() const override; PackedStringArray get_configuration_warnings() const override;
#ifdef DEBUG_ENABLED
void set_debug_enabled(bool p_enabled); void set_debug_enabled(bool p_enabled);
bool get_debug_enabled() const; bool get_debug_enabled() const;
@ -197,7 +198,6 @@ public:
void set_debug_path_custom_line_width(float p_line_width); void set_debug_path_custom_line_width(float p_line_width);
float get_debug_path_custom_line_width() const; float get_debug_path_custom_line_width() const;
#endif // DEBUG_ENABLED
private: private:
void update_navigation(); void update_navigation();

12
scene/3d/navigation_agent_3d.cpp
View File

@ -121,7 +121,6 @@ void NavigationAgent3D::_bind_methods() {
ADD_SIGNAL(MethodInfo("navigation_finished")); ADD_SIGNAL(MethodInfo("navigation_finished"));
ADD_SIGNAL(MethodInfo("velocity_computed", PropertyInfo(Variant::VECTOR3, "safe_velocity"))); ADD_SIGNAL(MethodInfo("velocity_computed", PropertyInfo(Variant::VECTOR3, "safe_velocity")));
#ifdef DEBUG_ENABLED
ClassDB::bind_method(D_METHOD("set_debug_enabled", "enabled"), &NavigationAgent3D::set_debug_enabled); ClassDB::bind_method(D_METHOD("set_debug_enabled", "enabled"), &NavigationAgent3D::set_debug_enabled);
ClassDB::bind_method(D_METHOD("get_debug_enabled"), &NavigationAgent3D::get_debug_enabled); ClassDB::bind_method(D_METHOD("get_debug_enabled"), &NavigationAgent3D::get_debug_enabled);
ClassDB::bind_method(D_METHOD("set_debug_use_custom", "enabled"), &NavigationAgent3D::set_debug_use_custom); ClassDB::bind_method(D_METHOD("set_debug_use_custom", "enabled"), &NavigationAgent3D::set_debug_use_custom);
@ -136,7 +135,6 @@ void NavigationAgent3D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debug_use_custom"), "set_debug_use_custom", "get_debug_use_custom"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debug_use_custom"), "set_debug_use_custom", "get_debug_use_custom");
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_path_custom_color"), "set_debug_path_custom_color", "get_debug_path_custom_color"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_path_custom_color"), "set_debug_path_custom_color", "get_debug_path_custom_color");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "debug_path_custom_point_size", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_point_size", "get_debug_path_custom_point_size"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "debug_path_custom_point_size", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_point_size", "get_debug_path_custom_point_size");
#endif // DEBUG_ENABLED
} }
void NavigationAgent3D::_notification(int p_what) { void NavigationAgent3D::_notification(int p_what) {
@ -696,14 +694,15 @@ void NavigationAgent3D::_check_distance_to_target() {
////////DEBUG//////////////////////////////////////////////////////////// ////////DEBUG////////////////////////////////////////////////////////////
#ifdef DEBUG_ENABLED
void NavigationAgent3D::set_debug_enabled(bool p_enabled) { void NavigationAgent3D::set_debug_enabled(bool p_enabled) {
#ifdef DEBUG_ENABLED
if (debug_enabled == p_enabled) { if (debug_enabled == p_enabled) {
return; return;
} }
debug_enabled = p_enabled; debug_enabled = p_enabled;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
bool NavigationAgent3D::get_debug_enabled() const { bool NavigationAgent3D::get_debug_enabled() const {
@ -711,12 +710,14 @@ bool NavigationAgent3D::get_debug_enabled() const {
} }
void NavigationAgent3D::set_debug_use_custom(bool p_enabled) { void NavigationAgent3D::set_debug_use_custom(bool p_enabled) {
#ifdef DEBUG_ENABLED
if (debug_use_custom == p_enabled) { if (debug_use_custom == p_enabled) {
return; return;
} }
debug_use_custom = p_enabled; debug_use_custom = p_enabled;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
bool NavigationAgent3D::get_debug_use_custom() const { bool NavigationAgent3D::get_debug_use_custom() const {
@ -724,12 +725,14 @@ bool NavigationAgent3D::get_debug_use_custom() const {
} }
void NavigationAgent3D::set_debug_path_custom_color(Color p_color) { void NavigationAgent3D::set_debug_path_custom_color(Color p_color) {
#ifdef DEBUG_ENABLED
if (debug_path_custom_color == p_color) { if (debug_path_custom_color == p_color) {
return; return;
} }
debug_path_custom_color = p_color; debug_path_custom_color = p_color;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
Color NavigationAgent3D::get_debug_path_custom_color() const { Color NavigationAgent3D::get_debug_path_custom_color() const {
@ -737,18 +740,21 @@ Color NavigationAgent3D::get_debug_path_custom_color() const {
} }
void NavigationAgent3D::set_debug_path_custom_point_size(float p_point_size) { void NavigationAgent3D::set_debug_path_custom_point_size(float p_point_size) {
#ifdef DEBUG_ENABLED
if (Math::is_equal_approx(debug_path_custom_point_size, p_point_size)) { if (Math::is_equal_approx(debug_path_custom_point_size, p_point_size)) {
return; return;
} }
debug_path_custom_point_size = p_point_size; debug_path_custom_point_size = p_point_size;
debug_path_dirty = true; debug_path_dirty = true;
#endif // DEBUG_ENABLED
} }
float NavigationAgent3D::get_debug_path_custom_point_size() const { float NavigationAgent3D::get_debug_path_custom_point_size() const {
return debug_path_custom_point_size; return debug_path_custom_point_size;
} }
#ifdef DEBUG_ENABLED
void NavigationAgent3D::_navigation_debug_changed() { void NavigationAgent3D::_navigation_debug_changed() {
debug_path_dirty = true; debug_path_dirty = true;
} }

12
scene/3d/navigation_agent_3d.h
View File

@ -75,14 +75,16 @@ class NavigationAgent3D : public Node {
// No initialized on purpose // No initialized on purpose
uint32_t update_frame_id = 0; uint32_t update_frame_id = 0;
#ifdef DEBUG_ENABLED // Debug properties for exposed bindings
bool debug_enabled = false; bool debug_enabled = false;
bool debug_path_dirty = true;
RID debug_path_instance;
Ref<ArrayMesh> debug_path_mesh;
float debug_path_custom_point_size = 4.0; float debug_path_custom_point_size = 4.0;
bool debug_use_custom = false; bool debug_use_custom = false;
Color debug_path_custom_color = Color(1.0, 1.0, 1.0, 1.0); Color debug_path_custom_color = Color(1.0, 1.0, 1.0, 1.0);
#ifdef DEBUG_ENABLED
// Debug properties internal only
bool debug_path_dirty = true;
RID debug_path_instance;
Ref<ArrayMesh> debug_path_mesh;
Ref<StandardMaterial3D> debug_agent_path_line_custom_material; Ref<StandardMaterial3D> debug_agent_path_line_custom_material;
Ref<StandardMaterial3D> debug_agent_path_point_custom_material; Ref<StandardMaterial3D> debug_agent_path_point_custom_material;
@ -196,7 +198,6 @@ public:
PackedStringArray get_configuration_warnings() const override; PackedStringArray get_configuration_warnings() const override;
#ifdef DEBUG_ENABLED
void set_debug_enabled(bool p_enabled); void set_debug_enabled(bool p_enabled);
bool get_debug_enabled() const; bool get_debug_enabled() const;
@ -208,7 +209,6 @@ public:
void set_debug_path_custom_point_size(float p_point_size); void set_debug_path_custom_point_size(float p_point_size);
float get_debug_path_custom_point_size() const; float get_debug_path_custom_point_size() const;
#endif // DEBUG_ENABLED
private: private:
void update_navigation(); void update_navigation();