diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 13:23:58 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 16:54:55 +0200 |
commit | 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (patch) | |
tree | a27e497da7104dd0a64f98a04fa3067668735e91 /scene/2d/sprite_2d.cpp | |
parent | 710b34b70227becdc652b4ae027fe0ac47409642 (diff) |
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.
This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.
There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).
Part of #33027.
Diffstat (limited to 'scene/2d/sprite_2d.cpp')
-rw-r--r-- | scene/2d/sprite_2d.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/scene/2d/sprite_2d.cpp b/scene/2d/sprite_2d.cpp index df8859bd9a..4df66057f0 100644 --- a/scene/2d/sprite_2d.cpp +++ b/scene/2d/sprite_2d.cpp @@ -61,7 +61,6 @@ bool Sprite2D::_edit_use_pivot() const { } bool Sprite2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { - return is_pixel_opaque(p_point); } @@ -79,7 +78,6 @@ Rect2 Sprite2D::get_anchorable_rect() const { } void Sprite2D::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_clip) const { - Rect2 base_rect; if (region) { @@ -113,11 +111,8 @@ void Sprite2D::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_c } void Sprite2D::_notification(int p_what) { - switch (p_what) { - case NOTIFICATION_DRAW: { - if (texture.is_null()) return; @@ -138,7 +133,6 @@ void Sprite2D::_notification(int p_what) { } void Sprite2D::set_texture(const Ref<Texture2D> &p_texture) { - if (p_texture == texture) return; @@ -157,24 +151,20 @@ void Sprite2D::set_texture(const Ref<Texture2D> &p_texture) { } void Sprite2D::set_normal_map(const Ref<Texture2D> &p_texture) { - normal_map = p_texture; update(); } Ref<Texture2D> Sprite2D::get_normal_map() const { - return normal_map; } void Sprite2D::set_specular_map(const Ref<Texture2D> &p_texture) { - specular = p_texture; update(); } Ref<Texture2D> Sprite2D::get_specular_map() const { - return specular; } @@ -197,56 +187,46 @@ float Sprite2D::get_shininess() const { } Ref<Texture2D> Sprite2D::get_texture() const { - return texture; } void Sprite2D::set_centered(bool p_center) { - centered = p_center; update(); item_rect_changed(); } bool Sprite2D::is_centered() const { - return centered; } void Sprite2D::set_offset(const Point2 &p_offset) { - offset = p_offset; update(); item_rect_changed(); _change_notify("offset"); } Point2 Sprite2D::get_offset() const { - return offset; } void Sprite2D::set_flip_h(bool p_flip) { - hflip = p_flip; update(); } bool Sprite2D::is_flipped_h() const { - return hflip; } void Sprite2D::set_flip_v(bool p_flip) { - vflip = p_flip; update(); } bool Sprite2D::is_flipped_v() const { - return vflip; } void Sprite2D::set_region(bool p_region) { - if (p_region == region) return; @@ -255,12 +235,10 @@ void Sprite2D::set_region(bool p_region) { } bool Sprite2D::is_region() const { - return region; } void Sprite2D::set_region_rect(const Rect2 &p_region_rect) { - if (region_rect == p_region_rect) return; @@ -273,7 +251,6 @@ void Sprite2D::set_region_rect(const Rect2 &p_region_rect) { } Rect2 Sprite2D::get_region_rect() const { - return region_rect; } @@ -287,7 +264,6 @@ bool Sprite2D::is_region_filter_clip_enabled() const { } void Sprite2D::set_frame(int p_frame) { - ERR_FAIL_INDEX(p_frame, vframes * hframes); if (frame != p_frame) @@ -301,7 +277,6 @@ void Sprite2D::set_frame(int p_frame) { } int Sprite2D::get_frame() const { - return frame; } @@ -317,7 +292,6 @@ Vector2 Sprite2D::get_frame_coords() const { } void Sprite2D::set_vframes(int p_amount) { - ERR_FAIL_COND_MSG(p_amount < 1, "Amount of vframes cannot be smaller than 1."); vframes = p_amount; update(); @@ -325,12 +299,10 @@ void Sprite2D::set_vframes(int p_amount) { _change_notify(); } int Sprite2D::get_vframes() const { - return vframes; } void Sprite2D::set_hframes(int p_amount) { - ERR_FAIL_COND_MSG(p_amount < 1, "Amount of hframes cannot be smaller than 1."); hframes = p_amount; update(); @@ -338,12 +310,10 @@ void Sprite2D::set_hframes(int p_amount) { _change_notify(); } int Sprite2D::get_hframes() const { - return hframes; } bool Sprite2D::is_pixel_opaque(const Point2 &p_point) const { - if (texture.is_null()) return false; @@ -393,7 +363,6 @@ bool Sprite2D::is_pixel_opaque(const Point2 &p_point) const { } Rect2 Sprite2D::get_rect() const { - if (texture.is_null()) return Rect2(0, 0, 1, 1); @@ -418,7 +387,6 @@ Rect2 Sprite2D::get_rect() const { } void Sprite2D::_validate_property(PropertyInfo &property) const { - if (property.name == "frame") { property.hint = PROPERTY_HINT_RANGE; property.hint_string = "0," + itos(vframes * hframes - 1) + ",1"; @@ -431,7 +399,6 @@ void Sprite2D::_validate_property(PropertyInfo &property) const { } void Sprite2D::_texture_changed() { - // Changes to the texture need to trigger an update to make // the editor redraw the sprite with the updated texture. if (texture.is_valid()) { @@ -440,7 +407,6 @@ void Sprite2D::_texture_changed() { } void Sprite2D::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_texture", "texture"), &Sprite2D::set_texture); ClassDB::bind_method(D_METHOD("get_texture"), &Sprite2D::get_texture); @@ -520,7 +486,6 @@ void Sprite2D::_bind_methods() { } Sprite2D::Sprite2D() { - centered = true; hflip = false; vflip = false; |