diff options
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c | 139 |
1 files changed, 111 insertions, 28 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c index 7000a8a6dae..adcb93d7775 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c @@ -23,12 +23,26 @@ static bNodeSocketTemplate sh_node_tex_voronoi_in[] = { {SOCK_VECTOR, 1, N_("Vector"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE}, + {SOCK_FLOAT, 1, N_("W"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f}, {SOCK_FLOAT, 1, N_("Scale"), 5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f}, + {SOCK_FLOAT, 1, N_("Smoothness"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, {SOCK_FLOAT, 1, N_("Exponent"), 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 32.0f}, + {SOCK_FLOAT, 1, N_("Randomness"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, {-1, 0, ""}, }; static bNodeSocketTemplate sh_node_tex_voronoi_out[] = { + {SOCK_FLOAT, + 0, + N_("Distance"), + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + PROP_NONE, + SOCK_NO_INTERNAL_LINK}, {SOCK_RGBA, 0, N_("Color"), @@ -40,16 +54,28 @@ static bNodeSocketTemplate sh_node_tex_voronoi_out[] = { 1.0f, PROP_NONE, SOCK_NO_INTERNAL_LINK}, + {SOCK_VECTOR, + 0, + N_("Position"), + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + PROP_NONE, + SOCK_NO_INTERNAL_LINK}, + {SOCK_FLOAT, 0, N_("W"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_NO_INTERNAL_LINK}, {SOCK_FLOAT, 0, - N_("Fac"), + N_("Radius"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, - PROP_FACTOR, + PROP_NONE, SOCK_NO_INTERNAL_LINK}, {-1, 0, ""}, }; @@ -59,8 +85,8 @@ static void node_shader_init_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node) NodeTexVoronoi *tex = MEM_callocN(sizeof(NodeTexVoronoi), "NodeTexVoronoi"); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); BKE_texture_colormapping_default(&tex->base.color_mapping); - tex->coloring = SHD_VORONOI_INTENSITY; - tex->distance = SHD_VORONOI_DISTANCE; + tex->dimensions = 3; + tex->distance = SHD_VORONOI_EUCLIDEAN; tex->feature = SHD_VORONOI_F1; node->storage = tex; @@ -75,39 +101,96 @@ static int node_shader_gpu_tex_voronoi(GPUMaterial *mat, node_shader_gpu_default_tex_coord(mat, node, &in[0].link); node_shader_gpu_tex_mapping(mat, node, in, out); + static const char *names[][5] = { + [SHD_VORONOI_F1] = + { + "", + "node_tex_voronoi_f1_1d", + "node_tex_voronoi_f1_2d", + "node_tex_voronoi_f1_3d", + "node_tex_voronoi_f1_4d", + }, + [SHD_VORONOI_F2] = + { + "", + "node_tex_voronoi_f2_1d", + "node_tex_voronoi_f2_2d", + "node_tex_voronoi_f2_3d", + "node_tex_voronoi_f2_4d", + }, + [SHD_VORONOI_SMOOTH_F1] = + { + "", + "node_tex_voronoi_smooth_f1_1d", + "node_tex_voronoi_smooth_f1_2d", + "node_tex_voronoi_smooth_f1_3d", + "node_tex_voronoi_smooth_f1_4d", + }, + [SHD_VORONOI_DISTANCE_TO_EDGE] = + { + "", + "node_tex_voronoi_distance_to_edge_1d", + "node_tex_voronoi_distance_to_edge_2d", + "node_tex_voronoi_distance_to_edge_3d", + "node_tex_voronoi_distance_to_edge_4d", + }, + [SHD_VORONOI_N_SPHERE_RADIUS] = + { + "", + "node_tex_voronoi_n_sphere_radius_1d", + "node_tex_voronoi_n_sphere_radius_2d", + "node_tex_voronoi_n_sphere_radius_3d", + "node_tex_voronoi_n_sphere_radius_4d", + }, + }; + NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage; - float coloring = tex->coloring; float metric = tex->distance; - float feature = tex->feature; - - return GPU_stack_link(mat, - node, - "node_tex_voronoi", - in, - out, - GPU_constant(&coloring), - GPU_constant(&metric), - GPU_constant(&feature)); + + BLI_assert(tex->feature >= 0 && tex->feature < 5); + BLI_assert(tex->dimensions > 0 && tex->dimensions < 5); + + return GPU_stack_link( + mat, node, names[tex->feature][tex->dimensions], in, out, GPU_constant(&metric)); } static void node_shader_update_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node) { + bNodeSocket *inVectorSock = nodeFindSocket(node, SOCK_IN, "Vector"); + bNodeSocket *inWSock = nodeFindSocket(node, SOCK_IN, "W"); + bNodeSocket *inSmoothnessSock = nodeFindSocket(node, SOCK_IN, "Smoothness"); + bNodeSocket *inExponentSock = nodeFindSocket(node, SOCK_IN, "Exponent"); + + bNodeSocket *outDistanceSock = nodeFindSocket(node, SOCK_OUT, "Distance"); + bNodeSocket *outColorSock = nodeFindSocket(node, SOCK_OUT, "Color"); + bNodeSocket *outPositionSock = nodeFindSocket(node, SOCK_OUT, "Position"); + bNodeSocket *outWSock = nodeFindSocket(node, SOCK_OUT, "W"); + bNodeSocket *outRadiusSock = nodeFindSocket(node, SOCK_OUT, "Radius"); + NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage; - bNodeSocket *sock; - - for (sock = node->inputs.first; sock; sock = sock->next) { - if (STREQ(sock->name, "Exponent")) { - if (tex->distance == SHD_VORONOI_MINKOWSKI) { - sock->flag &= ~SOCK_UNAVAIL; - } - else { - sock->flag |= SOCK_UNAVAIL; - } - } - } + + nodeSetSocketAvailability(inWSock, tex->dimensions == 1 || tex->dimensions == 4); + nodeSetSocketAvailability(inVectorSock, tex->dimensions != 1); + nodeSetSocketAvailability( + inExponentSock, + tex->distance == SHD_VORONOI_MINKOWSKI && tex->dimensions != 1 && + !ELEM(tex->feature, SHD_VORONOI_DISTANCE_TO_EDGE, SHD_VORONOI_N_SPHERE_RADIUS)); + nodeSetSocketAvailability(inSmoothnessSock, tex->feature == SHD_VORONOI_SMOOTH_F1); + nodeSetSocketAvailability(outDistanceSock, tex->feature != SHD_VORONOI_N_SPHERE_RADIUS); + nodeSetSocketAvailability(outColorSock, + tex->feature != SHD_VORONOI_DISTANCE_TO_EDGE && + tex->feature != SHD_VORONOI_N_SPHERE_RADIUS); + nodeSetSocketAvailability(outPositionSock, + tex->feature != SHD_VORONOI_DISTANCE_TO_EDGE && + tex->feature != SHD_VORONOI_N_SPHERE_RADIUS && + tex->dimensions != 1); + nodeSetSocketAvailability(outWSock, + tex->feature != SHD_VORONOI_DISTANCE_TO_EDGE && + tex->feature != SHD_VORONOI_N_SPHERE_RADIUS && + (tex->dimensions == 1 || tex->dimensions == 4)); + nodeSetSocketAvailability(outRadiusSock, tex->feature == SHD_VORONOI_N_SPHERE_RADIUS); } -/* node type definition */ void register_node_type_sh_tex_voronoi(void) { static bNodeType ntype; |