From 4990e4dd01f2b085f5d1842dfa31d79e4df92fbd Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 7 Jul 2020 18:23:33 +0200 Subject: Nodes: Generate multi-function network from node tree This adds new callbacks to `bNodeSocketType` and `bNodeType`. Those are used to generate a multi-function network from a node tree. Later, this network is evaluated on e.g. particle data. Reviewers: brecht Differential Revision: https://developer.blender.org/D8169 --- source/blender/nodes/shader/node_shader_util.h | 6 + .../nodes/shader/nodes/node_shader_sepcombXYZ.c | 88 ------------ .../nodes/shader/nodes/node_shader_sepcombXYZ.cc | 159 +++++++++++++++++++++ 3 files changed, 165 insertions(+), 88 deletions(-) delete mode 100644 source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c create mode 100644 source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc (limited to 'source/blender/nodes/shader') diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index fbb9979cdfa..fc262544b4f 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -70,6 +70,12 @@ #include "GPU_uniformbuffer.h" #ifdef __cplusplus +# include "FN_multi_function_builder.hh" + +# include "BKE_node_tree_multi_function.hh" + +# include "BLI_float3.hh" + extern "C" { #endif diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c b/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c deleted file mode 100644 index 429b1a3e818..00000000000 --- a/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * 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. - * - * The Original Code is Copyright (C) 2014 Blender Foundation. - * All rights reserved. - */ - -/** \file - * \ingroup shdnodes - */ - -#include "node_shader_util.h" - -/* **************** SEPARATE XYZ ******************** */ -static bNodeSocketTemplate sh_node_sepxyz_in[] = { - {SOCK_VECTOR, N_("Vector"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f}, - {-1, ""}, -}; -static bNodeSocketTemplate sh_node_sepxyz_out[] = { - {SOCK_FLOAT, N_("X")}, - {SOCK_FLOAT, N_("Y")}, - {SOCK_FLOAT, N_("Z")}, - {-1, ""}, -}; - -static int gpu_shader_sepxyz(GPUMaterial *mat, - bNode *node, - bNodeExecData *UNUSED(execdata), - GPUNodeStack *in, - GPUNodeStack *out) -{ - return GPU_stack_link(mat, node, "separate_xyz", in, out); -} - -void register_node_type_sh_sepxyz(void) -{ - static bNodeType ntype; - - sh_fn_node_type_base(&ntype, SH_NODE_SEPXYZ, "Separate XYZ", NODE_CLASS_CONVERTOR, 0); - node_type_socket_templates(&ntype, sh_node_sepxyz_in, sh_node_sepxyz_out); - node_type_gpu(&ntype, gpu_shader_sepxyz); - - nodeRegisterType(&ntype); -} - -/* **************** COMBINE XYZ ******************** */ -static bNodeSocketTemplate sh_node_combxyz_in[] = { - {SOCK_FLOAT, N_("X"), 0.0f, 0.0f, 0.0f, 1.0f, -10000.0f, 10000.0f}, - {SOCK_FLOAT, N_("Y"), 0.0f, 0.0f, 0.0f, 1.0f, -10000.0f, 10000.0f}, - {SOCK_FLOAT, N_("Z"), 0.0f, 0.0f, 0.0f, 1.0f, -10000.0f, 10000.0f}, - {-1, ""}, -}; -static bNodeSocketTemplate sh_node_combxyz_out[] = { - {SOCK_VECTOR, N_("Vector")}, - {-1, ""}, -}; - -static int gpu_shader_combxyz(GPUMaterial *mat, - bNode *node, - bNodeExecData *UNUSED(execdata), - GPUNodeStack *in, - GPUNodeStack *out) -{ - return GPU_stack_link(mat, node, "combine_xyz", in, out); -} - -void register_node_type_sh_combxyz(void) -{ - static bNodeType ntype; - - sh_fn_node_type_base(&ntype, SH_NODE_COMBXYZ, "Combine XYZ", NODE_CLASS_CONVERTOR, 0); - node_type_socket_templates(&ntype, sh_node_combxyz_in, sh_node_combxyz_out); - node_type_gpu(&ntype, gpu_shader_combxyz); - - nodeRegisterType(&ntype); -} diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc b/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc new file mode 100644 index 00000000000..e6a7201b855 --- /dev/null +++ b/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc @@ -0,0 +1,159 @@ +/* + * 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. + * + * The Original Code is Copyright (C) 2014 Blender Foundation. + * All rights reserved. + */ + +/** \file + * \ingroup shdnodes + */ + +#include "node_shader_util.h" + +/* **************** SEPARATE XYZ ******************** */ +static bNodeSocketTemplate sh_node_sepxyz_in[] = { + {SOCK_VECTOR, N_("Vector"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f}, + {-1, ""}, +}; +static bNodeSocketTemplate sh_node_sepxyz_out[] = { + {SOCK_FLOAT, N_("X")}, + {SOCK_FLOAT, N_("Y")}, + {SOCK_FLOAT, N_("Z")}, + {-1, ""}, +}; + +static int gpu_shader_sepxyz(GPUMaterial *mat, + bNode *node, + bNodeExecData *UNUSED(execdata), + GPUNodeStack *in, + GPUNodeStack *out) +{ + return GPU_stack_link(mat, node, "separate_xyz", in, out); +} + +class MF_SeparateXYZ : public blender::fn::MultiFunction { + public: + MF_SeparateXYZ() + { + blender::fn::MFSignatureBuilder signature = this->get_builder("Separate XYZ"); + signature.single_input("XYZ"); + signature.single_output("X"); + signature.single_output("y"); + signature.single_output("z"); + } + + void call(blender::IndexMask mask, + blender::fn::MFParams params, + blender::fn::MFContext UNUSED(context)) const override + { + blender::fn::VSpan vectors = params.readonly_single_input( + 0, "XYZ"); + blender::MutableSpan xs = params.uninitialized_single_output(1, "X"); + blender::MutableSpan ys = params.uninitialized_single_output(2, "Y"); + blender::MutableSpan zs = params.uninitialized_single_output(3, "Z"); + + for (uint i : mask) { + blender::float3 xyz = vectors[i]; + xs[i] = xyz.x; + ys[i] = xyz.y; + zs[i] = xyz.z; + } + } +}; + +static void sh_node_sepxyz_expand_in_mf_network(blender::bke::NodeMFNetworkBuilder &builder) +{ + static MF_SeparateXYZ separate_fn; + builder.set_matching_fn(separate_fn); +} + +void register_node_type_sh_sepxyz(void) +{ + static bNodeType ntype; + + sh_fn_node_type_base(&ntype, SH_NODE_SEPXYZ, "Separate XYZ", NODE_CLASS_CONVERTOR, 0); + node_type_socket_templates(&ntype, sh_node_sepxyz_in, sh_node_sepxyz_out); + node_type_gpu(&ntype, gpu_shader_sepxyz); + ntype.expand_in_mf_network = sh_node_sepxyz_expand_in_mf_network; + + nodeRegisterType(&ntype); +} + +/* **************** COMBINE XYZ ******************** */ +static bNodeSocketTemplate sh_node_combxyz_in[] = { + {SOCK_FLOAT, N_("X"), 0.0f, 0.0f, 0.0f, 1.0f, -10000.0f, 10000.0f}, + {SOCK_FLOAT, N_("Y"), 0.0f, 0.0f, 0.0f, 1.0f, -10000.0f, 10000.0f}, + {SOCK_FLOAT, N_("Z"), 0.0f, 0.0f, 0.0f, 1.0f, -10000.0f, 10000.0f}, + {-1, ""}, +}; +static bNodeSocketTemplate sh_node_combxyz_out[] = { + {SOCK_VECTOR, N_("Vector")}, + {-1, ""}, +}; + +static int gpu_shader_combxyz(GPUMaterial *mat, + bNode *node, + bNodeExecData *UNUSED(execdata), + GPUNodeStack *in, + GPUNodeStack *out) +{ + return GPU_stack_link(mat, node, "combine_xyz", in, out); +} + +class MF_CombineXYZ : public blender::fn::MultiFunction { + public: + MF_CombineXYZ() + { + blender::fn::MFSignatureBuilder signature = this->get_builder("Combine XYZ"); + signature.single_input("X"); + signature.single_input("Y"); + signature.single_input("Z"); + signature.single_output("XYZ"); + } + + void call(blender::IndexMask mask, + blender::fn::MFParams params, + blender::fn::MFContext UNUSED(context)) const override + { + blender::fn::VSpan xs = params.readonly_single_input(0, "X"); + blender::fn::VSpan ys = params.readonly_single_input(1, "Y"); + blender::fn::VSpan zs = params.readonly_single_input(2, "Z"); + blender::MutableSpan vectors = + params.uninitialized_single_output(3, "XYZ"); + + for (uint i : mask) { + vectors[i] = {xs[i], ys[i], zs[i]}; + } + } +}; + +static void sh_node_combxyz_expand_in_mf_network(blender::bke::NodeMFNetworkBuilder &builder) +{ + static MF_CombineXYZ combine_fn; + builder.set_matching_fn(combine_fn); +} + +void register_node_type_sh_combxyz(void) +{ + static bNodeType ntype; + + sh_fn_node_type_base(&ntype, SH_NODE_COMBXYZ, "Combine XYZ", NODE_CLASS_CONVERTOR, 0); + node_type_socket_templates(&ntype, sh_node_combxyz_in, sh_node_combxyz_out); + node_type_gpu(&ntype, gpu_shader_combxyz); + ntype.expand_in_mf_network = sh_node_combxyz_expand_in_mf_network; + + nodeRegisterType(&ntype); +} -- cgit v1.2.3