Geometry Nodes: show correct type in menu socket tooltips #121236

Jacques Lucke · 2024-04-30T00:07:20+02:00

Jacques Lucke commented

2024-04-30 00:07:20 +02:00

Previously, menu sockets were sometimes shown as integers or strings in socket tooltips. Now, they are always shown as "Menu" type. This also changes how these values are logged. Previously, they were logged as strings. Now, only the integer identifier is logged and the name is looked up when drawing the tooltip.

Before:

After:

Previously, menu sockets were sometimes shown as integers or strings in socket tooltips. Now, they are always shown as "Menu" type. This also changes how these values are logged. Previously, they were logged as strings. Now, only the integer identifier is logged and the name is looked up when drawing the tooltip. Before: ![image](/attachments/30ee516e-f79b-4b26-8fd7-7a263ccb8cf4) ![image](/attachments/f27c7bf9-4351-404d-acc6-9dfda305554d) After: ![image](/attachments/a93f812e-b23d-4d05-a4e2-c3f32823ff98) ![image](/attachments/1ac082a2-c93b-4157-9b69-7304f3610b84)

image.png

12 KiB

image.png

6.8 KiB

image.png

7.2 KiB

image.png

16 KiB

Jacques Lucke added 1 commit 2024-04-30 00:07:24 +02:00

c743475b36 don't show menu sockets as strings or integers in tooltip

Jacques Lucke requested review from Hans Goudey 2024-04-30 00:11:45 +02:00

Iliya Katushenock reviewed 2024-04-30 00:45:51 +02:00

source/blender/editors/space_node/node_draw.cc Outdated

						
				@ -1348,3 +1349,3 @@

				  if (socket_type.is<int>()) {

				    ss << fmt::format(TIP_("{} (Integer)"), *static_cast<int *>(socket_value));

				    const int socket_value_i = *static_cast<int *>(socket_value);

Iliya Katushenock commented

2024-04-30 00:45:51 +02:00

This is incorrect to do this after type cast, since this is not supported to convert int/float/... to menu index via link implicitly.

Also, i don't like idea of mixing int and menu in UI text formatting only due to the same data type. This will cause a lot of mess with subtypes and maybe additional features in the future.

This is incorrect to do this after type cast, since this is not supported to convert int/float/... to menu index via link implicitly. ![image](/attachments/18d94d0c-7151-4ae6-8f19-a69b816a3a11) Also, i don't like idea of mixing int and menu in UI text formatting only due to the same data type. This will cause a lot of mess with subtypes and maybe additional features in the future.

JacquesLucke marked this conversation as resolved

Jacques Lucke added 3 commits 2024-04-30 10:40:46 +02:00

44bad546a6 Merge branch 'main' into menu-socket-tooltip

dc222a06aa extract method

39d55fdaf3 make handling of menu sockets more explicit

Iliya Katushenock reviewed 2024-04-30 10:44:14 +02:00

source/blender/editors/space_node/node_draw.cc

						
				@ -1338,0 +1352,4 @@

				    const bke::RuntimeNodeEnumItem *enum_item =

				        socket_storage->enum_items->find_item_by_identifier(item_identifier);

				    if (!enum_item) {

				      return;

Iliya Katushenock commented

2024-04-30 10:44:14 +02:00

Right now all types of socket value have tooltip even for null value

Right now all types of socket value have tooltip even for null value ![image](/attachments/f2bd5d02-7c15-47dc-92c7-32b43eed4977)

Jacques Lucke commented

2024-04-30 10:54:57 +02:00

Seems to be a different case. Here we don't even have a null value, there is no value at all. That can be changed separately. The goal of this patch is to not show menu sockets as integers or strings.

JacquesLucke marked this conversation as resolved

Iliya Katushenock reviewed 2024-04-30 10:56:31 +02:00

source/blender/nodes/intern/geometry_nodes_log.cc Outdated

						
				@ -179,4 +179,2 @@

				  };

				  auto log_menu_value = [&](Span<bke::RuntimeNodeEnumItem> enum_items, const int identifier) {

				    for (const bke::RuntimeNodeEnumItem &item : enum_items) {

Iliya Katushenock commented

2024-04-30 10:56:31 +02:00

Do you'd like to cleanup unused includes as separate change?

JacquesLucke marked this conversation as resolved

Hans Goudey approved these changes 2024-04-30 14:53:07 +02:00

source/blender/editors/space_node/node_draw.cc Outdated

						
				@ -1338,0 +1342,4 @@

				      return;

				    }

				    const int item_identifier = *static_cast<const int *>(buffer);

				    auto *socket_storage = socket.default_value_typed<bNodeSocketValueMenu>();