diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-12 12:36:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 12:36:43 +0200 |
| commit | edda6ee9f82ec94f993ebf44486ab7d8abcef193 (patch) | |
| tree | 691c51ea7516990b94303afa334d70c66c512cc4 /modules/raycast/raycast_occlusion_cull.cpp | |
| parent | 9b7e16a6b8b80fe61881e8f4df28550e18050dd2 (diff) | |
| parent | 8b7c7f5a753b43cec10f72b274bb1d70c253652b (diff) | |
Merge pull request #60881 from reduz/new-hash-map
Diffstat (limited to 'modules/raycast/raycast_occlusion_cull.cpp')
| -rw-r--r-- | modules/raycast/raycast_occlusion_cull.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/modules/raycast/raycast_occlusion_cull.cpp b/modules/raycast/raycast_occlusion_cull.cpp index 1550f0ef8b..f49cd08698 100644 --- a/modules/raycast/raycast_occlusion_cull.cpp +++ b/modules/raycast/raycast_occlusion_cull.cpp @@ -454,10 +454,9 @@ bool RaycastOcclusionCull::Scenario::update(ThreadWorkPool &p_thread_pool) { next_scene = rtcNewScene(raycast_singleton->ebr_device); rtcSetSceneBuildQuality(next_scene, RTCBuildQuality(raycast_singleton->build_quality)); - const RID *inst_rid = nullptr; - while ((inst_rid = instances.next(inst_rid))) { - OccluderInstance *occ_inst = instances.getptr(*inst_rid); - Occluder *occ = raycast_singleton->occluder_owner.get_or_null(occ_inst->occluder); + for (const KeyValue<RID, OccluderInstance> &E : instances) { + const OccluderInstance *occ_inst = &E.value; + const Occluder *occ = raycast_singleton->occluder_owner.get_or_null(occ_inst->occluder); if (!occ || !occ_inst->enabled) { continue; @@ -573,9 +572,8 @@ void RaycastOcclusionCull::set_build_quality(RS::ViewportOcclusionCullingBuildQu build_quality = p_quality; - const RID *scenario_rid = nullptr; - while ((scenario_rid = scenarios.next(scenario_rid))) { - scenarios[*scenario_rid].dirty = true; + for (KeyValue<RID, Scenario> &K : scenarios) { + K.value.dirty = true; } } @@ -596,9 +594,8 @@ RaycastOcclusionCull::RaycastOcclusionCull() { } RaycastOcclusionCull::~RaycastOcclusionCull() { - const RID *scenario_rid = nullptr; - while ((scenario_rid = scenarios.next(scenario_rid))) { - Scenario &scenario = scenarios[*scenario_rid]; + for (KeyValue<RID, Scenario> &K : scenarios) { + Scenario &scenario = K.value; if (scenario.commit_thread) { scenario.commit_thread->wait_to_finish(); memdelete(scenario.commit_thread); |