blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Geometry Node: Multi-input socket tooltip #104468

Merged
Jacques Lucke merged 33 commits from mod_moder/blender:multi_input_tooltip into main 2024-04-22 19:49:08 +02:00
Conversation 11 Commits 33 Files Changed 1 +53 -65
3 changed files with 53 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c85e466cfa - Show all commits

58
source/blender/editors/space_node/node_draw.cc
View File

@ -826,11 +826,7 @@ static void create_inspection_string_for_generic_value(const bNodeSocket &socket
const CPPType &socket_type = *socket.typeinfo->base_cpp_type;
const bke::DataTypeConversions &convert = bke::get_implicit_type_conversions();
<<<<<<< HEAD
if (&value_type != &socket_type) {
=======
if (value_type != socket_type) {
>>>>>>> master
if (!convert.is_convertible(value_type, socket_type)) {
return;
}
@ -907,11 +903,8 @@ static void create_inspection_string_for_geometry_info(const geo_log::GeometryIn
std::stringstream &ss)
{
Span<GeometryComponentType> component_types = value_log.component_types;
ss << TIP_("Geometry:\n");
if (component_types.is_empty()) {
ss << TIP_("\u2022 Empty");
ss << TIP_("Empty Geometry");
return;
}
@ -921,6 +914,7 @@ static void create_inspection_string_for_geometry_info(const geo_log::GeometryIn
return std::string(str);
};
ss << TIP_("Geometry:\n");
for (GeometryComponentType type : component_types) {
switch (type) {
case GEO_COMPONENT_TYPE_MESH: {
@ -990,22 +984,21 @@ static void create_inspection_string_for_geometry_info(const geo_log::GeometryIn
}
}
<<<<<<< HEAD
static void create_inspection_string_for_geometry_socket(const nodes::decl::Geometry &socket_decl,
std::stringstream &ss,
const char *space)
static void create_inspection_string_for_geometry_socket(std::stringstream &ss,
const nodes::decl::Geometry *socket_decl,
const bool after_log)
{
if (socket_decl.in_out() == SOCK_OUT) {
=======
/* If the geometry declaration is null, as is the case for input to group output,
* or it is an output socket don't show supported types. */
if (socket_decl == nullptr || socket_decl->in_out == SOCK_OUT) {
>>>>>>> master
return;
}
ss << space;
Span<GeometryComponentType> supported_types = socket_decl.supported_types();
if (after_log) {
ss << ".\n\n";
}
Span<GeometryComponentType> supported_types = socket_decl->supported_types();
if (supported_types.is_empty()) {
ss << TIP_("Supported: All Types");
return;
@ -1038,7 +1031,9 @@ static void create_inspection_string_for_geometry_socket(const nodes::decl::Geom
break;
}
}
ss << (type == supported_types.last() ? "" : ", ");
if (type != supported_types.last()) {
ss << ", ";
}
}
}
@ -1051,16 +1046,22 @@ static std::optional<std::string> create_socket_inspection_string(TreeDrawContex
return std::nullopt;
}
Vector<const ValueLog *> logs;
tree_draw_ctx.geo_tree_log->ensure_socket_values();
tree_draw_ctx.geo_tree_log->socket_logs_callback(socket, [&](const ValueLog *value_log) {
if (value_log) {
logs.append(value_log);
}
});
Vector<const ValueLog *, 1> value_logs;
if (socket.is_multi_input()){
geo_log::multi_input_socket_value_logs(*tree_draw_ctx.geo_tree_log, socket, [&](const ValueLog *value_log) {
if (value_log) {
value_logs.append(value_log);
}
});
}else{
value_logs.append(tree_draw_ctx.geo_tree_log->find_socket_value_log(socket));
}
std::stringstream ss;
for (const ValueLog *value_log : logs) {
for (const int index : value_logs.index_range()) {
const ValueLog *value_log = value_logs[index];
ss << "Input " << index << ":\n";
if (const geo_log::GenericValueLog *generic_value_log =
dynamic_cast<const geo_log::GenericValueLog *>(value_log)) {
create_inspection_string_for_generic_value(socket, generic_value_log->value, ss);
@ -1073,15 +1074,12 @@ static std::optional<std::string> create_socket_inspection_string(TreeDrawContex
dynamic_cast<const geo_log::GeometryInfoLog *>(value_log)) {
create_inspection_string_for_geometry_info(*geo_value_log, ss);
}
if (value_log != logs.last()) {
ss << ".\n";
}
}
if (const nodes::decl::Geometry *socket_decl = dynamic_cast<const nodes::decl::Geometry *>(
socket.runtime->declaration)) {
const char *space = logs.is_empty() ? "" : ".\n\n";
create_inspection_string_for_geometry_socket(*socket_decl, ss, space);
const bool after_log = !value_logs.is_empty();
create_inspection_string_for_geometry_socket(ss, socket_decl, after_log);
}
std::string str = ss.str();

9
source/blender/nodes/NOD_geometry_nodes_log.hh
View File

@ -289,9 +289,16 @@ class GeoTreeLog {
void ensure_debug_messages();
ValueLog *find_socket_value_log(const bNodeSocket &query_socket);
void socket_logs_callback(const bNodeSocket &query_socket, FunctionRef<void(ValueLog *value_log)> callback);
};
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2024-01-30 04:54:27 +01:00
Outdated
Review
Copy Link

I don't think this needs to be inline, it's not really a trivial function.

I don't think this needs to be inline, it's not really a trivial function.
inline void multi_input_socket_value_logs(GeoTreeLog &tree_log, const bNodeSocket &query_socket, const FunctionRef<void(ValueLog *value_log)> callback)
{
BLI_assert(query_socket.is_multi_input());
for (const bNodeSocket *socket : query_socket.directly_linked_sockets()){
mod_moder marked this conversation as resolved Outdated
Hans Goudey commented 2024-01-30 04:54:38 +01:00
Outdated
Review
Copy Link

Array would be a better fit based on the logic here

`Array` would be a better fit based on the logic here
callback(tree_log.find_socket_value_log(*socket));
}
}
/**
* There is one #GeoModifierLog for every modifier that evaluates geometry nodes. It contains all
* the loggers that are used during evaluation as well as the preprocessed logs that are used by UI

51
source/blender/nodes/intern/geometry_nodes_log.cc
View File

@ -8,8 +8,6 @@
#include "BKE_node_runtime.hh"
#include "BKE_viewer_path.h"
#include "BLI_function_ref.hh"
#include "FN_field_cpp_type.hh"
#include "DNA_modifier_types.h"
@ -353,17 +351,6 @@ void GeoTreeLog::ensure_debug_messages()
reduced_debug_messages_ = true;
}
void GeoTreeLog::socket_logs_callback(const bNodeSocket &query_socket, FunctionRef<void(ValueLog *value_log)> callback)
{
if (!query_socket.is_multi_input()){
callback(this->find_socket_value_log(query_socket));
}else{
for (const bNodeSocket *socket : query_socket.directly_linked_sockets()){
callback(this->find_socket_value_log(*socket));
}
}
}
ValueLog *GeoTreeLog::find_socket_value_log(const bNodeSocket &query_socket)
{
/**
@ -403,14 +390,24 @@ ValueLog *GeoTreeLog::find_socket_value_log(const bNodeSocket &query_socket)
sockets_to_check.push(&from_socket);
}
}
}
else {
if (node.is_reroute()) {
const bNodeSocket &input_socket = node.input_socket(0);
if (added_sockets.add(&input_socket)) {
sockets_to_check.push(&input_socket);
} else if (node.is_reroute()) {
const bNodeSocket &input_socket = node.input_socket(0);
if (added_sockets.add(&input_socket)) {
sockets_to_check.push(&input_socket);
}
const Span<const bNodeLink *> links = input_socket.directly_linked_links();
for (const bNodeLink *link : links) {
const bNodeSocket &from_socket = *link->fromsock;
if (added_sockets.add(&from_socket)) {
sockets_to_check.push(&from_socket);
}
const Span<const bNodeLink *> links = input_socket.directly_linked_links();
}
} else if (node.is_muted()) {
if (const bNodeSocket *input_socket = socket.internal_link_input()) {
if (added_sockets.add(input_socket)) {
sockets_to_check.push(input_socket);
}
const Span<const bNodeLink *> links = input_socket->directly_linked_links();
for (const bNodeLink *link : links) {
const bNodeSocket &from_socket = *link->fromsock;
if (added_sockets.add(&from_socket)) {
@ -418,20 +415,6 @@ ValueLog *GeoTreeLog::find_socket_value_log(const bNodeSocket &query_socket)
}
}
}
else if (node.is_muted()) {
if (const bNodeSocket *input_socket = socket.internal_link_input()) {
if (added_sockets.add(input_socket)) {
sockets_to_check.push(input_socket);
}
const Span<const bNodeLink *> links = input_socket->directly_linked_links();
for (const bNodeLink *link : links) {
const bNodeSocket &from_socket = *link->fromsock;
if (added_sockets.add(&from_socket)) {
sockets_to_check.push(&from_socket);
}
}
}
}
}
}