blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 756 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 +22 -1
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36a6a02050 - Show all commits

23
source/blender/draw/engines/eevee_next/eevee_irradiance_cache.cc
View File

@ -165,7 +165,28 @@ void IrradianceCache::set_view(View & /*view*/)
grid.grid_index = grids_len;
grids_infos_buf_[grids_len++] = grid;
}
/* TODO: Stable sorting of grids. */
{
/* Stable sorting of grids. */
MutableSpan<IrradianceGridData> grid_span(grids_infos_buf_.data(), grids_len);
std::sort(grid_span.begin(),
grid_span.end(),
[](const IrradianceGridData &a, const IrradianceGridData &b) {
float volume_a = math::determinant(float3x3(a.world_to_grid_transposed));
float volume_b = math::determinant(float3x3(b.world_to_grid_transposed));
if (volume_a != volume_b) {
/* Smallest first. */
return volume_a > volume_b;
}
/* Volumes are identical. Any arbitrary criteria can be used to sort them.
* Use position to avoid unstable result caused by depsgraph non deterministic eval
* order. This could also become a parameter. */
return a.world_to_grid_transposed[0][0] < a.world_to_grid_transposed[0][0] ||
a.world_to_grid_transposed[0][1] < a.world_to_grid_transposed[0][1] ||
a.world_to_grid_transposed[0][2] < a.world_to_grid_transposed[0][2];
});
}
{
/* Insert world grid last. */