[Bf-blender-cvs] [39f60e6909e] master: Geometry Nodes: move some attribute utilities to blenkernel
Jacques Lucke
noreply at git.blender.org
Tue Feb 16 11:55:19 CET 2021
Commit: 39f60e6909e61b8b7982e637a2091a84d618ddd7
Author: Jacques Lucke
Date: Tue Feb 16 11:55:00 2021 +0100
Branches: master
https://developer.blender.org/rB39f60e6909e61b8b7982e637a2091a84d618ddd7
Geometry Nodes: move some attribute utilities to blenkernel
I need to access these utilities from modifier code as well.
Therefore, they should not live in the nodes module.
===================================================================
M source/blender/blenkernel/BKE_attribute_access.hh
M source/blender/blenkernel/intern/attribute_access.cc
M source/blender/nodes/geometry/node_geometry_util.cc
M source/blender/nodes/geometry/node_geometry_util.hh
M source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
M source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
M source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc
M source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
M source/blender/nodes/intern/node_geometry_exec.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_attribute_access.hh b/source/blender/blenkernel/BKE_attribute_access.hh
index 55c8b36669d..653c0f0d85d 100644
--- a/source/blender/blenkernel/BKE_attribute_access.hh
+++ b/source/blender/blenkernel/BKE_attribute_access.hh
@@ -33,6 +33,8 @@ using fn::CPPType;
const CPPType *custom_data_type_to_cpp_type(const CustomDataType type);
CustomDataType cpp_type_to_custom_data_type(const CPPType &type);
+CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType> data_types);
+AttributeDomain attribute_domain_highest_priority(Span<AttributeDomain> domains);
/**
* This class offers an indirection for reading an attribute.
diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc
index 17f8b5ba2b3..f594ec54a7e 100644
--- a/source/blender/blenkernel/intern/attribute_access.cc
+++ b/source/blender/blenkernel/intern/attribute_access.cc
@@ -508,6 +508,96 @@ CustomDataType cpp_type_to_custom_data_type(const blender::fn::CPPType &type)
return static_cast<CustomDataType>(-1);
}
+static int attribute_data_type_complexity(const CustomDataType data_type)
+{
+ switch (data_type) {
+ case CD_PROP_BOOL:
+ return 0;
+ case CD_PROP_INT32:
+ return 1;
+ case CD_PROP_FLOAT:
+ return 2;
+ case CD_PROP_FLOAT2:
+ return 3;
+ case CD_PROP_FLOAT3:
+ return 4;
+ case CD_PROP_COLOR:
+ return 5;
+#if 0 /* These attribute types are not supported yet. */
+ case CD_MLOOPCOL:
+ return 3;
+ case CD_PROP_STRING:
+ return 6;
+#endif
+ default:
+ /* Only accept "generic" custom data types used by the attribute system. */
+ BLI_assert(false);
+ return 0;
+ }
+}
+
+CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType> data_types)
+{
+ int highest_complexity = INT_MIN;
+ CustomDataType most_complex_type = CD_PROP_COLOR;
+
+ for (const CustomDataType data_type : data_types) {
+ const int complexity = attribute_data_type_complexity(data_type);
+ if (complexity > highest_complexity) {
+ highest_complexity = complexity;
+ most_complex_type = data_type;
+ }
+ }
+
+ return most_complex_type;
+}
+
+/**
+ * \note Generally the order should mirror the order of the domains
+ * established in each component's ComponentAttributeProviders.
+ */
+static int attribute_domain_priority(const AttributeDomain domain)
+{
+ switch (domain) {
+#if 0
+ case ATTR_DOMAIN_CURVE:
+ return 0;
+#endif
+ case ATTR_DOMAIN_POLYGON:
+ return 1;
+ case ATTR_DOMAIN_EDGE:
+ return 2;
+ case ATTR_DOMAIN_POINT:
+ return 3;
+ case ATTR_DOMAIN_CORNER:
+ return 4;
+ default:
+ /* Domain not supported in nodes yet. */
+ BLI_assert(false);
+ return 0;
+ }
+}
+
+/**
+ * Domains with a higher "information density" have a higher priority, in order
+ * to choose a domain that will not lose data through domain conversion.
+ */
+AttributeDomain attribute_domain_highest_priority(Span<AttributeDomain> domains)
+{
+ int highest_priority = INT_MIN;
+ AttributeDomain highest_priority_domain = ATTR_DOMAIN_CORNER;
+
+ for (const AttributeDomain domain : domains) {
+ const int priority = attribute_domain_priority(domain);
+ if (priority > highest_priority) {
+ highest_priority = priority;
+ highest_priority_domain = domain;
+ }
+ }
+
+ return highest_priority_domain;
+}
+
/**
* A #BuiltinAttributeProvider is responsible for exactly one attribute on a geometry component.
* The attribute is identified by its name and has a fixed domain and type. Builtin attributes do
diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc
index c0f8fbade49..08de467cd55 100644
--- a/source/blender/nodes/geometry/node_geometry_util.cc
+++ b/source/blender/nodes/geometry/node_geometry_util.cc
@@ -55,7 +55,8 @@ void gather_attribute_info(Map<std::string, AttributeInfo> &attributes,
};
auto modify_info = [&, data_type, domain](AttributeInfo *info) {
info->domain = domain; /* TODO: Use highest priority domain. */
- info->data_type = attribute_data_type_highest_complexity({info->data_type, data_type});
+ info->data_type = bke::attribute_data_type_highest_complexity(
+ {info->data_type, data_type});
};
attributes.add_or_modify(name, add_info, modify_info);
@@ -294,96 +295,6 @@ void update_attribute_input_socket_availabilities(bNode &node,
}
}
-static int attribute_data_type_complexity(const CustomDataType data_type)
-{
- switch (data_type) {
- case CD_PROP_BOOL:
- return 0;
- case CD_PROP_INT32:
- return 1;
- case CD_PROP_FLOAT:
- return 2;
- case CD_PROP_FLOAT2:
- return 3;
- case CD_PROP_FLOAT3:
- return 4;
- case CD_PROP_COLOR:
- return 5;
-#if 0 /* These attribute types are not supported yet. */
- case CD_MLOOPCOL:
- return 3;
- case CD_PROP_STRING:
- return 6;
-#endif
- default:
- /* Only accept "generic" custom data types used by the attribute system. */
- BLI_assert(false);
- return 0;
- }
-}
-
-CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType> data_types)
-{
- int highest_complexity = INT_MIN;
- CustomDataType most_complex_type = CD_PROP_COLOR;
-
- for (const CustomDataType data_type : data_types) {
- const int complexity = attribute_data_type_complexity(data_type);
- if (complexity > highest_complexity) {
- highest_complexity = complexity;
- most_complex_type = data_type;
- }
- }
-
- return most_complex_type;
-}
-
-/**
- * \note Generally the order should mirror the order of the domains
- * established in each component's ComponentAttributeProviders.
- */
-static int attribute_domain_priority(const AttributeDomain domain)
-{
- switch (domain) {
-#if 0
- case ATTR_DOMAIN_CURVE:
- return 0;
-#endif
- case ATTR_DOMAIN_POLYGON:
- return 1;
- case ATTR_DOMAIN_EDGE:
- return 2;
- case ATTR_DOMAIN_POINT:
- return 3;
- case ATTR_DOMAIN_CORNER:
- return 4;
- default:
- /* Domain not supported in nodes yet. */
- BLI_assert(false);
- return 0;
- }
-}
-
-/**
- * Domains with a higher "information density" have a higher priority, in order
- * to choose a domain that will not lose data through domain conversion.
- */
-AttributeDomain attribute_domain_highest_priority(Span<AttributeDomain> domains)
-{
- int highest_priority = INT_MIN;
- AttributeDomain highest_priority_domain = ATTR_DOMAIN_CORNER;
-
- for (const AttributeDomain domain : domains) {
- const int priority = attribute_domain_priority(domain);
- if (priority > highest_priority) {
- highest_priority = priority;
- highest_priority_domain = domain;
- }
- }
-
- return highest_priority_domain;
-}
-
} // namespace blender::nodes
bool geo_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree)
diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh
index 13a58be86f6..687763b4728 100644
--- a/source/blender/nodes/geometry/node_geometry_util.hh
+++ b/source/blender/nodes/geometry/node_geometry_util.hh
@@ -44,9 +44,6 @@ void update_attribute_input_socket_availabilities(bNode &node,
const GeometryNodeAttributeInputMode mode,
const bool name_is_available = true);
-CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType>);
-AttributeDomain attribute_domain_highest_priority(Span<AttributeDomain> domains);
-
Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component,
const AttributeDomain domain);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
index a6cd0dd7779..350935c75d1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
@@ -230,7 +230,7 @@ static CustomDataType get_data_type(GeometryComponent &component,
if (operation_tests_equality(node_storage)) {
/* Convert the input attributes to the same data type for the equality tests. Use the higher
* complexity attribute type, otherwise information necessary to the comparison may be lost. */
- return attribute_data_type_highest_complexity({
+ return bke::attribute_data_type_highest_complexity({
params.get_input_attribute_data_type("A", component, CD_PROP_FLOAT),
params.get_input_attribute_data_type("B", component, CD_PROP_FLOAT),
});
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
index e515f253a46..34503b8525e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
@@ -148,7 +148,7 @@ static void attribute_mix_calc(GeometryComponent &component, const GeoNodeExecPa
/* Use the highest complexity data type among the inputs and outputs, that way the node will
* never "remove information". Use CD_PROP_BOOL as the lowest complexity data type, but in any
* real situation it won't be returned. */
- const CustomDataType result_type = attribute_data_type_highest_complexity({
+ const CustomDataType result_type = bke::attribute_data_type_highest_complexity({
params.get_input_attribute_data_type("A", component, CD_PROP_BOOL),
params.get_input_attribute_data_type("B", component, CD_PROP_BOOL),
params.get_input_attribute_data_type("Result", component, CD_PROP_BOOL),
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc
index 2e02ad9836d..970cf71f8fc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_s
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list