blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Geometry Nodes: Input data type utility function 

This commit adds a simple utility function for getting the data type of an
attribute or its "constant" socket counterparts. No functional changes.

Differential Revision: https://developer.blender.org/D9819
This commit is contained in:
Hans Goudey 2020-12-14 11:43:46 -06:00
parent 010f44b855
commit 49ec3cef69
2 changed files with 62 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/nodes/NOD_geometry_exec.hh
View File

@ -168,10 +168,21 @@ class GeoNodeExecParams {
return this->get_input_attribute(name, component, domain, type, &default_value);
}
/**
* Get the type of an input property or the associated constant socket types with the
* same names. Fall back to the default value if no attribute exists with the name.
*/
CustomDataType get_input_attribute_data_type(const StringRef name,
const GeometryComponent &component,
const CustomDataType default_type) const;
private:
/* Utilities for detecting common errors at when using this class. */
void check_extract_input(StringRef identifier, const CPPType *requested_type = nullptr) const;
void check_set_output(StringRef identifier, const CPPType &value_type) const;
/* Find the active socket socket with the input name (not the identifier). */
const bNodeSocket *find_available_socket(const StringRef name) const;
};
} // namespace blender::nodes

61
source/blender/nodes/intern/node_geometry_exec.cc
View File

@ -19,23 +19,31 @@
namespace blender::nodes {
const bNodeSocket *GeoNodeExecParams::find_available_socket(const StringRef name) const
{
LISTBASE_FOREACH (const bNodeSocket *, socket, &node_.inputs) {
if ((socket->flag & SOCK_UNAVAIL) != 0) {
continue;
}
if (name == socket->name) {
return socket;
}
}
return nullptr;
}
ReadAttributePtr GeoNodeExecParams::get_input_attribute(const StringRef name,
const GeometryComponent &component,
const AttributeDomain domain,
const CustomDataType type,
const void *default_value) const
{
const bNodeSocket *found_socket = nullptr;
LISTBASE_FOREACH (const bNodeSocket *, socket, &node_.inputs) {
if ((socket->flag & SOCK_UNAVAIL) != 0) {
continue;
}
if (name == socket->name) {
found_socket = socket;
break;
}
const bNodeSocket *found_socket = this->find_available_socket(name);
BLI_assert(found_socket != nullptr); /* There should always be available socket for the name. */
if (found_socket == nullptr) {
return component.attribute_get_constant_for_read(domain, type, default_value);
}
BLI_assert(found_socket != nullptr);
if (found_socket->type == SOCK_STRING) {
const std::string name = this->get_input<std::string>(found_socket->identifier);
@ -60,6 +68,39 @@ ReadAttributePtr GeoNodeExecParams::get_input_attribute(const StringRef name,
return component.attribute_get_constant_for_read(domain, type, default_value);
}
CustomDataType GeoNodeExecParams::get_input_attribute_data_type(
const StringRef name,
const GeometryComponent &component,
const CustomDataType default_type) const
{
const bNodeSocket *found_socket = this->find_available_socket(name);
BLI_assert(found_socket != nullptr); /* There should always be available socket for the name. */
if (found_socket == nullptr) {
return default_type;
}
if (found_socket->type == SOCK_STRING) {
const std::string name = this->get_input<std::string>(found_socket->identifier);
ReadAttributePtr attribute = component.attribute_try_get_for_read(name);
if (!attribute) {
return default_type;
}
return attribute->custom_data_type();
}
if (found_socket->type == SOCK_FLOAT) {
return CD_PROP_FLOAT;
}
if (found_socket->type == SOCK_VECTOR) {
return CD_PROP_FLOAT3;
}
if (found_socket->type == SOCK_RGBA) {
return CD_PROP_COLOR;
}
BLI_assert(false);
return default_type;
}
void GeoNodeExecParams::check_extract_input(StringRef identifier,
const CPPType *requested_type) const
{