1 files changed, 78 insertions, 91 deletions

diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp
index 4cedfc0c20..3268544519 100644
--- a/scene/2d/animated_sprite_2d.cpp
+++ b/scene/2d/animated_sprite_2d.cpp
@@ -70,8 +70,9 @@ bool AnimatedSprite2D::_edit_use_rect() const {
 		return false;
 	}
 	Ref<Texture2D> t;
-	if (animation)
+	if (animation) {
 		t = frames->get_frame(animation, frame);
+	}
 	return t.is_valid();
 }
 #endif
@@ -86,31 +87,35 @@ Rect2 AnimatedSprite2D::_get_rect() const {
 	}
 
 	Ref<Texture2D> t;
-	if (animation)
+	if (animation) {
 		t = frames->get_frame(animation, frame);
-	if (t.is_null())
+	}
+	if (t.is_null()) {
 		return Rect2();
+	}
 	Size2 s = t->get_size();
 
 	Point2 ofs = offset;
-	if (centered)
+	if (centered) {
 		ofs -= Size2(s) / 2;
+	}
 
-	if (s == Size2(0, 0))
+	if (s == Size2(0, 0)) {
 		s = Size2(1, 1);
+	}
 
 	return Rect2(ofs, s);
 }
 
 void SpriteFrames::add_frame(const StringName &p_anim, const Ref<Texture2D> &p_frame, int p_at_pos) {
-
 	Map<StringName, Anim>::Element *E = animations.find(p_anim);
 	ERR_FAIL_COND_MSG(!E, "Animation '" + String(p_anim) + "' doesn't exist.");
 
-	if (p_at_pos >= 0 && p_at_pos < E->get().frames.size())
+	if (p_at_pos >= 0 && p_at_pos < E->get().frames.size()) {
 		E->get().frames.insert(p_at_pos, p_frame);
-	else
+	} else {
 		E->get().frames.push_back(p_frame);
+	}
 
 	emit_changed();
 }
@@ -123,15 +128,14 @@ int SpriteFrames::get_frame_count(const StringName &p_anim) const {
 }
 
 void SpriteFrames::remove_frame(const StringName &p_anim, int p_idx) {
-
 	Map<StringName, Anim>::Element *E = animations.find(p_anim);
 	ERR_FAIL_COND_MSG(!E, "Animation '" + String(p_anim) + "' doesn't exist.");
 
 	E->get().frames.remove(p_idx);
 	emit_changed();
 }
