blender
/
blender
135
420
Fork 604
Code Issues 6.4k Pull Requests 758 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 +49 -5
8 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 033a78b93b - Show all commits

9
source/blender/blenkernel/BKE_geometry_fields.hh
View File

@ -171,8 +171,8 @@ class GeometryFieldInput : public fn::FieldInput {
virtual volume::GGrid get_volume_grid_for_context(const fn::FieldContext &context,
const volume::GGrid &mask,
ResourceScope &scope) const override;
virtual volume::GGrid get_volume_grid_for_context(const GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const = 0;
virtual volume::GGrid get_volume_grid_for_context(const GeometryFieldContext &context,
const volume::GGrid &mask) const = 0;
virtual std::optional<eAttrDomain> preferred_domain(const GeometryComponent &component) const;
};
@ -334,6 +334,11 @@ class IDAttributeFieldInput : public GeometryFieldInput {
GVArray get_varray_for_context(const GeometryFieldContext &context,
const IndexMask &mask) const override;
volume::GGrid get_volume_grid_for_context(const GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const override
{
return {};
}
std::string socket_inspection_name() const override;

9
source/blender/functions/FN_field.hh
View File

@ -178,8 +178,7 @@ class GFieldRef : public GFieldBase<const FieldNode *> {
namespace detail {
/* Utility class to make #is_field_v work. */
struct TypedFieldBase {
};
struct TypedFieldBase {};
} // namespace detail
/**
@ -700,6 +699,12 @@ class IndexFieldInput final : public FieldInput {
GVArray get_varray_for_context(const FieldContext &context,
const IndexMask &mask,
ResourceScope &scope) const final;
volume::GGrid get_volume_grid_for_context(const FieldContext & /*context*/,
const volume::GGrid & /*mask*/,
ResourceScope & /*scope*/) const final
{
return {};
}
uint64_t hash() const override;
bool is_equal_to(const fn::FieldNode &other) const override;

5
source/blender/nodes/geometry/node_geometry_util.hh
View File

@ -134,6 +134,11 @@ class EvaluateAtIndexInput final : public bke::GeometryFieldInput {
GVArray get_varray_for_context(const bke::GeometryFieldContext &context,
const IndexMask &mask) const final;
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
return {};
}
std::optional<eAttrDomain> preferred_domain(const GeometryComponent & /*component*/) const final
{

2
source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc
View File

@ -284,7 +284,7 @@ class AccumulateFieldInput final : public bke::GeometryFieldInput {
return attributes.adapt_domain(std::move(g_output), source_domain_, context.domain());
}
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext &context,
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
/* XXX Grids don't have a simple axis over which to accumulate. */

6
source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc
View File

@ -120,6 +120,12 @@ class EvaluateOnDomainInput final : public bke::GeometryFieldInput {
GVArray::ForGArray(std::move(values)), src_domain_, context.domain());
}
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
return {};
}
void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
src_field_.node().for_each_field_input_recursive(fn);

12
source/blender/nodes/geometry/nodes/node_geo_index_of_nearest.cc
View File

@ -132,6 +132,12 @@ class IndexOfNearestFieldInput final : public bke::GeometryFieldInput {
return VArray<int>::ForContainer(std::move(result));
}
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
return {};
}
public:
void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
{
@ -201,6 +207,12 @@ class HasNeighborFieldInput final : public bke::GeometryFieldInput {
return VArray<bool>::ForContainer(std::move(result));
}
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
return {};
}
public:
void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
{

6
source/blender/nodes/geometry/nodes/node_geo_material_selection.cc
View File

@ -84,6 +84,12 @@ class MaterialSelectionFieldInput final : public bke::GeometryFieldInput {
return mesh->attributes().adapt_domain<bool>(std::move(selection), ATTR_DOMAIN_FACE, domain);
}
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
return {};
}
uint64_t hash() const override
{
return get_default_hash(material_);

5
source/blender/nodes/geometry/nodes/node_geo_tool_selection.cc
View File

@ -46,6 +46,11 @@ class ToolSelectionFieldInput final : public bke::GeometryFieldInput {
return {};
}
}
volume::GGrid get_volume_grid_for_context(const bke::GeometryFieldContext & /*context*/,
const volume::GGrid & /*mask*/) const final
{
return {};
}
};
static void node_geo_exec(GeoNodeExecParams params)