tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Geometry Nodes: use declaration builder for simulation zone

This commit is contained in:
Jacques Lucke 2023-10-08 14:14:22 +02:00
parent b6a3ac5a12
commit 0b3daea393
3 changed files with 38 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/geometry/node_geometry_util.hh
View File

@ -99,10 +99,6 @@ class EvaluateAtIndexInput final : public bke::GeometryFieldInput {
}
};
std::string socket_identifier_for_simulation_item(const NodeSimulationItem &item);
void socket_declarations_for_simulation_items(Span<NodeSimulationItem> items,
NodeDeclaration &r_declaration);
const CPPType &get_simulation_item_cpp_type(eNodeSocketDatatype socket_type);
const CPPType &get_simulation_item_cpp_type(const NodeSimulationItem &item);

29
source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
View File

@ -190,17 +190,26 @@ static void node_declare_dynamic(const bNodeTree &node_tree,
if (!output_node) {
return;
}
std::unique_ptr<decl::Float> delta_time = std::make_unique<decl::Float>();
delta_time->identifier = "Delta Time";
delta_time->name = DATA_("Delta Time");
delta_time->in_out = SOCK_OUT;
r_declaration.outputs.append(delta_time.get());
r_declaration.items.append(std::move(delta_time));
const NodeGeometrySimulationOutput &storage = *static_cast<const NodeGeometrySimulationOutput *>(
const auto &output_storage = *static_cast<const NodeGeometrySimulationOutput *>(
output_node->storage);
socket_declarations_for_simulation_items({storage.items, storage.items_num}, r_declaration);
NodeDeclarationBuilder b{r_declaration};
b.add_output<decl::Float>("Delta Time");
for (const int i : IndexRange(output_storage.items_num)) {
const NodeSimulationItem &item = output_storage.items[i];
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(item.socket_type);
const StringRef name = item.name;
const std::string identifier = SimulationItemsAccessor::socket_identifier_for_item(item);
auto &input_decl = b.add_input(socket_type, name, identifier);
auto &output_decl = b.add_output(socket_type, name, identifier);
if (socket_type_supports_fields(socket_type)) {
input_decl.supports_field();
output_decl.dependent_field({input_decl.input_index()});
}
}
b.add_input<decl::Extend>("", "__extend__");
b.add_output<decl::Extend>("", "__extend__");
}
static void node_init(bNodeTree * /*tree*/, bNode *node)

84
source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
View File

@ -50,60 +50,6 @@
namespace blender::nodes {
std::string socket_identifier_for_simulation_item(const NodeSimulationItem &item)
{
return SimulationItemsAccessor::socket_identifier_for_item(item);
}
static std::unique_ptr<SocketDeclaration> socket_declaration_for_simulation_item(
const NodeSimulationItem &item,
const eNodeSocketInOut in_out,
const int corresponding_input = -1)
{
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(item.socket_type);
BLI_assert(SimulationItemsAccessor::supports_socket_type(socket_type));
std::unique_ptr<SocketDeclaration> decl = make_declaration_for_socket_type(socket_type);
BLI_assert(decl);
if (socket_type_supports_fields(socket_type)) {
if (in_out == SOCK_IN) {
decl->input_field_type = InputSocketFieldType::IsSupported;
}
else {
decl->output_field_dependency = OutputFieldDependency::ForPartiallyDependentField(
{corresponding_input});
}
}
decl->name = item.name ? item.name : "";
decl->identifier = socket_identifier_for_simulation_item(item);
decl->in_out = in_out;
return decl;
}
void socket_declarations_for_simulation_items(const Span<NodeSimulationItem> items,
NodeDeclaration &r_declaration)
{
const int inputs_offset = r_declaration.inputs.size();
for (const int i : items.index_range()) {
const NodeSimulationItem &item = items[i];
SocketDeclarationPtr input_decl = socket_declaration_for_simulation_item(item, SOCK_IN);
SocketDeclarationPtr output_decl = socket_declaration_for_simulation_item(
item, SOCK_OUT, inputs_offset + i);
r_declaration.inputs.append(input_decl.get());
r_declaration.items.append(std::move(input_decl));
r_declaration.outputs.append(output_decl.get());
r_declaration.items.append(std::move(output_decl));
}
SocketDeclarationPtr input_extend_decl = decl::create_extend_declaration(SOCK_IN);
SocketDeclarationPtr output_extend_decl = decl::create_extend_declaration(SOCK_OUT);
r_declaration.inputs.append(input_extend_decl.get());
r_declaration.items.append(std::move(input_extend_decl));
r_declaration.outputs.append(output_extend_decl.get());
r_declaration.items.append(std::move(output_extend_decl));
}
const CPPType &get_simulation_item_cpp_type(const eNodeSocketDatatype socket_type)
{
const char *socket_idname = nodeStaticSocketType(socket_type, 0);
@ -730,19 +676,27 @@ static void node_declare_dynamic(const bNodeTree & /*node_tree*/,
const bNode &node,
NodeDeclaration &r_declaration)
{
NodeDeclarationBuilder b{r_declaration};
const NodeGeometrySimulationOutput &storage = node_storage(node);
{
SocketDeclarationPtr skip_decl = std::make_unique<decl::Bool>();
skip_decl->name = N_("Skip");
skip_decl->identifier = skip_decl->name;
skip_decl->description = N_(
"Forward the output of the simulation input node directly to the output node and ignore "
"the nodes in the simulation zone");
skip_decl->in_out = SOCK_IN;
r_declaration.inputs.append(skip_decl.get());
r_declaration.items.append(std::move(skip_decl));
b.add_input<decl::Bool>("Skip").description(
"Forward the output of the simulation input node directly to the output node and ignore "
"the nodes in the simulation zone");
for (const int i : IndexRange(storage.items_num)) {
const NodeSimulationItem &item = storage.items[i];
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(item.socket_type);
const StringRef name = item.name;
const std::string identifier = SimulationItemsAccessor::socket_identifier_for_item(item);
auto &input_decl = b.add_input(socket_type, name, identifier);
auto &output_decl = b.add_output(socket_type, name, identifier);
if (socket_type_supports_fields(socket_type)) {
input_decl.supports_field();
output_decl.dependent_field({input_decl.input_index()});
}
}
socket_declarations_for_simulation_items({storage.items, storage.items_num}, r_declaration);
b.add_input<decl::Extend>("", "__extend__");
b.add_output<decl::Extend>("", "__extend__");
}
static void node_init(bNodeTree * /*tree*/, bNode *node)