blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

WIP: eevee-next-world-irradiance #108304

Closed
Jeroen Bakker wants to merge 79 commits from Jeroen-Bakker:eevee-next-world-irradiance into main
pull from: Jeroen-Bakker:eevee-next-world-irradiance
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 79 Files Changed 22 +19 -4
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 502d9db82c - Show all commits

5
source/blender/draw/engines/eevee_next/eevee_instance.cc
View File

@ -455,6 +455,7 @@ void Instance::update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view
void Instance::light_bake_irradiance(Object &probe,
std::function<void()> context_enable,
std::function<void()> context_disable,
std::function<bool()> stop,
std::function<void(LightProbeGridCacheFrame *)> result_update)
{
BLI_assert(is_baking());
@ -509,6 +510,10 @@ void Instance::light_bake_irradiance(Object &probe,
}
result_update(cache_frame);
});
if (stop()) {
return;
}
}
}
}

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

@ -149,6 +149,7 @@ class Instance {
void light_bake_irradiance(Object &probe,
std::function<void()> context_enable,
std::function<void()> context_disable,
std::function<bool()> stop,
std::function<void(LightProbeGridCacheFrame *)> result_update);
static void update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view_layer);

17
source/blender/draw/engines/eevee_next/eevee_lightcache.cc
View File

@ -138,8 +138,6 @@ class LightBake {
*/
void run(bool *stop = nullptr, bool *do_update = nullptr, float *progress = nullptr)
{
UNUSED_VARS(stop, do_update, progress);
DEG_graph_relations_update(depsgraph_);
DEG_evaluate_on_framechange(depsgraph_, frame_);
@ -160,6 +158,7 @@ class LightBake {
*eval_ob,
[this]() { context_enable(); },
[this]() { context_disable(); },
[&]() { return (G.is_break == true) || ((stop != nullptr) ? *stop : false); },
[&](LightProbeGridCacheFrame *cache_frame) {
{
std::scoped_lock lock(result_mutex_);
@ -169,9 +168,19 @@ class LightBake {
}
bake_result_[i] = cache_frame;
}
*do_update = true;
/* TODO: Update progress. */
if (do_update) {
*do_update = true;
}
if (progress) {
/* TODO: Update progress. */
}
});
if ((G.is_break == true) || ((stop != nullptr && *stop == true))) {
break;
}
}
delete_resources();