blender
/
blender
137
418
Fork 600
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

WIP: Volume grid attribute support in geometry nodes #110044

Closed
Lukas Tönne wants to merge 130 commits from LukasTonne/blender:geometry-nodes-flip into main
pull from: LukasTonne/blender:geometry-nodes-flip
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 130 Files Changed 80 +6 -11
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 61c89fadcb - Show all commits

17
source/blender/blenkernel/BKE_volume_attribute.hh
View File

@ -371,23 +371,18 @@ class VArrayImpl_For_VolumeGridValue final
void set_all(Span<AttributeType> src) override
{
LeafManager leaf_mgr(*grid_.treePtr());
/* Offset indices for leaf node buffers. */
Array<size_t> prefix_sum(leaf_mgr.activeLeafVoxelCount());
size_t *prefix_sum_data = prefix_sum.data();
size_t prefix_sum_size = prefix_sum.size();
leaf_mgr.getPrefixSum(prefix_sum_data, prefix_sum_size);
const LeafRange leaf_range = leaf_mgr.leafRange();
tbb::parallel_for(leaf_range, [&](const LeafRange &range) {
tbb::parallel_for(leaf_manager_.leafRange(), [&](const LeafRange &range) {
for (auto leaf_iter = range.begin(); leaf_iter; ++leaf_iter) {
const size_t leaf_index = leaf_iter.pos();
const IndexRange leaf_buffer_range(prefix_sum[leaf_index], leaf_iter->onVoxelCount());
const IndexRange leaf_buffer_range(prefix_sum_[leaf_index], leaf_iter->onVoxelCount());
// std::cout << "Leaf range: " << leaf_buffer_range.start() << " + "
// << leaf_buffer_range.size() << std::endl;
auto iter = leaf_iter->beginValueOn();
for (const int src_i : leaf_buffer_range) {
iter.setValue(Converter::to_grid(src[src_i]));
// std::cout << " set [" << src_i << "] = " << Converter::to_grid(src[src_i]) <<
// std::endl;
}
}
});