diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 16:41:43 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 21:57:34 +0200 |
commit | 0ee0fa42e6639b6fa474b7cf6afc6b1a78142185 (patch) | |
tree | 198d4ff7665d89307f6ca2469fa38620a9eb1672 /scene/resources/world_3d.cpp | |
parent | 07bc4e2f96f8f47991339654ff4ab16acc19d44f (diff) | |
download | redot-engine-0ee0fa42e6639b6fa474b7cf6afc6b1a78142185.tar.gz |
Style: Enforce braces around if blocks and loops
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
Diffstat (limited to 'scene/resources/world_3d.cpp')
-rw-r--r-- | scene/resources/world_3d.cpp | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/scene/resources/world_3d.cpp b/scene/resources/world_3d.cpp index f53a24596a..8100f150ef 100644 --- a/scene/resources/world_3d.cpp +++ b/scene/resources/world_3d.cpp @@ -71,8 +71,9 @@ struct SpatialIndexer { void _notifier_update(VisibilityNotifier3D *p_notifier, const AABB &p_rect) { Map<VisibilityNotifier3D *, NotifierData>::Element *E = notifiers.find(p_notifier); ERR_FAIL_COND(!E); - if (E->get().aabb == p_rect) + if (E->get().aabb == p_rect) { return; + } E->get().aabb = p_rect; octree.move(E->get().id, E->get().aabb); @@ -133,12 +134,14 @@ struct SpatialIndexer { } void _update(uint64_t p_frame) { - if (p_frame == last_frame) + if (p_frame == last_frame) { return; + } last_frame = p_frame; - if (!changed) + if (!changed) { return; + } for (Map<Camera3D *, CameraData>::Element *E = cameras.front(); E; E = E->next()) { pass++; @@ -167,8 +170,9 @@ struct SpatialIndexer { } for (Map<VisibilityNotifier3D *, uint64_t>::Element *F = E->get().notifiers.front(); F; F = F->next()) { - if (F->get() != pass) + if (F->get() != pass) { removed.push_back(F->key()); + } } while (!added.empty()) { @@ -249,10 +253,11 @@ void World3D::set_environment(const Ref<Environment> &p_environment) { } environment = p_environment; - if (environment.is_valid()) + if (environment.is_valid()) { RS::get_singleton()->scenario_set_environment(scenario, environment->get_rid()); - else + } else { RS::get_singleton()->scenario_set_environment(scenario, RID()); + } emit_changed(); } @@ -267,10 +272,11 @@ void World3D::set_fallback_environment(const Ref<Environment> &p_environment) { } fallback_environment = p_environment; - if (fallback_environment.is_valid()) + if (fallback_environment.is_valid()) { RS::get_singleton()->scenario_set_fallback_environment(scenario, p_environment->get_rid()); - else + } else { RS::get_singleton()->scenario_set_fallback_environment(scenario, RID()); + } emit_changed(); } @@ -281,10 +287,11 @@ Ref<Environment> World3D::get_fallback_environment() const { void World3D::set_camera_effects(const Ref<CameraEffects> &p_camera_effects) { camera_effects = p_camera_effects; - if (camera_effects.is_valid()) + if (camera_effects.is_valid()) { RS::get_singleton()->scenario_set_camera_effects(scenario, camera_effects->get_rid()); - else + } else { RS::get_singleton()->scenario_set_camera_effects(scenario, RID()); + } } Ref<CameraEffects> World3D::get_camera_effects() const { |