godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Style: Enforce braces around if blocks and loops

Browse Source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde
2020-05-14 16:41:43 +02:00
parent 07bc4e2f96
commit 0ee0fa42e6
683 changed files with 22803 additions and 12225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scene/2d/parallax_background.cpp
View File

@@ -66,8 +66,9 @@ void ParallaxBackground::set_scroll_offset(const Point2 &p_ofs) {
}
void ParallaxBackground::_update_scroll() {
if (!is_inside_tree())
if (!is_inside_tree()) {
return;
}
Vector2 ofs = base_offset + offset * base_scale;
@@ -75,17 +76,19 @@ void ParallaxBackground::_update_scroll() {
ofs = -ofs;
if (limit_begin.x < limit_end.x) {
if (ofs.x < limit_begin.x)
if (ofs.x < limit_begin.x) {
ofs.x = limit_begin.x;
else if (ofs.x + vps.x > limit_end.x)
} else if (ofs.x + vps.x > limit_end.x) {
ofs.x = limit_end.x - vps.x;
}
}
if (limit_begin.y < limit_end.y) {
if (ofs.y < limit_begin.y)
if (ofs.y < limit_begin.y) {
ofs.y = limit_begin.y;
else if (ofs.y + vps.y > limit_end.y)
} else if (ofs.y + vps.y > limit_end.y) {
ofs.y = limit_end.y - vps.y;
}
}
ofs = -ofs;
@@ -93,13 +96,15 @@ void ParallaxBackground::_update_scroll() {
for (int i = 0; i < get_child_count(); i++) {
ParallaxLayer *l = Object::cast_to<ParallaxLayer>(get_child(i));
if (!l)
if (!l) {
continue;
}
if (ignore_camera_zoom)
if (ignore_camera_zoom) {
l->set_base_offset_and_scale(ofs, 1.0, screen_offset);
else
} else {
l->set_base_offset_and_scale(ofs, scale, screen_offset);
}
}
}