-void SpriteFrames::clear(const StringName &p_anim) {
 
+void SpriteFrames::clear(const StringName &p_anim) {
 	Map<StringName, Anim>::Element *E = animations.find(p_anim);
 	ERR_FAIL_COND_MSG(!E, "Animation '" + String(p_anim) + "' doesn't exist.");
 
@@ -140,13 +144,11 @@ void SpriteFrames::clear(const StringName &p_anim) {
 }
 
 void SpriteFrames::clear_all() {
-
 	animations.clear();
 	add_animation("default");
 }
 
 void SpriteFrames::add_animation(const StringName &p_anim) {
-
 	ERR_FAIL_COND_MSG(animations.has(p_anim), "SpriteFrames already has animation '" + p_anim + "'.");
 
 	animations[p_anim] = Anim();
@@ -155,16 +157,14 @@ void SpriteFrames::add_animation(const StringName &p_anim) {
 }
 
 bool SpriteFrames::has_animation(const StringName &p_anim) const {
-
 	return animations.has(p_anim);
 }
-void SpriteFrames::remove_animation(const StringName &p_anim) {
 
+void SpriteFrames::remove_animation(const StringName &p_anim) {
 	animations.erase(p_anim);
 }
 
 void SpriteFrames::rename_animation(const StringName &p_prev, const StringName &p_next) {
-
 	ERR_FAIL_COND_MSG(!animations.has(p_prev), "SpriteFrames doesn't have animation '" + String(p_prev) + "'.");
 	ERR_FAIL_COND_MSG(animations.has(p_next), "Animation '" + String(p_next) + "' already exists.");
 
@@ -176,12 +176,10 @@ void SpriteFrames::rename_animation(const StringName &p_prev, const StringName &
 }
 
 Vector<String> SpriteFrames::_get_animation_list() const {
-
 	Vector<String> ret;
 	List<StringName> al;
 	get_animation_list(&al);
 	for (List<StringName>::Element *E = al.front(); E; E = E->next()) {
-
 		ret.push_back(E->get());
 	}
 
@@ -189,14 +187,12 @@ Vector<String> SpriteFrames::_get_animation_list() const {
 }
 
 void SpriteFrames::get_animation_list(List<StringName> *r_animations) const {
-
 	for (const Map<StringName, Anim>::Element *E = animations.front(); E; E = E->next()) {
 		r_animations->push_back(E->key());
 	}
 }
 
 Vector<String> SpriteFrames::get_animation_names() const {
-
 	Vector<String> names;
 	for (const Map<StringName, Anim>::Element *E = animations.front(); E; E = E->next()) {
 		names.push_back(E->key());
@@ -206,14 +202,13 @@ Vector<String> SpriteFrames::get_animation_names() const {
 }
 
 void SpriteFrames::set_animation_speed(const StringName &p_anim, float p_fps) {
-
 	ERR_FAIL_COND_MSG(p_fps < 0, "Animation speed cannot be negative (" + itos(p_fps) + ").");
 	Map<StringName, Anim>::Element *E = animations.find(p_anim);
 	ERR_FAIL_COND_MSG(!E, "Animation '" + String(p_anim) + "' doesn't exist.");
 	E->get().speed = p_fps;
 }
-float SpriteFrames::get_animation_speed(const StringName &p_anim) const {
 
+float SpriteFrames::get_animation_speed(const StringName &p_anim) const {
 	const Map<StringName, Anim>::Element *E = animations.find(p_anim);
 	ERR_FAIL_COND_V_MSG(!E, 0, "Animation '" + String(p_anim) + "' doesn't exist.");
 	return E->get().speed;
@@ -224,6 +219,7 @@ void SpriteFrames::set_animation_loop(const StringName &p_anim, bool p_loop) {
 	ERR_FAIL_COND_MSG(!E, "Animation '" + String(p_anim) + "' doesn't exist.");
 	E->get().loop = p_loop;
 }
+
 bool SpriteFrames::get_animation_loop(const StringName &p_anim) const {
 	const Map<StringName, Anim>::Element *E = animations.find(p_anim);
 	ERR_FAIL_COND_V_MSG(!E, false, "Animation '" + String(p_anim) + "' doesn't exist.");
@@ -231,22 +227,21 @@ bool SpriteFrames::get_animation_loop(const StringName &p_anim) const {
 }
 
 void SpriteFrames::_set_frames(const Array &p_frames) {
-
 	clear_all();
 	Map<StringName, Anim>::Element *E = animations.find(SceneStringNames::get_singleton()->_default);
 	ERR_FAIL_COND(!E);
 
 	E->get().frames.resize(p_frames.size());
-	for (int i = 0; i < E->get().frames.size(); i++)
+	for (int i = 0; i < E->get().frames.size(); i++) {
 		E->get().frames.write[i] = p_frames[i];
+	}
 }
-Array SpriteFrames::_get_frames() const {
 
+Array SpriteFrames::_get_frames() const {
 	return Array();
 }
 
 Array SpriteFrames::_get_animations() const {
-
 	Array anims;
 	for (Map<StringName, Anim>::Element *E = animations.front(); E; E = E->next()) {
 		Dictionary d;
@@ -263,11 +258,10 @@ Array SpriteFrames::_get_animations() const {
 
 	return anims;
 }
-void SpriteFrames::_set_animations(const Array &p_animations) {
 
+void SpriteFrames::_set_animations(const Array &p_animations) {
 	animations.clear();
 	for (int i = 0; i < p_animations.size(); i++) {
-
 		Dictionary d = p_animations[i];
 
 		ERR_CONTINUE(!d.has("name"));
@@ -280,7 +274,6 @@ void SpriteFrames::_set_animations(const Array &p_animations) {
 		anim.loop = d["loop"];
 		Array frames = d["frames"];
 		for (int j = 0; j < frames.size(); j++) {
-
 			RES res = frames[j];
 			anim.frames.push_back(res);
 		}
@@ -290,7 +283,6 @@ void SpriteFrames::_set_animations(const Array &p_animations) {
 }
 
 void SpriteFrames::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("add_animation", "anim"), &SpriteFrames::add_animation);
 	ClassDB::bind_method(D_METHOD("has_animation", "anim"), &SpriteFrames::has_animation);
 	ClassDB::bind_method(D_METHOD("remove_animation", "anim"), &SpriteFrames::remove_animation);
@@ -324,16 +316,14 @@ void SpriteFrames::_bind_methods() {
 }
 
 SpriteFrames::SpriteFrames() {
-
 	add_animation(SceneStringNames::get_singleton()->_default);
 }
 
 void AnimatedSprite2D::_validate_property(PropertyInfo &property) const {
-
-	if (!frames.is_valid())
+	if (!frames.is_valid()) {
 		return;
+	}
 	if (property.name == "animation") {
-
 		property.hint = PROPERTY_HINT_ENUM;
 		List<StringName> names;
 		frames->get_animation_list(&names);
@@ -371,43 +361,45 @@ void AnimatedSprite2D::_validate_property(PropertyInfo &property) const {
 }
 
 void AnimatedSprite2D::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_INTERNAL_PROCESS: {
-
-			if (frames.is_null())
+			if (frames.is_null()) {
 				return;
-			if (!frames->has_animation(animation))
+			}
+			if (!frames->has_animation(animation)) {
 				return;
-			if (frame < 0)
+			}
+			if (frame < 0) {
 				return;
+			}
 
 			float speed = frames->get_animation_speed(animation) * speed_scale;
-			if (speed == 0)
+			if (speed == 0) {
 				return; //do nothing
+			}
 
 			float remaining = get_process_delta_time();
 
 			while (remaining) {
-
 				if (timeout <= 0) {
-
 					timeout = _get_frame_duration();
 
 					int fc = frames->get_frame_count(animation);
 					if ((!backwards && frame >= fc - 1) || (backwards && frame <= 0)) {
 						if (frames->get_animation_loop(animation)) {
-							if (backwards)
+							if (backwards) {
 								frame = fc - 1;
-							else
+							} else {
 								frame = 0;
+							}
 
 							emit_signal(SceneStringNames::get_singleton()->animation_finished);
 						} else {
-							if (backwards)
+							if (backwards) {
 								frame = 0;
-							else
+							} else {
 								frame = fc - 1;
+							}
 
 							if (!is_over) {
 								is_over = true;
@@ -415,10 +407,11 @@ void AnimatedSprite2D::_notification(int p_what) {
 							}
 						}
 					} else {
-						if (backwards)
+						if (backwards) {
 							frame--;
-						else
+						} else {
 							frame++;
+						}
 					}
 
 					update();
@@ -433,17 +426,20 @@ void AnimatedSprite2D::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_DRAW: {
-
-			if (frames.is_null())
+			if (frames.is_null()) {
 				return;
-			if (frame < 0)
+			}
+			if (frame < 0) {
 				return;
-			if (!frames->has_animation(animation))
+			}
+			if (!frames->has_animation(animation)) {
 				return;
+			}
 
 			Ref<Texture2D> texture = frames->get_frame(animation, frame);
-			if (texture.is_null())
+			if (texture.is_null()) {
 				return;
+			}
 
 			Ref<Texture2D> normal = frames->get_normal_frame(animation, frame);
 			Ref<Texture2D> specular = frames->get_specular_frame(animation, frame);
@@ -453,18 +449,21 @@ void AnimatedSprite2D::_notification(int p_what) {
 			Size2i s;
 			s = texture->get_size();
 			Point2 ofs = offset;
-			if (centered)
+			if (centered) {
 				ofs -= s / 2;
+			}
 
 			if (Engine::get_singleton()->get_use_pixel_snap()) {
 				ofs = ofs.floor();
 			}
 			Rect2 dst_rect(ofs, s);
 
-			if (hflip)
+			if (hflip) {
 				dst_rect.size.x = -dst_rect.size.x;
-			if (vflip)
+			}
+			if (vflip) {
 				dst_rect.size.y = -dst_rect.size.y;
+			}
 
 			texture->draw_rect_region(ci, dst_rect, Rect2(Vector2(), texture->get_size()), Color(1, 1, 1), false, normal, specular, Color(specular_color.r, specular_color.g, specular_color.b, shininess));
 
@@ -473,12 +472,13 @@ void AnimatedSprite2D::_notification(int p_what) {
 }
 
 void AnimatedSprite2D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
-
-	if (frames.is_valid())
+	if (frames.is_valid()) {
 		frames->disconnect("changed", callable_mp(this, &AnimatedSprite2D::_res_changed));
+	}
 	frames = p_frames;
-	if (frames.is_valid())
+	if (frames.is_valid()) {
 		frames->connect("changed", callable_mp(this, &AnimatedSprite2D::_res_changed));
+	}
 
 	if (!frames.is_valid()) {
 		frame = 0;
@@ -493,27 +493,28 @@ void AnimatedSprite2D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 }
 
 Ref<SpriteFrames> AnimatedSprite2D::get_sprite_frames() const {
-
 	return frames;
 }
 
 void AnimatedSprite2D::set_frame(int p_frame) {
-
 	if (!frames.is_valid()) {
 		return;
 	}
 
 	if (frames->has_animation(animation)) {
 		int limit = frames->get_frame_count(animation);
-		if (p_frame >= limit)
+		if (p_frame >= limit) {
 			p_frame = limit - 1;
+		}
 	}
 
-	if (p_frame < 0)
+	if (p_frame < 0) {
 		p_frame = 0;
+	}
 
-	if (frame == p_frame)
+	if (frame == p_frame) {
 		return;
+	}
 
 	frame = p_frame;
 	_reset_timeout();
@@ -521,13 +522,12 @@ void AnimatedSprite2D::set_frame(int p_frame) {
 	_change_notify("frame");
 	emit_signal(SceneStringNames::get_singleton()->frame_changed);
 }
-int AnimatedSprite2D::get_frame() const {
 
+int AnimatedSprite2D::get_frame() const {
 	return frame;
 }
 
 void AnimatedSprite2D::set_speed_scale(float p_speed_scale) {
-
 	float elapsed = _get_frame_duration() - timeout;
 
 	speed_scale = MAX(p_speed_scale, 0.0f);
@@ -538,56 +538,49 @@ void AnimatedSprite2D::set_speed_scale(float p_speed_scale) {
 }
 
 float AnimatedSprite2D::get_speed_scale() const {
-
 	return speed_scale;
 }
 
 void AnimatedSprite2D::set_centered(bool p_center) {
-
 	centered = p_center;
 	update();
 	item_rect_changed();
 }
 
 bool AnimatedSprite2D::is_centered() const {
-
 	return centered;
 }
 
 void AnimatedSprite2D::set_offset(const Point2 &p_offset) {
-
 	offset = p_offset;
 	update();
 	item_rect_changed();
 	_change_notify("offset");
 }
-Point2 AnimatedSprite2D::get_offset() const {
 
+Point2 AnimatedSprite2D::get_offset() const {
 	return offset;
 }
 
 void AnimatedSprite2D::set_flip_h(bool p_flip) {
-
 	hflip = p_flip;
 	update();
 }
-bool AnimatedSprite2D::is_flipped_h() const {
 
+bool AnimatedSprite2D::is_flipped_h() const {
 	return hflip;
 }
 
 void AnimatedSprite2D::set_flip_v(bool p_flip) {
-
 	vflip = p_flip;
 	update();
 }
-bool AnimatedSprite2D::is_flipped_v() const {
 
+bool AnimatedSprite2D::is_flipped_v() const {
 	return vflip;
 }
 
 void AnimatedSprite2D::_res_changed() {
-
 	set_frame(frame);
 	_change_notify("frame");
 	_change_notify("animation");
@@ -595,39 +588,36 @@ void AnimatedSprite2D::_res_changed() {
 }
 
 void AnimatedSprite2D::_set_playing(bool p_playing) {
-
-	if (playing == p_playing)
+	if (playing == p_playing) {
 		return;
+	}
 	playing = p_playing;
 	_reset_timeout();
 	set_process_internal(playing);
 }
 
 bool AnimatedSprite2D::_is_playing() const {
-
 	return playing;
 }
 
 void AnimatedSprite2D::play(const StringName &p_animation, const bool p_backwards) {
-
 	backwards = p_backwards;
 
 	if (p_animation) {
 		set_animation(p_animation);
-		if (backwards && get_frame() == 0)
+		if (backwards && get_frame() == 0) {
 			set_frame(frames->get_frame_count(p_animation) - 1);
+		}
 	}
 
 	_set_playing(true);
 }
 
 void AnimatedSprite2D::stop() {
-
 	_set_playing(false);
 }
 
 bool AnimatedSprite2D::is_playing() const {
-
 	return playing;
 }
 
@@ -642,21 +632,21 @@ float AnimatedSprite2D::_get_frame_duration() {
 }
 
 void AnimatedSprite2D::_reset_timeout() {
-
-	if (!playing)
+	if (!playing) {
 		return;
+	}
 
 	timeout = _get_frame_duration();
 	is_over = false;
 }
 
 void AnimatedSprite2D::set_animation(const StringName &p_animation) {
-
-	ERR_FAIL_COND_MSG(frames == NULL, vformat("There is no animation with name '%s'.", p_animation));
+	ERR_FAIL_COND_MSG(frames == nullptr, vformat("There is no animation with name '%s'.", p_animation));
 	ERR_FAIL_COND_MSG(frames->get_animation_names().find(p_animation) == -1, vformat("There is no animation with name '%s'.", p_animation));
 
-	if (animation == p_animation)
+	if (animation == p_animation) {
 		return;
+	}
 
 	animation = p_animation;
 	_reset_timeout();
@@ -664,13 +654,12 @@ void AnimatedSprite2D::set_animation(const StringName &p_animation) {
 	_change_notify();
 	update();
 }
-StringName AnimatedSprite2D::get_animation() const {
 
+StringName AnimatedSprite2D::get_animation() const {
 	return animation;
 }
 
 String AnimatedSprite2D::get_configuration_warning() const {
-
 	if (frames.is_null()) {
 		return TTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite to display frames.");
 	}
@@ -697,7 +686,6 @@ float AnimatedSprite2D::get_shininess() const {
 }
 
 void AnimatedSprite2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_sprite_frames", "sprite_frames"), &AnimatedSprite2D::set_sprite_frames);
 	ClassDB::bind_method(D_METHOD("get_sprite_frames"), &AnimatedSprite2D::get_sprite_frames);
 
@@ -755,7 +743,6 @@ void AnimatedSprite2D::_bind_methods() {
 }
 
 AnimatedSprite2D::AnimatedSprite2D() {
-
 	centered = true;
 	hflip = false;
 	vflip = false;