Files
test2/source/blender/nodes/NOD_geometry_nodes_bundle.hh
Jacques Lucke f50699d80a Refactor: Geometry Nodes: use a single string identifier for closure/bundle items
Previously, we used `SocketInterfaceKey` as identifier for bundle and closure
items. It contained multiple identifiers (although only one was ever used so
far). The idea was that multiple identifiers could provide more flexibility.
E.g. an Evaluate Closure node could work with closures with slightly different
identifier names, or a bundle could be passed into different systems that expect
the same data but named differently.

The added complexity by allowing for this is greater than I anticipated even
though most places didn't even support multiple identifiers yet. In addition to
that, it seems like there may be simpler workaround for many situations where
multiple identifiers were supposed to help. E.g. one could just add the same
value to a bundle twice with different names or one can build a node group that
maps a bundle for one system to one for another system.

Overall, the complexity of `SocketInterfaceKey` didn't seem worth it, and we can
probably just build a better system when we don't allow multiple identifiers per
item.

Pull Request: https://projects.blender.org/blender/blender/pulls/142947
2025-07-23 21:26:51 +02:00

232 lines
7.0 KiB
C++

/* SPDX-FileCopyrightText: 2025 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "BKE_node.hh"
#include "BKE_node_socket_value.hh"
#include "NOD_geometry_nodes_bundle_fwd.hh"
#include "NOD_geometry_nodes_values.hh"
#include "DNA_node_types.h"
namespace blender::nodes {
/**
* A bundle is a map containing keys and their corresponding values. Values are stored as the type
* they have in Geometry Nodes (#bNodeSocketType::geometry_nodes_cpp_type).
*
* The API also supports working with paths in nested bundles like `root/child/data`.
*/
class Bundle : public ImplicitSharingMixin {
public:
struct StoredItem {
std::string key;
const bke::bNodeSocketType *type;
void *value;
};
private:
Vector<StoredItem> items_;
Vector<void *> buffers_;
public:
struct Item {
const bke::bNodeSocketType *type;
const void *value;
/**
* Attempts to cast the stored value to the given type. This may do implicit conversions.
*/
template<typename T> std::optional<T> as(const bke::bNodeSocketType &socket_type) const;
template<typename T> std::optional<T> as() const;
};
Bundle();
Bundle(const Bundle &other);
Bundle(Bundle &&other) noexcept;
Bundle &operator=(const Bundle &other);
Bundle &operator=(Bundle &&other) noexcept;
~Bundle();
static BundlePtr create();
bool add(StringRef key, const bke::bNodeSocketType &type, const void *value);
void add_new(StringRef key, const bke::bNodeSocketType &type, const void *value);
void add_override(StringRef key, const bke::bNodeSocketType &type, const void *value);
bool add_path(StringRef path, const bke::bNodeSocketType &type, const void *value);
void add_path_new(StringRef path, const bke::bNodeSocketType &type, const void *value);
void add_path_override(StringRef path, const bke::bNodeSocketType &type, const void *value);
template<typename T> void add(StringRef key, T value);
template<typename T> void add_override(StringRef key, T value);
template<typename T> void add_path(StringRef path, T value);
template<typename T> void add_path_override(StringRef path, T value);
bool remove(StringRef key);
bool contains(StringRef key) const;
bool contains_path(StringRef path) const;
std::optional<Item> lookup(StringRef key) const;
std::optional<Item> lookup_path(Span<StringRef> path) const;
std::optional<Item> lookup_path(StringRef path) const;
template<typename T> std::optional<T> lookup(StringRef key) const;
template<typename T> std::optional<T> lookup_path(StringRef path) const;
bool is_empty() const;
int64_t size() const;
Span<StoredItem> items() const;
BundlePtr copy() const;
void delete_self() override;
};
template<typename T>
inline std::optional<T> Bundle::Item::as(const bke::bNodeSocketType &socket_type) const
{
if (!this->value || !this->type) {
return std::nullopt;
}
const void *converted_value = this->value;
BUFFER_FOR_CPP_TYPE_VALUE(*socket_type.geometry_nodes_cpp_type, buffer);
if (this->type != &socket_type) {
if (!implicitly_convert_socket_value(*this->type, this->value, socket_type, buffer)) {
return std::nullopt;
}
converted_value = buffer;
}
if constexpr (geo_nodes_type_stored_as_SocketValueVariant_v<T>) {
const auto &value_variant = *static_cast<const bke::SocketValueVariant *>(converted_value);
return value_variant.get<T>();
}
return *static_cast<const T *>(converted_value);
}
template<typename T> constexpr bool is_valid_static_bundle_item_type()
{
if (geo_nodes_is_field_base_type_v<T>) {
return true;
}
if constexpr (fn::is_field_v<T>) {
return geo_nodes_is_field_base_type_v<typename T::base_type>;
}
if constexpr (is_same_any_v<T, BundlePtr, ClosurePtr>) {
return true;
}
return !geo_nodes_type_stored_as_SocketValueVariant_v<T>;
}
template<typename T> inline const bke::bNodeSocketType *socket_type_info_by_static_type()
{
if constexpr (fn::is_field_v<T>) {
if constexpr (geo_nodes_is_field_base_type_v<typename T::base_type>) {
const std::optional<eNodeSocketDatatype> socket_type =
bke::geo_nodes_base_cpp_type_to_socket_type(CPPType::get<typename T::base_type>());
BLI_assert(socket_type);
const bke::bNodeSocketType *socket_type_info = bke::node_socket_type_find_static(
*socket_type);
BLI_assert(socket_type_info);
return socket_type_info;
}
}
const std::optional<eNodeSocketDatatype> socket_type =
bke::geo_nodes_base_cpp_type_to_socket_type(CPPType::get<T>());
if (!socket_type) {
return nullptr;
}
return bke::node_socket_type_find_static(*socket_type);
}
template<typename T> inline std::optional<T> Bundle::Item::as() const
{
static_assert(is_valid_static_bundle_item_type<T>());
if (const bke::bNodeSocketType *socket_type = socket_type_info_by_static_type<T>()) {
return this->as<T>(*socket_type);
}
/* Can't lookup this type directly currently. */
BLI_assert_unreachable();
return std::nullopt;
}
template<typename T> inline std::optional<T> Bundle::lookup(const StringRef key) const
{
const std::optional<Item> item = this->lookup(key);
if (!item) {
return std::nullopt;
}
return item->as<T>();
}
template<typename T> inline std::optional<T> Bundle::lookup_path(const StringRef path) const
{
const std::optional<Item> item = this->lookup_path(path);
if (!item) {
return std::nullopt;
}
return item->as<T>();
}
template<typename T, typename Fn> inline void to_stored_type(T &&value, Fn &&fn)
{
using DecayT = std::decay_t<T>;
static_assert(is_valid_static_bundle_item_type<DecayT>());
const bke::bNodeSocketType *socket_type = socket_type_info_by_static_type<DecayT>();
BLI_assert(socket_type);
if constexpr (geo_nodes_type_stored_as_SocketValueVariant_v<DecayT>) {
auto value_variant = bke::SocketValueVariant::From(std::forward<T>(value));
fn(*socket_type, &value_variant);
}
else {
fn(*socket_type, &value);
}
}
template<typename T> inline void Bundle::add(const StringRef key, T value)
{
to_stored_type(value, [&](const bke::bNodeSocketType &type, const void *value) {
this->add(key, type, value);
});
}
template<typename T> inline void Bundle::add_path(const StringRef path, T value)
{
to_stored_type(value, [&](const bke::bNodeSocketType &type, const void *value) {
this->add_path(path, type, value);
});
}
template<typename T> inline void Bundle::add_override(const StringRef key, T value)
{
to_stored_type(value, [&](const bke::bNodeSocketType &type, const void *value) {
this->add_override(key, type, value);
});
}
template<typename T> inline void Bundle::add_path_override(const StringRef path, T value)
{
to_stored_type(value, [&](const bke::bNodeSocketType &type, const void *value) {
this->add_path_override(path, type, value);
});
}
inline Span<Bundle::StoredItem> Bundle::items() const
{
return items_;
}
inline bool Bundle::is_empty() const
{
return items_.is_empty();
}
inline int64_t Bundle::size() const
{
return items_.size();
}
} // namespace blender::nodes