blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

EEVEE-Next: Fix Reflection Probes Sampling #113281

Merged
Jeroen Bakker merged 1 commits from Jeroen-Bakker/blender:eevee/fix-reflection-probe-sampling into main 2023-10-05 11:27:39 +02:00
Conversation 0 Commits 1 Files Changed 2 +11 -6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc
View File

@ -13,7 +13,9 @@ namespace blender::eevee {
void ReflectionProbeModule::init()
{
if (probes_.is_empty()) {
if (!is_initialized) {
is_initialized = true;
ReflectionProbeData init_probe_data = {};
init_probe_data.layer = -1;
for (int i : IndexRange(REFLECTION_PROBES_MAX)) {
@ -131,9 +133,13 @@ void ReflectionProbeModule::sync_object(Object *ob, ObjectHandle &ob_handle)
probe.do_render |= is_dirty;
probe.is_probe_used = true;
/* Only update data when rerendering the probes to reduce flickering. */
if (!instance_.do_probe_sync()) {
const bool probe_sync_active = instance_.do_probe_sync();
if (!probe_sync_active && is_dirty) {
update_probes_next_sample_ = true;
}
/* Only update data when rerendering the probes to reduce flickering. */
if (!probe_sync_active) {
return;
}
@ -514,9 +520,7 @@ std::optional<ReflectionProbeUpdateInfo> ReflectionProbeModule::update_info_pop(
}
/* Check reset probe updating as we completed rendering all Probes. */
if (probe_type == ReflectionProbe::Type::Probe && update_probes_this_sample_ &&
update_probes_next_sample_)
{
if (probe_type == ReflectionProbe::Type::Probe && update_probes_this_sample_) {
update_probes_next_sample_ = false;
}

1
source/blender/draw/engines/eevee_next/eevee_reflection_probes.hh
View File

@ -95,6 +95,7 @@ class ReflectionProbeModule {
static constexpr uint64_t world_object_key_ = 0;
bool is_initialized = false;
Instance &instance_;
ReflectionProbeDataBuf data_buf_;
Map<uint64_t, ReflectionProbe> probes_;