archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Nodes: provide access to type specific data through node tree ref

Browse Source
This commit is contained in:
Jacques Lucke
2021-03-19 20:35:48 +01:00
parent b96acd0663
commit 48731f45c2
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -586,12 +586,12 @@ class GeometryNodesEvaluator {
void *buffer = allocator_.allocate(type.size(), type.alignment());
if (bsocket->type == SOCK_OBJECT) {
Object *object = ((bNodeSocketValueObject *)bsocket->default_value)->value;
Object *object = socket->default_value<bNodeSocketValueObject>()->value;
PersistentObjectHandle object_handle = handle_map_.lookup(object);
new (buffer) PersistentObjectHandle(object_handle);
}
else if (bsocket->type == SOCK_COLLECTION) {
Collection *collection = ((bNodeSocketValueCollection *)bsocket->default_value)->value;
Collection *collection = socket->default_value<bNodeSocketValueCollection>()->value;
PersistentCollectionHandle collection_handle = handle_map_.lookup(collection);
new (buffer) PersistentCollectionHandle(collection_handle);
}

26
source/blender/nodes/NOD_node_tree_ref.hh
View File

@@ -116,6 +116,9 @@ class SocketRef : NonCopyable, NonMovable {
bNodeTree *btree() const;
bool is_available() const;
void *default_value() const;
template<typename T> T *default_value() const;
};
class InputSocketRef final : public SocketRef {
@@ -169,6 +172,9 @@ class NodeRef : NonCopyable, NonMovable {
bool is_group_input_node() const;
bool is_group_output_node() const;
bool is_muted() const;
void *storage() const;
template<typename T> T *storage() const;
};
class LinkRef : NonCopyable, NonMovable {
@@ -379,6 +385,16 @@ inline bool SocketRef::is_available() const
return (bsocket_->flag & SOCK_UNAVAIL) == 0;
}
inline void *SocketRef::default_value() const
{
return bsocket_->default_value;
}
template<typename T> inline T *SocketRef::default_value() const
{
return (T *)bsocket_->default_value;
}
/* --------------------------------------------------------------------
* InputSocketRef inline methods.
*/
@@ -507,6 +523,16 @@ inline bool NodeRef::is_muted() const
return (bnode_->flag & NODE_MUTED) != 0;
}
inline void *NodeRef::storage() const
{
return bnode_->storage;
}
template<typename T> inline T *NodeRef::storage() const
{
return (T *)bnode_->storage;
}
/* --------------------------------------------------------------------
* LinkRef inline methods.
*/