Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #98736 from YeldhamDev/i_love_introducing_regressions
Some checks failed
🔗 GHA / 📊 Static checks (push) Has been cancelled
Details
🔗 GHA / 🤖 Android (push) Has been cancelled
Details
🔗 GHA / 🍏 iOS (push) Has been cancelled
Details
🔗 GHA / 🐧 Linux (push) Has been cancelled
Details
🔗 GHA / 🍎 macOS (push) Has been cancelled
Details
🔗 GHA / 🏁 Windows (push) Has been cancelled
Details
🔗 GHA / 🌐 Web (push) Has been cancelled
Details
🔗 GHA / 🪲 Godot CPP (push) Has been cancelled
Details

Browse Source 
Compile certain `CanvasItem._edit_*()` functions with `DEBUG_ENABLED`
This commit is contained in:
Clay John 2024-11-02 13:59:31 -07:00 committed by GitHub
commit 1bffd6c73b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
41 changed files with 155 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/2d/animated_sprite_2d.cpp
View File

@ -56,7 +56,9 @@ Point2 AnimatedSprite2D::_edit_get_pivot() const {
bool AnimatedSprite2D::_edit_use_pivot() const { bool AnimatedSprite2D::_edit_use_pivot() const {
return true; return true;
} }
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
Rect2 AnimatedSprite2D::_edit_get_rect() const { Rect2 AnimatedSprite2D::_edit_get_rect() const {
return _get_rect(); return _get_rect();
} }
@ -75,7 +77,7 @@ bool AnimatedSprite2D::_edit_use_rect() const {
} }
return t.is_valid(); return t.is_valid();
} }
#endif #endif // DEBUG_ENABLED
Rect2 AnimatedSprite2D::get_anchorable_rect() const { Rect2 AnimatedSprite2D::get_anchorable_rect() const {
return _get_rect(); return _get_rect();
@ -593,7 +595,7 @@ void AnimatedSprite2D::get_argument_options(const StringName &p_function, int p_
} }
Node2D::get_argument_options(p_function, p_idx, r_options); Node2D::get_argument_options(p_function, p_idx, r_options);
} }
#endif #endif // TOOLS_ENABLED
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
bool AnimatedSprite2D::_set(const StringName &p_name, const Variant &p_value) { bool AnimatedSprite2D::_set(const StringName &p_name, const Variant &p_value) {

9
scene/2d/animated_sprite_2d.h
View File

@ -66,7 +66,7 @@ class AnimatedSprite2D : public Node2D {
protected: protected:
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
bool _set(const StringName &p_name, const Variant &p_value); bool _set(const StringName &p_name, const Variant &p_value);
#endif #endif // DISABLE_DEPRECATED
static void _bind_methods(); static void _bind_methods();
void _notification(int p_what); void _notification(int p_what);
void _validate_property(PropertyInfo &p_property) const; void _validate_property(PropertyInfo &p_property) const;
@ -79,9 +79,12 @@ public:
virtual void _edit_set_pivot(const Point2 &p_pivot) override; virtual void _edit_set_pivot(const Point2 &p_pivot) override;
virtual Point2 _edit_get_pivot() const override; virtual Point2 _edit_get_pivot() const override;
virtual bool _edit_use_pivot() const override; virtual bool _edit_use_pivot() const override;
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
virtual Rect2 get_anchorable_rect() const override; virtual Rect2 get_anchorable_rect() const override;
@ -129,7 +132,7 @@ public:
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override; virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
#endif #endif // TOOLS_ENABLED
AnimatedSprite2D(); AnimatedSprite2D();
}; };

4
scene/2d/back_buffer_copy.cpp
View File

@ -45,7 +45,7 @@ void BackBufferCopy::_update_copy_mode() {
} }
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 BackBufferCopy::_edit_get_rect() const { Rect2 BackBufferCopy::_edit_get_rect() const {
return rect; return rect;
} }
@ -53,7 +53,7 @@ Rect2 BackBufferCopy::_edit_get_rect() const {
bool BackBufferCopy::_edit_use_rect() const { bool BackBufferCopy::_edit_use_rect() const {
return true; return true;
} }
#endif #endif // DEBUG_ENABLED
Rect2 BackBufferCopy::get_anchorable_rect() const { Rect2 BackBufferCopy::get_anchorable_rect() const {
return rect; return rect;

4
scene/2d/back_buffer_copy.h
View File

@ -54,10 +54,10 @@ protected:
void _validate_property(PropertyInfo &p_property) const; void _validate_property(PropertyInfo &p_property) const;
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 _edit_get_rect() const override; Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
void set_rect(const Rect2 &p_rect); void set_rect(const Rect2 &p_rect);
Rect2 get_rect() const; Rect2 get_rect() const;

7
scene/2d/light_2d.cpp
View File

@ -54,7 +54,7 @@ void Light2D::_update_light_visibility() {
if (editor_only) { if (editor_only) {
editor_ok = false; editor_ok = false;
} }
#endif #endif // TOOLS_ENABLED
RS::get_singleton()->canvas_light_set_enabled(canvas_light, enabled && is_visible_in_tree() && editor_ok); RS::get_singleton()->canvas_light_set_enabled(canvas_light, enabled && is_visible_in_tree() && editor_ok);
} }
@ -343,7 +343,6 @@ Light2D::~Light2D() {
////////////////////////////// //////////////////////////////
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Dictionary PointLight2D::_edit_get_state() const { Dictionary PointLight2D::_edit_get_state() const {
Dictionary state = Node2D::_edit_get_state(); Dictionary state = Node2D::_edit_get_state();
state["offset"] = get_texture_offset(); state["offset"] = get_texture_offset();
@ -367,7 +366,9 @@ Point2 PointLight2D::_edit_get_pivot() const {
bool PointLight2D::_edit_use_pivot() const { bool PointLight2D::_edit_use_pivot() const {
return true; return true;
} }
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
Rect2 PointLight2D::_edit_get_rect() const { Rect2 PointLight2D::_edit_get_rect() const {
if (texture.is_null()) { if (texture.is_null()) {
return Rect2(); return Rect2();
@ -380,7 +381,7 @@ Rect2 PointLight2D::_edit_get_rect() const {
bool PointLight2D::_edit_use_rect() const { bool PointLight2D::_edit_use_rect() const {
return !texture.is_null(); return !texture.is_null();
} }
#endif #endif // DEBUG_ENABLED
Rect2 PointLight2D::get_anchorable_rect() const { Rect2 PointLight2D::get_anchorable_rect() const {
if (texture.is_null()) { if (texture.is_null()) {

5
scene/2d/light_2d.h
View File

@ -160,9 +160,12 @@ public:
virtual void _edit_set_pivot(const Point2 &p_pivot) override; virtual void _edit_set_pivot(const Point2 &p_pivot) override;
virtual Point2 _edit_get_pivot() const override; virtual Point2 _edit_get_pivot() const override;
virtual bool _edit_use_pivot() const override; virtual bool _edit_use_pivot() const override;
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
virtual Rect2 get_anchorable_rect() const override; virtual Rect2 get_anchorable_rect() const override;

14
scene/2d/light_occluder_2d.cpp
View File

@ -35,7 +35,7 @@
#define LINE_GRAB_WIDTH 8 #define LINE_GRAB_WIDTH 8
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 OccluderPolygon2D::_edit_get_rect() const { Rect2 OccluderPolygon2D::_edit_get_rect() const {
if (rect_cache_dirty) { if (rect_cache_dirty) {
if (closed) { if (closed) {
@ -83,7 +83,7 @@ bool OccluderPolygon2D::_edit_is_selected_on_click(const Point2 &p_point, double
return false; return false;
} }
} }
#endif #endif // DEBUG_ENABLED
void OccluderPolygon2D::set_polygon(const Vector<Vector2> &p_polygon) { void OccluderPolygon2D::set_polygon(const Vector<Vector2> &p_polygon) {
polygon = p_polygon; polygon = p_polygon;
@ -156,7 +156,7 @@ OccluderPolygon2D::~OccluderPolygon2D() {
void LightOccluder2D::_poly_changed() { void LightOccluder2D::_poly_changed() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
queue_redraw(); queue_redraw();
#endif #endif // DEBUG_ENABLED
} }
void LightOccluder2D::_physics_interpolated_changed() { void LightOccluder2D::_physics_interpolated_changed() {
@ -218,7 +218,7 @@ void LightOccluder2D::_notification(int p_what) {
} }
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 LightOccluder2D::_edit_get_rect() const { Rect2 LightOccluder2D::_edit_get_rect() const {
return occluder_polygon.is_valid() ? occluder_polygon->_edit_get_rect() : Rect2(); return occluder_polygon.is_valid() ? occluder_polygon->_edit_get_rect() : Rect2();
} }
@ -226,14 +226,14 @@ Rect2 LightOccluder2D::_edit_get_rect() const {
bool LightOccluder2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { bool LightOccluder2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
return occluder_polygon.is_valid() ? occluder_polygon->_edit_is_selected_on_click(p_point, p_tolerance) : false; return occluder_polygon.is_valid() ? occluder_polygon->_edit_is_selected_on_click(p_point, p_tolerance) : false;
} }
#endif #endif // DEBUG_ENABLED
void LightOccluder2D::set_occluder_polygon(const Ref<OccluderPolygon2D> &p_polygon) { void LightOccluder2D::set_occluder_polygon(const Ref<OccluderPolygon2D> &p_polygon) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (occluder_polygon.is_valid()) { if (occluder_polygon.is_valid()) {
occluder_polygon->disconnect_changed(callable_mp(this, &LightOccluder2D::_poly_changed)); occluder_polygon->disconnect_changed(callable_mp(this, &LightOccluder2D::_poly_changed));
} }
#endif #endif // DEBUG_ENABLED
occluder_polygon = p_polygon; occluder_polygon = p_polygon;
if (occluder_polygon.is_valid()) { if (occluder_polygon.is_valid()) {
@ -247,7 +247,7 @@ void LightOccluder2D::set_occluder_polygon(const Ref<OccluderPolygon2D> &p_polyg
occluder_polygon->connect_changed(callable_mp(this, &LightOccluder2D::_poly_changed)); occluder_polygon->connect_changed(callable_mp(this, &LightOccluder2D::_poly_changed));
} }
queue_redraw(); queue_redraw();
#endif #endif // DEBUG_ENABLED
} }
Ref<OccluderPolygon2D> LightOccluder2D::get_occluder_polygon() const { Ref<OccluderPolygon2D> LightOccluder2D::get_occluder_polygon() const {

9
scene/2d/light_occluder_2d.h
View File

@ -56,11 +56,10 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const; virtual Rect2 _edit_get_rect() const;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
#endif #endif // DEBUG_ENABLED
void set_polygon(const Vector<Vector2> &p_polygon); void set_polygon(const Vector<Vector2> &p_polygon);
Vector<Vector2> get_polygon() const; Vector<Vector2> get_polygon() const;
@ -93,10 +92,10 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;
#endif #endif // DEBUG_ENABLED
void set_occluder_polygon(const Ref<OccluderPolygon2D> &p_polygon); void set_occluder_polygon(const Ref<OccluderPolygon2D> &p_polygon);
Ref<OccluderPolygon2D> get_occluder_polygon() const; Ref<OccluderPolygon2D> get_occluder_polygon() const;

2
scene/2d/line_2d.cpp
View File

@ -36,7 +36,7 @@
Line2D::Line2D() { Line2D::Line2D() {
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 Line2D::_edit_get_rect() const { Rect2 Line2D::_edit_get_rect() const {
if (_points.size() == 0) { if (_points.size() == 0) {
return Rect2(0, 0, 0, 0); return Rect2(0, 0, 0, 0);

2
scene/2d/line_2d.h
View File

@ -55,7 +55,7 @@ public:
LINE_TEXTURE_STRETCH LINE_TEXTURE_STRETCH
}; };
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;

4
scene/2d/marker_2d.cpp
View File

@ -61,7 +61,7 @@ void Marker2D::_draw_cross() {
draw_multiline_colors(points, colors); draw_multiline_colors(points, colors);
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 Marker2D::_edit_get_rect() const { Rect2 Marker2D::_edit_get_rect() const {
real_t extents = get_gizmo_extents(); real_t extents = get_gizmo_extents();
return Rect2(Point2(-extents, -extents), Size2(extents * 2, extents * 2)); return Rect2(Point2(-extents, -extents), Size2(extents * 2, extents * 2));
@ -70,7 +70,7 @@ Rect2 Marker2D::_edit_get_rect() const {
bool Marker2D::_edit_use_rect() const { bool Marker2D::_edit_use_rect() const {
return false; return false;
} }
#endif #endif // DEBUG_ENABLED
void Marker2D::_notification(int p_what) { void Marker2D::_notification(int p_what) {
switch (p_what) { switch (p_what) {

4
scene/2d/marker_2d.h
View File

@ -45,10 +45,10 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
void set_gizmo_extents(real_t p_extents); void set_gizmo_extents(real_t p_extents);
real_t get_gizmo_extents() const; real_t get_gizmo_extents() const;

4
scene/2d/mesh_instance_2d.cpp
View File

@ -88,7 +88,7 @@ Ref<Texture2D> MeshInstance2D::get_texture() const {
return texture; return texture;
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 MeshInstance2D::_edit_get_rect() const { Rect2 MeshInstance2D::_edit_get_rect() const {
if (mesh.is_valid()) { if (mesh.is_valid()) {
AABB aabb = mesh->get_aabb(); AABB aabb = mesh->get_aabb();
@ -101,7 +101,7 @@ Rect2 MeshInstance2D::_edit_get_rect() const {
bool MeshInstance2D::_edit_use_rect() const { bool MeshInstance2D::_edit_use_rect() const {
return mesh.is_valid(); return mesh.is_valid();
} }
#endif #endif // DEBUG_ENABLED
MeshInstance2D::MeshInstance2D() { MeshInstance2D::MeshInstance2D() {
} }

4
scene/2d/mesh_instance_2d.h
View File

@ -45,10 +45,10 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
void set_mesh(const Ref<Mesh> &p_mesh); void set_mesh(const Ref<Mesh> &p_mesh);
Ref<Mesh> get_mesh() const; Ref<Mesh> get_mesh() const;

4
scene/2d/multimesh_instance_2d.cpp
View File

@ -84,7 +84,7 @@ Ref<Texture2D> MultiMeshInstance2D::get_texture() const {
return texture; return texture;
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 MultiMeshInstance2D::_edit_get_rect() const { Rect2 MultiMeshInstance2D::_edit_get_rect() const {
if (multimesh.is_valid()) { if (multimesh.is_valid()) {
AABB aabb = multimesh->get_aabb(); AABB aabb = multimesh->get_aabb();
@ -93,7 +93,7 @@ Rect2 MultiMeshInstance2D::_edit_get_rect() const {
return Node2D::_edit_get_rect(); return Node2D::_edit_get_rect();
} }
#endif #endif // DEBUG_ENABLED
MultiMeshInstance2D::MultiMeshInstance2D() { MultiMeshInstance2D::MultiMeshInstance2D() {
} }

4
scene/2d/multimesh_instance_2d.h
View File

@ -46,9 +46,9 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
#endif #endif // DEBUG_ENABLED
void set_multimesh(const Ref<MultiMesh> &p_multimesh); void set_multimesh(const Ref<MultiMesh> &p_multimesh);
Ref<MultiMesh> get_multimesh() const; Ref<MultiMesh> get_multimesh() const;

4
scene/2d/navigation_link_2d.cpp
View File

@ -132,7 +132,7 @@ void NavigationLink2D::_notification(int p_what) {
} }
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 NavigationLink2D::_edit_get_rect() const { Rect2 NavigationLink2D::_edit_get_rect() const {
if (!is_inside_tree()) { if (!is_inside_tree()) {
return Rect2(); return Rect2();
@ -152,7 +152,7 @@ bool NavigationLink2D::_edit_is_selected_on_click(const Point2 &p_point, double
Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, segment); Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, segment);
return p_point.distance_to(closest_point) < p_tolerance; return p_point.distance_to(closest_point) < p_tolerance;
} }
#endif // TOOLS_ENABLED #endif // DEBUG_ENABLED
RID NavigationLink2D::get_rid() const { RID NavigationLink2D::get_rid() const {
return link; return link;

4
scene/2d/navigation_link_2d.h
View File

@ -62,10 +62,10 @@ protected:
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;
#endif #endif // DEBUG_ENABLED
RID get_rid() const; RID get_rid() const;
void set_enabled(bool p_enabled); void set_enabled(bool p_enabled);

4
scene/2d/navigation_region_2d.cpp
View File

@ -142,7 +142,7 @@ RID NavigationRegion2D::get_region_rid() const {
return get_rid(); return get_rid();
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 NavigationRegion2D::_edit_get_rect() const { Rect2 NavigationRegion2D::_edit_get_rect() const {
return navigation_polygon.is_valid() ? navigation_polygon->_edit_get_rect() : Rect2(); return navigation_polygon.is_valid() ? navigation_polygon->_edit_get_rect() : Rect2();
} }
@ -150,7 +150,7 @@ Rect2 NavigationRegion2D::_edit_get_rect() const {
bool NavigationRegion2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { bool NavigationRegion2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
return navigation_polygon.is_valid() ? navigation_polygon->_edit_is_selected_on_click(p_point, p_tolerance) : false; return navigation_polygon.is_valid() ? navigation_polygon->_edit_is_selected_on_click(p_point, p_tolerance) : false;
} }
#endif #endif // DEBUG_ENABLED
void NavigationRegion2D::_notification(int p_what) { void NavigationRegion2D::_notification(int p_what) {
switch (p_what) { switch (p_what) {

4
scene/2d/navigation_region_2d.h
View File

@ -75,10 +75,10 @@ protected:
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;
#endif #endif // DEBUG_ENABLED
RID get_rid() const; RID get_rid() const;
void set_enabled(bool p_enabled); void set_enabled(bool p_enabled);

2
scene/2d/path_2d.cpp
View File

@ -37,7 +37,7 @@
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#endif #endif
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 Path2D::_edit_get_rect() const { Rect2 Path2D::_edit_get_rect() const {
if (!curve.is_valid() || curve->get_point_count() == 0) { if (!curve.is_valid() || curve->get_point_count() == 0) {
return Rect2(0, 0, 0, 0); return Rect2(0, 0, 0, 0);

2
scene/2d/path_2d.h
View File

@ -48,7 +48,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;

2
scene/2d/physics/collision_polygon_2d.cpp
View File

@ -217,7 +217,7 @@ CollisionPolygon2D::BuildMode CollisionPolygon2D::get_build_mode() const {
return build_mode; return build_mode;
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 CollisionPolygon2D::_edit_get_rect() const { Rect2 CollisionPolygon2D::_edit_get_rect() const {
return aabb; return aabb;
} }

2
scene/2d/physics/collision_polygon_2d.h
View File

@ -65,7 +65,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;

4
scene/2d/physics/collision_shape_2d.h
View File

@ -59,11 +59,11 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;
#else #else
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
#endif // TOOLS_ENABLED #endif // DEBUG_ENABLED
void set_shape(const Ref<Shape2D> &p_shape); void set_shape(const Ref<Shape2D> &p_shape);
Ref<Shape2D> get_shape() const; Ref<Shape2D> get_shape() const;

4
scene/2d/polygon_2d.cpp
View File

@ -57,7 +57,9 @@ Point2 Polygon2D::_edit_get_pivot() const {
bool Polygon2D::_edit_use_pivot() const { bool Polygon2D::_edit_use_pivot() const {
return true; return true;
} }
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
Rect2 Polygon2D::_edit_get_rect() const { Rect2 Polygon2D::_edit_get_rect() const {
if (rect_cache_dirty) { if (rect_cache_dirty) {
int l = polygon.size(); int l = polygon.size();
@ -88,7 +90,7 @@ bool Polygon2D::_edit_is_selected_on_click(const Point2 &p_point, double p_toler
} }
return Geometry2D::is_point_in_polygon(p_point - get_offset(), polygon2d); return Geometry2D::is_point_in_polygon(p_point - get_offset(), polygon2d);
} }
#endif #endif // DEBUG_ENABLED
void Polygon2D::_validate_property(PropertyInfo &p_property) const { void Polygon2D::_validate_property(PropertyInfo &p_property) const {
if (!invert && p_property.name == "invert_border") { if (!invert && p_property.name == "invert_border") {

5
scene/2d/polygon_2d.h
View File

@ -87,11 +87,14 @@ public:
virtual void _edit_set_pivot(const Point2 &p_pivot) override; virtual void _edit_set_pivot(const Point2 &p_pivot) override;
virtual Point2 _edit_get_pivot() const override; virtual Point2 _edit_get_pivot() const override;
virtual bool _edit_use_pivot() const override; virtual bool _edit_use_pivot() const override;
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;
#endif #endif // DEBUG_ENABLED
void set_polygon(const Vector<Vector2> &p_polygon); void set_polygon(const Vector<Vector2> &p_polygon);
Vector<Vector2> get_polygon() const; Vector<Vector2> get_polygon() const;

4
scene/2d/sprite_2d.cpp
View File

@ -56,7 +56,9 @@ Point2 Sprite2D::_edit_get_pivot() const {
bool Sprite2D::_edit_use_pivot() const { bool Sprite2D::_edit_use_pivot() const {
return true; return true;
} }
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
bool Sprite2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { bool Sprite2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
return is_pixel_opaque(p_point); return is_pixel_opaque(p_point);
} }
@ -68,7 +70,7 @@ Rect2 Sprite2D::_edit_get_rect() const {
bool Sprite2D::_edit_use_rect() const { bool Sprite2D::_edit_use_rect() const {
return texture.is_valid(); return texture.is_valid();
} }
#endif #endif // DEBUG_ENABLED
Rect2 Sprite2D::get_anchorable_rect() const { Rect2 Sprite2D::get_anchorable_rect() const {
return get_rect(); return get_rect();

5
scene/2d/sprite_2d.h
View File

@ -74,11 +74,14 @@ public:
virtual void _edit_set_pivot(const Point2 &p_pivot) override; virtual void _edit_set_pivot(const Point2 &p_pivot) override;
virtual Point2 _edit_get_pivot() const override; virtual Point2 _edit_get_pivot() const override;
virtual bool _edit_use_pivot() const override; virtual bool _edit_use_pivot() const override;
#endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override; virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const override;
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
bool is_pixel_opaque(const Point2 &p_point) const; bool is_pixel_opaque(const Point2 &p_point) const;

16
scene/2d/tile_map.cpp
View File

@ -89,8 +89,8 @@ void TileMap::_set_tile_map_data_using_compatibility_format(int p_layer, TileMap
SWAP(local[8], local[11]); SWAP(local[8], local[11]);
SWAP(local[9], local[10]); SWAP(local[9], local[10]);
} }
#endif #endif // BIG_ENDIAN_ENABLED
// Extracts position in TileMap. // Extracts position in TileMap.
int16_t x = decode_uint16(&local[0]); int16_t x = decode_uint16(&local[0]);
int16_t y = decode_uint16(&local[2]); int16_t y = decode_uint16(&local[2]);
@ -172,7 +172,7 @@ void TileMap::_notification(int p_what) {
bool in_editor = false; bool in_editor = false;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
in_editor = Engine::get_singleton()->is_editor_hint(); in_editor = Engine::get_singleton()->is_editor_hint();
#endif #endif // TOOLS_ENABLED
if (is_inside_tree() && collision_animatable && !in_editor) { if (is_inside_tree() && collision_animatable && !in_editor) {
// Update transform on the physics tick when in animatable mode. // Update transform on the physics tick when in animatable mode.
last_valid_transform = new_transform; last_valid_transform = new_transform;
@ -188,7 +188,7 @@ void TileMap::_notification(int p_what) {
bool in_editor = false; bool in_editor = false;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
in_editor = Engine::get_singleton()->is_editor_hint(); in_editor = Engine::get_singleton()->is_editor_hint();
#endif #endif // TOOLS_ENABLED
if (is_inside_tree() && collision_animatable && !in_editor) { if (is_inside_tree() && collision_animatable && !in_editor) {
// Store last valid transform. // Store last valid transform.
@ -209,7 +209,7 @@ void TileMap::force_update(int p_layer) {
notify_runtime_tile_data_update(p_layer); notify_runtime_tile_data_update(p_layer);
update_internals(); update_internals();
} }
#endif #endif // DISABLE_DEPRECATED
void TileMap::set_rendering_quadrant_size(int p_size) { void TileMap::set_rendering_quadrant_size(int p_size) {
ERR_FAIL_COND_MSG(p_size < 1, "TileMapQuadrant size cannot be smaller than 1."); ERR_FAIL_COND_MSG(p_size < 1, "TileMapQuadrant size cannot be smaller than 1.");
@ -649,7 +649,7 @@ void TileMap::notify_runtime_tile_data_update(int p_layer) {
} }
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 TileMap::_edit_get_rect() const { Rect2 TileMap::_edit_get_rect() const {
// Return the visible rect of the tilemap. // Return the visible rect of the tilemap.
if (layers.is_empty()) { if (layers.is_empty()) {
@ -667,7 +667,7 @@ Rect2 TileMap::_edit_get_rect() const {
const_cast<TileMap *>(this)->item_rect_changed(any_changed); const_cast<TileMap *>(this)->item_rect_changed(any_changed);
return rect; return rect;
} }
#endif #endif // DEBUG_ENABLED
bool TileMap::_set(const StringName &p_name, const Variant &p_value) { bool TileMap::_set(const StringName &p_name, const Variant &p_value) {
int index; int index;
@ -726,7 +726,7 @@ bool TileMap::_get(const StringName &p_name, Variant &r_ret) const {
r_ret = get_rendering_quadrant_size(); r_ret = get_rendering_quadrant_size();
return true; return true;
} }
#endif #endif // DISABLE_DEPRECATED
else { else {
return property_helper.property_get_value(sname, r_ret); return property_helper.property_get_value(sname, r_ret);
} }

8
scene/2d/tile_map.h
View File

@ -107,16 +107,16 @@ protected:
VisibilityMode _get_navigation_visibility_mode_bind_compat_87115(); VisibilityMode _get_navigation_visibility_mode_bind_compat_87115();
static void _bind_compatibility_methods(); static void _bind_compatibility_methods();
#endif #endif // DISABLE_DEPRECATED
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
#endif #endif // DEBUG_ENABLED
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
void force_update(int p_layer); void force_update(int p_layer);
#endif #endif // DISABLE_DEPRECATED
void set_rendering_quadrant_size(int p_size); void set_rendering_quadrant_size(int p_size);
int get_rendering_quadrant_size() const; int get_rendering_quadrant_size() const;

4
scene/2d/touch_screen_button.cpp
View File

@ -330,7 +330,7 @@ void TouchScreenButton::_release(bool p_exiting_tree) {
} }
} }
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 TouchScreenButton::_edit_get_rect() const { Rect2 TouchScreenButton::_edit_get_rect() const {
if (texture_normal.is_null()) { if (texture_normal.is_null()) {
return CanvasItem::_edit_get_rect(); return CanvasItem::_edit_get_rect();
@ -342,7 +342,7 @@ Rect2 TouchScreenButton::_edit_get_rect() const {
bool TouchScreenButton::_edit_use_rect() const { bool TouchScreenButton::_edit_use_rect() const {
return !texture_normal.is_null(); return !texture_normal.is_null();
} }
#endif #endif // DEBUG_ENABLED
Rect2 TouchScreenButton::get_anchorable_rect() const { Rect2 TouchScreenButton::get_anchorable_rect() const {
if (texture_normal.is_null()) { if (texture_normal.is_null()) {

4
scene/2d/touch_screen_button.h
View File

@ -76,10 +76,10 @@ protected:
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
void set_texture_normal(const Ref<Texture2D> &p_texture); void set_texture_normal(const Ref<Texture2D> &p_texture);
Ref<Texture2D> get_texture_normal() const; Ref<Texture2D> get_texture_normal() const;

4
scene/2d/visible_on_screen_notifier_2d.cpp
View File

@ -30,7 +30,7 @@
#include "visible_on_screen_notifier_2d.h" #include "visible_on_screen_notifier_2d.h"
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 VisibleOnScreenNotifier2D::_edit_get_rect() const { Rect2 VisibleOnScreenNotifier2D::_edit_get_rect() const {
return rect; return rect;
} }
@ -38,7 +38,7 @@ Rect2 VisibleOnScreenNotifier2D::_edit_get_rect() const {
bool VisibleOnScreenNotifier2D::_edit_use_rect() const { bool VisibleOnScreenNotifier2D::_edit_use_rect() const {
return true; return true;
} }
#endif #endif // DEBUG_ENABLED
void VisibleOnScreenNotifier2D::_visibility_enter() { void VisibleOnScreenNotifier2D::_visibility_enter() {
if (!is_inside_tree() || Engine::get_singleton()->is_editor_hint()) { if (!is_inside_tree() || Engine::get_singleton()->is_editor_hint()) {

4
scene/2d/visible_on_screen_notifier_2d.h
View File

@ -54,10 +54,10 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override; virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override; virtual bool _edit_use_rect() const override;
#endif #endif // DEBUG_ENABLED
void set_rect(const Rect2 &p_rect); void set_rect(const Rect2 &p_rect);
Rect2 get_rect() const; Rect2 get_rect() const;

46
scene/gui/control.cpp
View File

@ -44,7 +44,7 @@
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/plugins/control_editor_plugin.h" #include "editor/plugins/control_editor_plugin.h"
#endif #endif // TOOLS_ENABLED
// Editor plugin interoperability. // Editor plugin interoperability.
@ -140,14 +140,6 @@ void Control::_edit_set_rect(const Rect2 &p_edit_rect) {
set_size(p_edit_rect.size.snappedf(1), ControlEditorToolbar::get_singleton()->is_anchors_mode_enabled()); set_size(p_edit_rect.size.snappedf(1), ControlEditorToolbar::get_singleton()->is_anchors_mode_enabled());
} }
Rect2 Control::_edit_get_rect() const {
return Rect2(Point2(), get_size());
}
bool Control::_edit_use_rect() const {
return true;
}
void Control::_edit_set_rotation(real_t p_rotation) { void Control::_edit_set_rotation(real_t p_rotation) {
set_rotation(p_rotation); set_rotation(p_rotation);
} }
@ -178,7 +170,17 @@ bool Control::_edit_use_pivot() const {
Size2 Control::_edit_get_minimum_size() const { Size2 Control::_edit_get_minimum_size() const {
return get_combined_minimum_size(); return get_combined_minimum_size();
} }
#endif #endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
Rect2 Control::_edit_get_rect() const {
return Rect2(Point2(), get_size());
}
bool Control::_edit_use_rect() const {
return true;
}
#endif // DEBUG_ENABLED
void Control::reparent(Node *p_parent, bool p_keep_global_transform) { void Control::reparent(Node *p_parent, bool p_keep_global_transform) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
@ -239,7 +241,7 @@ void Control::get_argument_options(const StringName &p_function, int p_idx, List
} }
CanvasItem::get_argument_options(p_function, p_idx, r_options); CanvasItem::get_argument_options(p_function, p_idx, r_options);
} }
#endif #endif // TOOLS_ENABLED
PackedStringArray Control::get_configuration_warnings() const { PackedStringArray Control::get_configuration_warnings() const {
ERR_READ_THREAD_GUARD_V(PackedStringArray()); ERR_READ_THREAD_GUARD_V(PackedStringArray());
@ -663,7 +665,7 @@ Rect2 Control::get_parent_anchorable_rect() const {
#else #else
parent_rect = get_viewport()->get_visible_rect(); parent_rect = get_viewport()->get_visible_rect();
#endif #endif // TOOLS_ENABLED
} }
return parent_rect; return parent_rect;
@ -1396,7 +1398,7 @@ void Control::set_position(const Point2 &p_point, bool p_keep_offsets) {
data.pos_cache = p_point; data.pos_cache = p_point;
return; return;
} }
#endif #endif // TOOLS_ENABLED
if (p_keep_offsets) { if (p_keep_offsets) {
_compute_anchors(Rect2(p_point, data.size_cache), data.offset, data.anchor); _compute_anchors(Rect2(p_point, data.size_cache), data.offset, data.anchor);
@ -1440,7 +1442,7 @@ void Control::_set_size(const Size2 &p_size) {
if (data.size_warning && (data.anchor[SIDE_LEFT] != data.anchor[SIDE_RIGHT] || data.anchor[SIDE_TOP] != data.anchor[SIDE_BOTTOM])) { if (data.size_warning && (data.anchor[SIDE_LEFT] != data.anchor[SIDE_RIGHT] || data.anchor[SIDE_TOP] != data.anchor[SIDE_BOTTOM])) {
WARN_PRINT("Nodes with non-equal opposite anchors will have their size overridden after _ready(). \nIf you want to set size, change the anchors or consider using set_deferred()."); WARN_PRINT("Nodes with non-equal opposite anchors will have their size overridden after _ready(). \nIf you want to set size, change the anchors or consider using set_deferred().");
} }
#endif #endif // DEBUG_ENABLED
set_size(p_size); set_size(p_size);
} }
@ -1462,7 +1464,7 @@ void Control::set_size(const Size2 &p_size, bool p_keep_offsets) {
data.size_cache = new_size; data.size_cache = new_size;
return; return;
} }
#endif #endif // TOOLS_ENABLED
if (p_keep_offsets) { if (p_keep_offsets) {
_compute_anchors(Rect2(data.pos_cache, new_size), data.offset, data.anchor); _compute_anchors(Rect2(data.pos_cache, new_size), data.offset, data.anchor);
@ -2745,7 +2747,7 @@ Variant Control::get_theme_item(Theme::DataType p_data_type, const StringName &p
Ref<Texture2D> Control::get_editor_theme_icon(const StringName &p_name) const { Ref<Texture2D> Control::get_editor_theme_icon(const StringName &p_name) const {
return get_theme_icon(p_name, SNAME("EditorIcons")); return get_theme_icon(p_name, SNAME("EditorIcons"));
} }
#endif #endif // TOOLS_ENABLED
bool Control::has_theme_icon(const StringName &p_name, const StringName &p_theme_type) const { bool Control::has_theme_icon(const StringName &p_name, const StringName &p_theme_type) const {
ERR_READ_THREAD_GUARD_V(false); ERR_READ_THREAD_GUARD_V(false);
@ -3087,7 +3089,7 @@ bool Control::is_layout_rtl() const {
const_cast<Control *>(this)->data.is_rtl = true; const_cast<Control *>(this)->data.is_rtl = true;
return data.is_rtl; return data.is_rtl;
} }
#endif #endif // TOOLS_ENABLED
Node *parent_node = get_parent(); Node *parent_node = get_parent();
while (parent_node) { while (parent_node) {
Control *parent_control = Object::cast_to<Control>(parent_node); Control *parent_control = Object::cast_to<Control>(parent_node);
@ -3162,7 +3164,7 @@ bool Control::is_auto_translating() const {
ERR_READ_THREAD_GUARD_V(false); ERR_READ_THREAD_GUARD_V(false);
return can_auto_translate(); return can_auto_translate();
} }
#endif #endif // DISABLE_DEPRECATED
void Control::set_tooltip_auto_translate_mode(AutoTranslateMode p_mode) { void Control::set_tooltip_auto_translate_mode(AutoTranslateMode p_mode) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
@ -3215,7 +3217,7 @@ void Control::_notification(int p_notification) {
case NOTIFICATION_EDITOR_POST_SAVE: { case NOTIFICATION_EDITOR_POST_SAVE: {
saving = false; saving = false;
} break; } break;
#endif #endif // TOOLS_ENABLED
case NOTIFICATION_POSTINITIALIZE: { case NOTIFICATION_POSTINITIALIZE: {
data.initialized = true; data.initialized = true;
@ -3261,7 +3263,7 @@ void Control::_notification(int p_notification) {
case NOTIFICATION_READY: { case NOTIFICATION_READY: {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
connect(SceneStringName(ready), callable_mp(this, &Control::_clear_size_warning), CONNECT_DEFERRED | CONNECT_ONE_SHOT); connect(SceneStringName(ready), callable_mp(this, &Control::_clear_size_warning), CONNECT_DEFERRED | CONNECT_ONE_SHOT);
#endif #endif // DEBUG_ENABLED
} break; } break;
case NOTIFICATION_ENTER_CANVAS: { case NOTIFICATION_ENTER_CANVAS: {
@ -3573,7 +3575,7 @@ void Control::_bind_methods() {
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
ClassDB::bind_method(D_METHOD("set_auto_translate", "enable"), &Control::set_auto_translate); ClassDB::bind_method(D_METHOD("set_auto_translate", "enable"), &Control::set_auto_translate);
ClassDB::bind_method(D_METHOD("is_auto_translating"), &Control::is_auto_translating); ClassDB::bind_method(D_METHOD("is_auto_translating"), &Control::is_auto_translating);
#endif #endif // DISABLE_DEPRECATED
ClassDB::bind_method(D_METHOD("set_localize_numeral_system", "enable"), &Control::set_localize_numeral_system); ClassDB::bind_method(D_METHOD("set_localize_numeral_system", "enable"), &Control::set_localize_numeral_system);
ClassDB::bind_method(D_METHOD("is_localizing_numeral_system"), &Control::is_localizing_numeral_system); ClassDB::bind_method(D_METHOD("is_localizing_numeral_system"), &Control::is_localizing_numeral_system);
@ -3628,7 +3630,7 @@ void Control::_bind_methods() {
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_translate", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_auto_translate", "is_auto_translating"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_translate", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_auto_translate", "is_auto_translating");
#endif #endif // DISABLE_DEPRECATED
ADD_GROUP("Tooltip", "tooltip_"); ADD_GROUP("Tooltip", "tooltip_");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "tooltip_text", PROPERTY_HINT_MULTILINE_TEXT), "set_tooltip_text", "get_tooltip_text"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "tooltip_text", PROPERTY_HINT_MULTILINE_TEXT), "set_tooltip_text", "get_tooltip_text");

18
scene/gui/control.h
View File

@ -48,7 +48,7 @@ class Control : public CanvasItem {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
bool saving = false; bool saving = false;
#endif #endif //TOOLS_ENABLED
public: public:
enum Anchor { enum Anchor {
@ -396,8 +396,6 @@ public:
virtual Size2 _edit_get_scale() const override; virtual Size2 _edit_get_scale() const override;
virtual void _edit_set_rect(const Rect2 &p_edit_rect) override; virtual void _edit_set_rect(const Rect2 &p_edit_rect) override;
virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override;
virtual void _edit_set_rotation(real_t p_rotation) override; virtual void _edit_set_rotation(real_t p_rotation) override;
virtual real_t _edit_get_rotation() const override; virtual real_t _edit_get_rotation() const override;
@ -408,7 +406,13 @@ public:
virtual bool _edit_use_pivot() const override; virtual bool _edit_use_pivot() const override;
virtual Size2 _edit_get_minimum_size() const override; virtual Size2 _edit_get_minimum_size() const override;
#endif #endif //TOOLS_ENABLED
#ifdef DEBUG_ENABLED
virtual Rect2 _edit_get_rect() const override;
virtual bool _edit_use_rect() const override;
#endif // DEBUG_ENABLED
virtual void reparent(Node *p_parent, bool p_keep_global_transform = true) override; virtual void reparent(Node *p_parent, bool p_keep_global_transform = true) override;
// Editor integration. // Editor integration.
@ -418,7 +422,7 @@ public:
PackedStringArray get_configuration_warnings() const override; PackedStringArray get_configuration_warnings() const override;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override; virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
#endif #endif //TOOLS_ENABLED
virtual bool is_text_field() const; virtual bool is_text_field() const;
@ -605,7 +609,7 @@ public:
Variant get_theme_item(Theme::DataType p_data_type, const StringName &p_name, const StringName &p_theme_type = StringName()) const; Variant get_theme_item(Theme::DataType p_data_type, const StringName &p_name, const StringName &p_theme_type = StringName()) const;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Ref<Texture2D> get_editor_theme_icon(const StringName &p_name) const; Ref<Texture2D> get_editor_theme_icon(const StringName &p_name) const;
#endif #endif //TOOLS_ENABLED
bool has_theme_icon_override(const StringName &p_name) const; bool has_theme_icon_override(const StringName &p_name) const;
bool has_theme_stylebox_override(const StringName &p_name) const; bool has_theme_stylebox_override(const StringName &p_name) const;
@ -637,7 +641,7 @@ public:
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
void set_auto_translate(bool p_enable); void set_auto_translate(bool p_enable);
bool is_auto_translating() const; bool is_auto_translating() const;
#endif #endif //DISABLE_DEPRECATED
void set_tooltip_auto_translate_mode(AutoTranslateMode p_mode); void set_tooltip_auto_translate_mode(AutoTranslateMode p_mode);
AutoTranslateMode get_tooltip_auto_translate_mode() const; AutoTranslateMode get_tooltip_auto_translate_mode() const;

8
scene/main/canvas_item.cpp
View File

@ -44,7 +44,7 @@
#define ERR_DRAW_GUARD \ #define ERR_DRAW_GUARD \
ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside this node's `_draw()`, functions connected to its `draw` signal, or when it receives NOTIFICATION_DRAW.") ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside this node's `_draw()`, functions connected to its `draw` signal, or when it receives NOTIFICATION_DRAW.")
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
bool CanvasItem::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { bool CanvasItem::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
if (_edit_use_rect()) { if (_edit_use_rect()) {
return _edit_get_rect().has_point(p_point); return _edit_get_rect().has_point(p_point);
@ -52,11 +52,13 @@ bool CanvasItem::_edit_is_selected_on_click(const Point2 &p_point, double p_tole
return p_point.length() < p_tolerance; return p_point.length() < p_tolerance;
} }
} }
#endif // DEBUG_ENABLED
#ifdef TOOLS_ENABLED
Transform2D CanvasItem::_edit_get_transform() const { Transform2D CanvasItem::_edit_get_transform() const {
return Transform2D(_edit_get_rotation(), _edit_get_position() + _edit_get_pivot()); return Transform2D(_edit_get_rotation(), _edit_get_position() + _edit_get_pivot());
} }
#endif #endif //TOOLS_ENABLED
bool CanvasItem::is_visible_in_tree() const { bool CanvasItem::is_visible_in_tree() const {
ERR_READ_THREAD_GUARD_V(false); ERR_READ_THREAD_GUARD_V(false);
@ -1158,7 +1160,7 @@ void CanvasItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("_edit_get_pivot"), &CanvasItem::_edit_get_pivot); ClassDB::bind_method(D_METHOD("_edit_get_pivot"), &CanvasItem::_edit_get_pivot);
ClassDB::bind_method(D_METHOD("_edit_use_pivot"), &CanvasItem::_edit_use_pivot); ClassDB::bind_method(D_METHOD("_edit_use_pivot"), &CanvasItem::_edit_use_pivot);
ClassDB::bind_method(D_METHOD("_edit_get_transform"), &CanvasItem::_edit_get_transform); ClassDB::bind_method(D_METHOD("_edit_get_transform"), &CanvasItem::_edit_get_transform);
#endif #endif //TOOLS_ENABLED
ClassDB::bind_method(D_METHOD("get_canvas_item"), &CanvasItem::get_canvas_item); ClassDB::bind_method(D_METHOD("get_canvas_item"), &CanvasItem::get_canvas_item);

23
scene/main/canvas_item.h
View File

@ -174,7 +174,7 @@ protected:
void _draw_multiline_bind_compat_84523(const Vector<Point2> &p_points, const Color &p_color, real_t p_width); void _draw_multiline_bind_compat_84523(const Vector<Point2> &p_points, const Color &p_color, real_t p_width);
void _draw_multiline_colors_bind_compat_84523(const Vector<Point2> &p_points, const Vector<Color> &p_colors, real_t p_width); void _draw_multiline_colors_bind_compat_84523(const Vector<Point2> &p_points, const Vector<Color> &p_colors, real_t p_width);
static void _bind_compatibility_methods(); static void _bind_compatibility_methods();
#endif #endif // DISABLE_DEPRECATED
void _validate_property(PropertyInfo &p_property) const; void _validate_property(PropertyInfo &p_property) const;
@ -193,11 +193,9 @@ public:
NOTIFICATION_WORLD_2D_CHANGED = 36, NOTIFICATION_WORLD_2D_CHANGED = 36,
}; };
/* EDITOR */ /* EDITOR AND DEBUGGING */
#ifdef TOOLS_ENABLED
// Select the node
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
#ifdef TOOLS_ENABLED
// Save and restore a CanvasItem state // Save and restore a CanvasItem state
virtual void _edit_set_state(const Dictionary &p_state) {} virtual void _edit_set_state(const Dictionary &p_state) {}
virtual Dictionary _edit_get_state() const { return Dictionary(); } virtual Dictionary _edit_get_state() const { return Dictionary(); }
@ -216,9 +214,7 @@ public:
virtual real_t _edit_get_rotation() const { return 0.0; } virtual real_t _edit_get_rotation() const { return 0.0; }
// Used to resize/move the node // Used to resize/move the node
virtual bool _edit_use_rect() const { return false; } // MAYBE REPLACE BY A _edit_get_editmode()
virtual void _edit_set_rect(const Rect2 &p_rect) {} virtual void _edit_set_rect(const Rect2 &p_rect) {}
virtual Rect2 _edit_get_rect() const { return Rect2(0, 0, 0, 0); }
virtual Size2 _edit_get_minimum_size() const { return Size2(-1, -1); } // LOOKS WEIRD virtual Size2 _edit_get_minimum_size() const { return Size2(-1, -1); } // LOOKS WEIRD
// Used to set a pivot // Used to set a pivot
@ -227,7 +223,18 @@ public:
virtual Point2 _edit_get_pivot() const { return Point2(); } virtual Point2 _edit_get_pivot() const { return Point2(); }
virtual Transform2D _edit_get_transform() const; virtual Transform2D _edit_get_transform() const;
#endif #endif // TOOLS_ENABLED
#ifdef DEBUG_ENABLED
// Those need to be available in debug runtime, to allow for node selection.
// Select the node.
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
// Used to resize/move the node.
virtual bool _edit_use_rect() const { return false; } // Maybe replace with _edit_get_editmode().
virtual Rect2 _edit_get_rect() const { return Rect2(0, 0, 0, 0); }
#endif // DEBUG_ENABLED
void update_draw_order(); void update_draw_order();

4
scene/resources/2d/navigation_polygon.cpp
View File

@ -36,7 +36,7 @@
#include "thirdparty/misc/polypartition.h" #include "thirdparty/misc/polypartition.h"
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 NavigationPolygon::_edit_get_rect() const { Rect2 NavigationPolygon::_edit_get_rect() const {
RWLockRead read_lock(rwlock); RWLockRead read_lock(rwlock);
if (rect_cache_dirty) { if (rect_cache_dirty) {
@ -79,7 +79,7 @@ bool NavigationPolygon::_edit_is_selected_on_click(const Point2 &p_point, double
} }
return false; return false;
} }
#endif #endif // DEBUG_ENABLED
void NavigationPolygon::set_vertices(const Vector<Vector2> &p_vertices) { void NavigationPolygon::set_vertices(const Vector<Vector2> &p_vertices) {
RWLockWrite write_lock(rwlock); RWLockWrite write_lock(rwlock);

5
scene/resources/2d/navigation_polygon.h
View File

@ -68,10 +68,11 @@ protected:
TypedArray<Vector<Vector2>> _get_outlines() const; TypedArray<Vector<Vector2>> _get_outlines() const;
public: public:
#ifdef TOOLS_ENABLED #ifdef DEBUG_ENABLED
Rect2 _edit_get_rect() const; Rect2 _edit_get_rect() const;
bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const; bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
#endif #endif // DEBUG_ENABLED
enum SamplePartitionType { enum SamplePartitionType {
SAMPLE_PARTITION_CONVEX_PARTITION = 0, SAMPLE_PARTITION_CONVEX_PARTITION = 0,
SAMPLE_PARTITION_TRIANGULATE, SAMPLE_PARTITION_TRIANGULATE,