Blender Git Loki
Git Commits -> Revision 61f3d4e
Revision 61f3d4e by Jacques Lucke (master) September 23, 2021, 20:21 (GMT) |
Geometry Nodes: Initial socket visualization for fields. This implements the update logic for the vizualization of which sockets pass data or constants directly, and which pass functions. The socket shapes may still have to be updated. That should be done separately, because it might be a bit more involved, because socket shapes are currently linked to keyframe shapes. Currently the circle and diamond shapes are used with the following meanings: - Input Sockets: - Circle: Required to be a single value. - Diamond: This input supports fields. - Output Sockets: - Circle: This output is a single value. - Diamond: This output may be a field. Connecting a field to a circle input socket is an error, since a field cannot be converted to a single value. If the socket shape is a diamond with a dot in the middle, it means it is currently a single value, but could be a field. In addition to socket shapes, the intention is to draw node links differently based on the field status. However, the exact method for conveying that isn't decided yet. Differential Revision: https://developer.blender.org/D12584 |
Commit Details:
Full Hash: 61f3d4eb7c7db711f9339d05e68b8f9eac3ce167
Parent Commit: c1b925f
Committed By: Hans Goudey
Lines Changed: +908, -32
43 Modified Paths:
/source/blender/blenkernel/BKE_node.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/lib_remap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.cc (+556, -3) (Diff)
/source/blender/editors/space_node/drawnode.cc (+7, -0) (Diff)
/source/blender/editors/space_node/node_relationships.cc (+5, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+8, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_boolean_math.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_float_compare.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_float_to_int.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_input_string.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_input_vector.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_random_float.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_string_length.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_string_substring.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_value_to_string.cc (+1, -0) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc (+10, -10) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc (+2, -2) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc (+5, -5) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_index.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_position.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_set_position.cc (+2, -2) (Diff)
/source/blender/nodes/intern/node_tree_ref.cc (+103, -0) (Diff)
/source/blender/nodes/NOD_node_declaration.hh (+151, -0) (Diff)
/source/blender/nodes/NOD_node_tree_ref.hh (+26, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_clamp.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_curves.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_map_range.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_math.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_vector_math.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc (+1, -0) (Diff)
/source/blender/blenkernel/intern/lib_remap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.cc (+556, -3) (Diff)
/source/blender/editors/space_node/drawnode.cc (+7, -0) (Diff)
/source/blender/editors/space_node/node_relationships.cc (+5, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+8, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_boolean_math.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_float_compare.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_float_to_int.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_input_string.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_input_vector.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_random_float.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_string_length.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_string_substring.cc (+1, -0) (Diff)
/source/blender/nodes/function/nodes/node_fn_value_to_string.cc (+1, -0) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc (+10, -10) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc (+2, -2) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc (+5, -5) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_index.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_position.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc (+1, -1) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_set_position.cc (+2, -2) (Diff)
/source/blender/nodes/intern/node_tree_ref.cc (+103, -0) (Diff)
/source/blender/nodes/NOD_node_declaration.hh (+151, -0) (Diff)
/source/blender/nodes/NOD_node_tree_ref.hh (+26, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_clamp.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_curves.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_map_range.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_math.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_vector_math.cc (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc (+1, -0) (Diff)