godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code 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
2021-05-05 12:44:11 +02:00
parent b8d198eeed
commit 140350d767
694 changed files with 23283 additions and 12499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
editor/plugins/collision_polygon_editor_plugin.cpp
View File

@@ -63,8 +63,9 @@ void Polygon3DEditor::_notification(int p_what) {
void Polygon3DEditor::_node_removed(Node *p_node) {
if (p_node == node) {
node = nullptr;
if (imgeom->get_parent() == p_node)
if (imgeom->get_parent() == p_node) {
p_node->remove_child(imgeom);
}
hide();
set_process(false);
}
@@ -101,8 +102,9 @@ void Polygon3DEditor::_wip_close() {
}
bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<InputEvent> &p_event) {
if (!node)
if (!node) {
return false;
}
Transform gt = node->get_global_transform();
Transform gi = gt.affine_inverse();
@@ -119,8 +121,9 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
Vector3 spoint;
if (!p.intersects_ray(ray_from, ray_dir, &spoint))
if (!p.intersects_ray(ray_from, ray_dir, &spoint)) {
return false;
}
spoint = gi.xform(spoint);
@@ -193,8 +196,9 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
};
Vector2 cp = Geometry::get_closest_point_to_segment_2d(gpoint, points);
if (cp.distance_squared_to(points[0]) < CMP_EPSILON2 || cp.distance_squared_to(points[1]) < CMP_EPSILON2)
if (cp.distance_squared_to(points[0]) < CMP_EPSILON2 || cp.distance_squared_to(points[1]) < CMP_EPSILON2) {
continue; //not valid to reuse point
}
real_t d = cp.distance_to(gpoint);
if (d < closest_dist && d < grab_threshold) {
@@ -303,8 +307,9 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
Vector3 spoint;
if (!p.intersects_ray(ray_from, ray_dir, &spoint))
if (!p.intersects_ray(ray_from, ray_dir, &spoint)) {
return false;
}
spoint = gi.xform(spoint);
@@ -329,22 +334,25 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
}
float Polygon3DEditor::_get_depth() {
if (bool(node->call("_has_editable_3d_polygon_no_depth")))
if (bool(node->call("_has_editable_3d_polygon_no_depth"))) {
return 0;
}
return float(node->call("get_depth"));
}
void Polygon3DEditor::_polygon_draw() {
if (!node)
if (!node) {
return;
}
Vector<Vector2> poly;
if (wip_active)
if (wip_active) {
poly = wip;
else
} else {
poly = node->call("get_polygon");
}
float depth = _get_depth() * 0.5;
@@ -357,15 +365,17 @@ void Polygon3DEditor::_polygon_draw() {
for (int i = 0; i < poly.size(); i++) {
Vector2 p, p2;
p = i == edited_point ? edited_point_pos : poly[i];
if ((wip_active && i == poly.size() - 1) || (((i + 1) % poly.size()) == edited_point))
if ((wip_active && i == poly.size() - 1) || (((i + 1) % poly.size()) == edited_point)) {
p2 = edited_point_pos;
else
} else {
p2 = poly[(i + 1) % poly.size()];
}
if (i == 0)
if (i == 0) {
rect.position = p;
else
} else {
rect.expand_to(p);
}
Vector3 point = Vector3(p.x, p.y, depth);
Vector3 next_point = Vector3(p2.x, p2.y, depth);
@@ -432,8 +442,9 @@ void Polygon3DEditor::_polygon_draw() {
m->surface_remove(0);
}
if (poly.size() == 0)
if (poly.size() == 0) {
return;
}
Array a;
a.resize(Mesh::ARRAY_MAX);
@@ -472,8 +483,9 @@ void Polygon3DEditor::edit(Node *p_collision_polygon) {
} else {
node = nullptr;
if (imgeom->get_parent())
if (imgeom->get_parent()) {
imgeom->get_parent()->remove_child(imgeom);
}
set_process(false);
}