Cycles: add voronoi features and distance settings from Blender.

Features to get the 2nd, 3rd, 4th closest point instead of the closest, and
various distance metrics. No viewport/Eevee support yet.

Patch by Michel Anders, Charlie Jolly and Brecht Van Lommel.

Differential Revision: https://developer.blender.org/D3503

5 files changed, 69 insertions, 21 deletions

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index fff6c5d9f2c..b0440b39823 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -961,6 +961,8 @@ static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext *UNUSED(C),
 static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	uiItemR(layout, ptr, "coloring", 0, "", ICON_NONE);
+	uiItemR(layout, ptr, "distance", 0, "", ICON_NONE);
+	uiItemR(layout, ptr, "feature", 0, "", ICON_NONE);
 }
 
 static void node_shader_buts_tex_pointdensity(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 2cb92fd1cbc..ab044fff100 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -3660,7 +3660,7 @@ void node_tex_sky(vec3 co, out vec4 color)
 	color = vec4(1.0);
 }
 
-void node_tex_voronoi(vec3 co, float scale, float coloring, out vec4 color, out float fac)
+void node_tex_voronoi(vec3 co, float scale, float exponent, float coloring, out vec4 color, out float fac)
 {
 #ifdef BIT_OPERATIONS
 	vec3 p = co * scale;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index f6d92a95c3a..129172315dd 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -778,6 +778,8 @@ typedef struct NodeTexNoise {
 typedef struct NodeTexVoronoi {
 	NodeTexBase base;
 	int coloring;
+	int distance;
+	int feature;
 	int pad;
 } NodeTexVoronoi;
 
@@ -976,17 +978,20 @@ typedef struct NodeSunBeams {
 #define SHD_NOISE_HARD	1
 
 /* voronoi texture */
-#define SHD_VORONOI_DISTANCE_SQUARED	0
-#define SHD_VORONOI_ACTUAL_DISTANCE		1
-#define SHD_VORONOI_MANHATTAN			2
-#define SHD_VORONOI_CHEBYCHEV			3
-#define SHD_VORONOI_MINKOVSKY_H			4
-#define SHD_VORONOI_MINKOVSKY_4			5
-#define SHD_VORONOI_MINKOVSKY			6
+#define SHD_VORONOI_DISTANCE		0
+#define SHD_VORONOI_MANHATTAN		1
+#define SHD_VORONOI_CHEBYCHEV		2
+#define SHD_VORONOI_MINKOWSKI		3
 
 #define SHD_VORONOI_INTENSITY	0
 #define SHD_VORONOI_CELLS		1
 
+#define SHD_VORONOI_F1		0
+#define SHD_VORONOI_F2		1
+#define SHD_VORONOI_F3		2
+#define SHD_VORONOI_F4		3
+#define SHD_VORONOI_F2F1	4
+
 /* musgrave texture */
 #define SHD_MUSGRAVE_MULTIFRACTAL			0
 #define SHD_MUSGRAVE_FBM					1
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 5fe42e11765..e66c1e937e6 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3055,16 +3055,7 @@ static void rna_ShaderNodeScript_update(Main *bmain, Scene *scene, PointerRNA *p
 	ED_node_tag_update_nodetree(bmain, ntree, node);
 }
 
-static void rna_ShaderNodePrincipled_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-{
-	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
-	bNode *node = (bNode *)ptr->data;
-
-	nodeUpdate(ntree, node);
-	rna_Node_update(bmain, scene, ptr);
-}
-
-static void rna_ShaderNodeSubsurface_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+static void rna_ShaderNode_socket_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 	bNode *node = (bNode *)ptr->data;
@@ -4003,6 +3994,23 @@ static void def_sh_tex_voronoi(StructRNA *srna)
 		{0, NULL, 0, NULL, NULL}
 	};
 
+	static EnumPropertyItem prop_distance_items[] = {
+		{ SHD_VORONOI_DISTANCE, "DISTANCE", 0, "Distance", "Distance" },
+		{ SHD_VORONOI_MANHATTAN, "MANHATTAN", 0, "Manhattan", "Manhattan (city block) distance" },
+		{ SHD_VORONOI_CHEBYCHEV, "CHEBYCHEV", 0, "Chebychev", "Chebychev distance" },
+		{ SHD_VORONOI_MINKOWSKI, "MINKOWSKI", 0, "Minkowski", "Minkowski distance" },
+		{ 0, NULL, 0, NULL, NULL }
+	};
+
+	static EnumPropertyItem prop_feature_items[] = {
+		{ SHD_VORONOI_F1, "F1", 0, "Closest", "Closest point" },
+		{ SHD_VORONOI_F2, "F2", 0, "2nd Closest", "2nd closest point" },
+		{ SHD_VORONOI_F3, "F3", 0, "3rd Closest", "3rd closest point" },
+		{ SHD_VORONOI_F4, "F4", 0, "4th Closest", "4th closest point" },
+		{ SHD_VORONOI_F2F1, "F2F1", 0, "Crackle", "Difference between 2nd and 1st closest point" },
+		{ 0, NULL, 0, NULL, NULL }
+	};
+
 	PropertyRNA *prop;
 
 	RNA_def_struct_sdna_from(srna, "NodeTexVoronoi", "storage");
@@ -4013,6 +4021,18 @@ static void def_sh_tex_voronoi(StructRNA *srna)
 	RNA_def_property_enum_items(prop, prop_coloring_items);
 	RNA_def_property_ui_text(prop, "Coloring", "");
 	RNA_def_property_update(prop, 0, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "distance", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "distance");
+	RNA_def_property_enum_items(prop, prop_distance_items);
+	RNA_def_property_ui_text(prop, "Distance metric", "");
+	RNA_def_property_update(prop, 0, "rna_ShaderNode_socket_update");
+
+	prop = RNA_def_property(srna, "feature", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "feature");
+	RNA_def_property_enum_items(prop, prop_feature_items);
+	RNA_def_property_ui_text(prop, "Feature Output", "");
+	RNA_def_property_update(prop, 0, "rna_Node_update");
 }
 
 static void def_sh_tex_wave(StructRNA *srna)
@@ -4284,13 +4304,13 @@ static void def_principled(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_principled_distribution_items);
 	RNA_def_property_ui_text(prop, "Distribution", "");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNodePrincipled_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update");
 
 	prop = RNA_def_property(srna, "subsurface_method", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom2");
 	RNA_def_property_enum_items(prop, node_subsurface_method_items);
 	RNA_def_property_ui_text(prop, "Subsurface Method", "Method for rendering subsurface scattering");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNodePrincipled_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update");
 }
 
 static void def_refraction(StructRNA *srna)
@@ -4525,7 +4545,7 @@ static void def_sh_subsurface(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, prop_subsurface_falloff_items);
 	RNA_def_property_ui_text(prop, "Falloff", "Function to determine how much light nearby points contribute based on their distance to the shading point");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNodeSubsurface_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update");
 }
 
 static void def_sh_tex_ies(StructRNA *srna)
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 8c5ddaafa1e..e5bf8f49717 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
@@ -32,6 +32,7 @@
 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_("Scale"),			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Exponent"),		0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 32.0f},
 	{	-1, 0, ""	}
 };
 
@@ -47,6 +48,8 @@ static void node_shader_init_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node)
 	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->feature = SHD_VORONOI_F1;
 
 	node->storage = tex;
 }
@@ -66,6 +69,23 @@ static int node_shader_gpu_tex_voronoi(GPUMaterial *mat, bNode *node, bNodeExecD
 	return GPU_stack_link(mat, "node_tex_voronoi", in, out, GPU_uniform(&coloring));
 }
 
+static void node_shader_update_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node)
+{
+	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;
+			}
+		}
+	}
+}
+
 /* node type definition */
 void register_node_type_sh_tex_voronoi(void)
 {
@@ -77,6 +97,7 @@ void register_node_type_sh_tex_voronoi(void)
 	node_type_init(&ntype, node_shader_init_tex_voronoi);
 	node_type_storage(&ntype, "NodeTexVoronoi", node_free_standard_storage, node_copy_standard_storage);
 	node_type_gpu(&ntype, node_shader_gpu_tex_voronoi);
+	node_type_update(&ntype, node_shader_update_tex_voronoi, NULL);
 
 	nodeRegisterType(&ntype);
 }