Differential D10129

Geometry Nodes: Preselection highlighting for gesture based link picking for Multi Input Sockets.
AbandonedPublic
Actions

Authored by Fabian Schempp (fabian_schempp) on Jan 17 2021, 9:11 AM.

Tags

Subscribers

Aaron Carlisle (Blendify)

Leon Schittek (lone_noel)

RedMser (RedMser)

Tokens

"Burninate" token, awarded by lone_noel."Burninate" token, awarded by Draise."100" token, awarded by Galagax.

Details

Reviewers

Julian Eisel (Severin)
Hans Goudey (HooglyBoogly)

Summary

Adds a preselection highlighting to gesture based link picking when dragging links from Multi Input Sockets.

Based on:
https://developer.blender.org/D10067

Diff Detail

Repository

Branch

geometry_nodes_multi_input_socket_spreaded_connections (branched from master)

Build Status

Buildable 12452
Build 12452: arc lint + arc unit

Event Timeline

Fabian Schempp (fabian_schempp) requested review of this revision.Jan 17 2021, 9:11 AM

Fabian Schempp (fabian_schempp) created this revision.

Harbormaster completed remote builds in B12231: Diff 32843.Jan 17 2021, 9:11 AM

• FabianSchempp (FabianSchempp) edited the summary of this revision. (Show Details)Jan 17 2021, 9:14 AM

• FabianSchempp (FabianSchempp) added a project: Geometry Nodes.

• FabianSchempp (FabianSchempp) mentioned this in D10067: Geometry Nodes: Multi Input Sockets.

sorted some previous changes

Harbormaster completed remote builds in B12232: Diff 32844.Jan 17 2021, 9:46 AM

Added missing line after rebase merge

Harbormaster completed remote builds in B12235: Diff 32847.Jan 17 2021, 10:31 AM

Very nice improvement!

David (Galagax) awarded a token.Jan 18 2021, 6:17 AM

RedMser (RedMser) added a subscriber: RedMser (RedMser).Jan 18 2021, 3:36 PM

rebased to master

Harbormaster completed remote builds in B12258: Diff 32889.Jan 19 2021, 12:00 AM

Andres Stephens (Draise) awarded a token.Jan 19 2021, 12:06 AM

rebased to current

Harbormaster completed remote builds in B12332: Diff 33046.Jan 23 2021, 1:43 AM

added missing line after merge
added missing line after merge
Reverted join geometry node back to master, since its in its own branch.

Harbormaster completed remote builds in B12452: Diff 33267.Jan 28 2021, 8:38 PM

Fabian Schempp (fabian_schempp) mentioned this in D10181: UI: Multi-input node socket spacing and interaction.Jan 28 2021, 8:39 PM

Merged with: https://developer.blender.org/D10181

Really cool feature!

One small issue I found is that the highlight only seems to be updating when dragging on the lift half of the multi-socket node:

Some further thoughts on the feature itself:

Could the color of the highlight be the same as the node socket color? I think that would look nicer. Not sure how it would deal with white sockets, but I don't think there are any.
What about having the link highlight be drawn when hovering with the mouse over the socket? It would give me a little more confidence picking links from the multi-socket. I also think the link highlight could then be extended to normal sockets. Most items in blenders UI (buttons, sliders, drop-downs, ... ) are highlighted once you hover the mouse over them to indicate they are interactable. Might be nice to extend that to the node sockets, but I guess that is outside the scope of this patch.

Leon Schittek (lone_noel) awarded a token.Jan 31 2021, 1:54 PM

Revision Contents
Changeset List

Path

Size

source/

blender/

editors/

include/

3 lines

interface/

interface_widgets.c

2 lines

space_node/

19 lines

303 lines

31 lines

11 lines

node_relationships.c

165 lines

gpu/

3 lines

1 line

intern/

gpu_shader_builtin.c

9 lines

shaders/

gpu_shader_node_socket_frag.glsl

47 lines

gpu_shader_node_socket_vert.glsl

27 lines

makesdna/

DNA_node_types.h

6 lines

nodes/

intern/

4 lines

