Jacques Lucke
1e69a25043
Previously, built-in nodes had to implement "socket templates" (`bNodeSocketTemplate`) to tell Blender which sockets they have. It was nice that this was declarative, but this approach was way too rigid and was cumbersome to use in many cases. This commit starts to move us away from this rigid structure by letting nodes implement a function that declares the sockets the node has. Right now this is used as a direct replacement of the "socket template" approach to keep the refactor smaller. It's just a bit easier to read and write. In the future we want to support more complex features like dynamic numbers of sockets and type inferencing. Those features will be easier to build on this new approach. This new approach can live side by side with `bNodeSocketTemplate` for a while. That makes it easier to update nodes one by one. Note: In `bNodeSocketTemplate` socket identifiers were made unique automatically. In this new approach, one has to specify unique identifiers manually (unless the name is unique already). Differential Revision: https://developer.blender.org/D12335
66 lines
2.0 KiB
C++
66 lines
2.0 KiB
C++
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#include "NOD_node_declaration.hh"
|
|
|
|
namespace blender::nodes {
|
|
|
|
void NodeDeclaration::build(bNodeTree &ntree, bNode &node) const
|
|
{
|
|
for (const SocketDeclarationPtr &decl : inputs_) {
|
|
decl->build(ntree, node, SOCK_IN);
|
|
}
|
|
for (const SocketDeclarationPtr &decl : outputs_) {
|
|
decl->build(ntree, node, SOCK_OUT);
|
|
}
|
|
}
|
|
|
|
bool NodeDeclaration::matches(const bNode &node) const
|
|
{
|
|
auto check_sockets = [&](ListBase sockets, Span<SocketDeclarationPtr> socket_decls) {
|
|
const int tot_sockets = BLI_listbase_count(&sockets);
|
|
if (tot_sockets != socket_decls.size()) {
|
|
return false;
|
|
}
|
|
int i;
|
|
LISTBASE_FOREACH_INDEX (const bNodeSocket *, socket, &sockets, i) {
|
|
const SocketDeclaration &socket_decl = *socket_decls[i];
|
|
if (!socket_decl.matches(*socket)) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
};
|
|
|
|
if (!check_sockets(node.inputs, inputs_)) {
|
|
return false;
|
|
}
|
|
if (!check_sockets(node.outputs, outputs_)) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bNodeSocket &SocketDeclaration::update_or_build(bNodeTree &ntree,
|
|
bNode &node,
|
|
bNodeSocket &socket) const
|
|
{
|
|
/* By default just rebuild. */
|
|
return this->build(ntree, node, (eNodeSocketInOut)socket.in_out);
|
|
}
|
|
|
|
} // namespace blender::nodes
|