Commit	Tree	Parents	Author	Summary	Date
04780d7bdee6	06b3ebbd156f	5a4ddf7e3d74 ff3540c51f47	fabian_schempp	Reverted join geometry node back to master, since its in its own branch.	Jan 28 2021, 8:04 PM
5a4ddf7e3d74	76850c969408	a0af1a543766	fabian_schempp	added missing line after merge	Jan 17 2021, 10:27 AM
a0af1a543766	75383321a438	c7492f49c513	fabian_schempp	added missing line after merge	Jan 17 2021, 10:25 AM
c7492f49c513	0e3ed988701b	71e910109b20	fabian_schempp	Geometry Nodes: Preselection highlighting for gesture based link picking for… (Show More…)	Jan 17 2021, 8:41 AM
71e910109b20	0f6a6a2ac20f	3af217081055	fabian_schempp	Changes based on the revision from Hans Goudey	Jan 17 2021, 12:32 AM
ff3540c51f47	f6e94df1c54e	c6c0e9192372	fabian_schempp	Removed unnused shader binding that causes an assert.	Jan 27 2021, 9:45 PM
c6c0e9192372	f4bcb207c7c8	f89d761969fc	fabian_schempp	Reverted unneeded changes in node_relationships.c.	Jan 27 2021, 11:30 AM
f89d761969fc	3091c7dcd0b6	c65fcd898146	fabian_schempp	Changes based on the revision from Hans Goudey	Jan 17 2021, 12:32 AM
c65fcd898146	2a35e2893c46	4b63c67f9a33	fabian_schempp	Reverted some changes that belong to virtual socket color branch.	Jan 27 2021, 12:38 PM
4b63c67f9a33	2860569b8d08	1c0fbca163b8	fabian_schempp	free cloned Listbase after use	Jan 27 2021, 10:02 AM
1c0fbca163b8	f6d9d5e41c9b	cc4e1338a08d	fabian_schempp	Applied clang format.	Jan 24 2021, 8:33 PM
cc4e1338a08d	978d3463371a	f1d732d116d6	fabian_schempp	Geometry Nodes: Socket Growing and Link Spaceing (Show More…)	Jan 23 2021, 12:57 AM
f1d732d116d6	dcad3a8e3cc5	42c708ad156a	fabian_schempp	cleanup	Jan 23 2021, 12:05 AM
42c708ad156a	971706f62d6e	257bd4327451	fabian_schempp	make sockets only take one link from the same output socket.	Jan 22 2021, 8:54 AM
257bd4327451	c3652b1bffb7	31b3c5a7aa36	fabian_schempp	better link picking by intersection	Jan 22 2021, 8:08 AM
31b3c5a7aa36	30d2facdfd73	ea6615a6122f	fabian_schempp	better link picking by intersection	Jan 22 2021, 2:08 AM
ea6615a6122f	6893c25c126f	be5474537409	fabian_schempp	updated node channel height update and mouse pick radius	Jan 21 2021, 1:07 AM
be5474537409	8c0a968251d9	4a93b3a02b56	fabian_schempp	updated shader and node drawing	Jan 20 2021, 11:48 PM
4a93b3a02b56	5aabf663f378	f95bb75e92d7	fabian_schempp	Geometry Nodes: spread input links	Jan 18 2021, 11:24 AM
f95bb75e92d7	1ba322d21809	e813806f77c8	fabian_schempp	implemented some more changes based on review by Ankit Meel	Jan 12 2021, 7:00 PM
e813806f77c8	b4239888dcdd	46bfd7d330ac	fabian_schempp	changed nameing of variable sock to sock_idname to fit better	Jan 12 2021, 11:14 AM
46bfd7d330ac	af6df38cbbcc	942b6bfcb4be	fabian_schempp	Changes based on review by Ankit Meel	Jan 12 2021, 11:07 AM
942b6bfcb4be	8ceb0e1e8b68	323d3819306f	fabian_schempp	Nodes: Changed the drawing of Virtual Sockets to be better recognizable. (Show More…)	Jan 10 2021, 8:48 PM
323d3819306f	2b948d4eb54b	c977ec73a3a4	fabian_schempp	changed default color for virtual inputs	Jan 10 2021, 8:49 PM
c977ec73a3a4	d7d32c21f918	884757e560af	fabian_schempp	display Multi Input Socket as circle if node is collapsed.	Jan 16 2021, 1:59 AM
884757e560af	65b7d577ff57	7543fa26a5fb	fabian_schempp	merged missing pieces	Jan 7 2021, 10:25 PM
7543fa26a5fb	d7d32c21f918	68455e349178	fabian_schempp	rebased onto master	Jan 16 2021, 1:59 AM
68455e349178	d2919e384f71	15b23849a858	fabian_schempp	Geometry Nodes: Replaces the GPU_SHADER_KEYFRAME_DIAMOND with… (Show More…)	Jan 10 2021, 8:48 PM
15b23849a858	32a373184665	4ba5e62654b4	fabian_schempp	merged missing pieces	Jan 7 2021, 10:25 PM
4ba5e62654b4	af6078f0be09	4c26b21a3e6f	fabian_schempp	make shader for elongated sockets work	Jan 9 2021, 3:28 AM
4c26b21a3e6f	3ce7081cdfdd	bef5f5697562	fabian_schempp	replaceing the GPU_SHADER_KEYFRAME_DIAMOND with its native… (Show More…)	Jan 7 2021, 10:25 PM
bef5f5697562	4a5032f50ad9	8385d6f16906	fabian_schempp	Geometry Nodes: Added preselection highlighting to gesture based link picking… (Show More…)	Jan 17 2021, 8:41 AM
8385d6f16906	a8a34b43b40d	bb7c55f0baca	fabian_schempp	Changed join_component_type() to use extracted multi input vector directly. (Show More…)	Jan 19 2021, 11:16 PM
bb7c55f0baca	ada60478afc6	3495ae73d5f6	fabian_schempp	changes based on review by Jacques Lucke	Jan 18 2021, 11:57 PM
3495ae73d5f6	21fbbe4ad89f	a264eda5bf2a	fabian_schempp	make multi input sockets displayed as diamond shape for now (Show More…)	Jan 11 2021, 3:53 AM
a264eda5bf2a	c2b12a5c790e	cae7ab043a57	fabian_schempp	Geometry Nodes: changed Join Geometry Node to use multi input socket	Jan 10 2021, 10:35 PM
cae7ab043a57	db705bc2bd2a	d90eaa322369	fabian_schempp	Geometry Nodes: Added preselection highlighting to gesture based link picking… (Show More…)	Jan 17 2021, 8:41 AM
d90eaa322369	5da3887b74b2	0363eb222327	fabian_schempp	added missing line after merge	Jan 17 2021, 10:27 AM
0363eb222327	e000cb94d2a6	d0f5326cbfc9	fabian_schempp	added missing line after merge	Jan 17 2021, 10:25 AM
d0f5326cbfc9	5e226607eeb6	3c10c6843352	fabian_schempp	Geometry Nodes: Preselection highlighting for gesture based link picking for… (Show More…)	Jan 17 2021, 8:41 AM
3c10c6843352	60f9c4690204	5c7775e074bb	fabian_schempp	Changes based on the revision from Hans Goudey	Jan 17 2021, 12:32 AM

Diff 33267

source/blender/editors/include/ED_node.h

Loading...

source/blender/editors/interface/interface_widgets.c

Loading...

source/blender/editors/space_node/drawnode.c

Loading...

source/blender/editors/space_node/node_draw.c

Loading...

source/blender/editors/space_node/node_edit.c

Loading...

source/blender/editors/space_node/node_intern.h

Loading...

source/blender/editors/space_node/node_relationships.c

Loading...

source/blender/gpu/CMakeLists.txt

Loading...

source/blender/gpu/GPU_shader.h

Loading...

source/blender/gpu/intern/gpu_shader_builtin.c

Loading...

source/blender/gpu/shaders/gpu_shader_node_socket_frag.glsl

Loading...

source/blender/gpu/shaders/gpu_shader_node_socket_vert.glsl

Loading...

source/blender/makesdna/DNA_node_types.h

Loading...

source/blender/nodes/intern/node_socket.cc

Loading...