[Bf-blender-cvs] [c373811abd9] soc-2019-cycles-procedural: Rename "distance" to "metric" in voronoi node.

OmarSquircleArt noreply at git.blender.org
Wed Jun 26 14:10:17 CEST 2019


Commit: c373811abd922cb1fb23e8ce10f4dc9c25aa0354
Author: OmarSquircleArt
Date:   Wed Jun 26 14:11:19 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rBc373811abd922cb1fb23e8ce10f4dc9c25aa0354

Rename "distance" to "metric" in voronoi node.

The distance metric enum was named "distance" before, which is very bad since we have functions and variables called "distance". We renamed that to "metric", however, DNA and RNA names are still the same for backeward compatibility.

===================================================================

M	intern/cycles/blender/blender_shader.cpp
M	intern/cycles/kernel/shaders/node_voronoi_texture.osl
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/nodes.h

===================================================================

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 66b63460506..d8fd3fbc06b 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -728,7 +728,7 @@ static ShaderNode *add_node(Scene *scene,
     VoronoiTextureNode *voronoi = new VoronoiTextureNode();
     voronoi->dimensions = b_voronoi_node.dimensions();
     voronoi->feature = (NodeVoronoiFeature)b_voronoi_node.feature();
-    voronoi->distance = (NodeVoronoiDistanceMetric)b_voronoi_node.distance();
+    voronoi->metric = (NodeVoronoiDistanceMetric)b_voronoi_node.distance();
     BL::TexMapping b_texture_mapping(b_voronoi_node.texture_mapping());
     get_tex_mapping(&voronoi->tex_mapping, b_texture_mapping);
     node = voronoi;
diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl
index 0df2617057b..651f9fc5b43 100644
--- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl
+++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl
@@ -920,8 +920,8 @@ shader node_voronoi_texture(
     int use_mapping = 0,
     matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     string dimensions = "3D",
-    string distance = "euclidean",
     string feature = "f1",
+    string metric = "euclidean",
     vector3 Vector = P,
     float WIn = 0.0,
     float Scale = 5.0,
@@ -946,13 +946,13 @@ shader node_voronoi_texture(
 
   if (dimensions == "1D") {
     if (feature == "f1") {
-      voronoi_f1_1d(w, Exponent, jitter, distance, Distance, Color, WOut);
+      voronoi_f1_1d(w, Exponent, jitter, metric, Distance, Color, WOut);
     }
     else if (feature == "smooth_f1") {
-      voronoi_smooth_f1_1d(w, smoothness, Exponent, jitter, distance, Distance, Color, WOut);
+      voronoi_smooth_f1_1d(w, smoothness, Exponent, jitter, metric, Distance, Color, WOut);
     }
     else if (feature == "f2") {
-      voronoi_f2_1d(w, Exponent, jitter, distance, Distance, Color, WOut);
+      voronoi_f2_1d(w, Exponent, jitter, metric, Distance, Color, WOut);
     }
     else if (feature == "distance_to_edge") {
       voronoi_distance_to_edge_1d(w, jitter, Distance);
@@ -969,14 +969,14 @@ shader node_voronoi_texture(
     vector2 coord2D = vector2(coord[0], coord[1]);
     vector2 outPosition2D;
     if (feature == "f1") {
-      voronoi_f1_2d(coord2D, Exponent, jitter, distance, Distance, Color, outPosition2D);
+      voronoi_f1_2d(coord2D, Exponent, jitter, metric, Distance, Color, outPosition2D);
     }
     else if (feature == "smooth_f1") {
       voronoi_smooth_f1_2d(
-          coord2D, smoothness, Exponent, jitter, distance, Distance, Color, outPosition2D);
+          coord2D, smoothness, Exponent, jitter, metric, Distance, Color, outPosition2D);
     }
     else if (feature == "f2") {
-      voronoi_f2_2d(coord2D, Exponent, jitter, distance, Distance, Color, outPosition2D);
+      voronoi_f2_2d(coord2D, Exponent, jitter, metric, Distance, Color, outPosition2D);
     }
     else if (feature == "distance_to_edge") {
       voronoi_distance_to_edge_2d(coord2D, jitter, Distance);
@@ -992,13 +992,13 @@ shader node_voronoi_texture(
   }
   else if (dimensions == "3D") {
     if (feature == "f1") {
-      voronoi_f1_3d(coord, Exponent, jitter, distance, Distance, Color, Position);
+      voronoi_f1_3d(coord, Exponent, jitter, metric, Distance, Color, Position);
     }
     else if (feature == "smooth_f1") {
-      voronoi_smooth_f1_3d(coord, smoothness, Exponent, jitter, distance, Distance, Color, Position);
+      voronoi_smooth_f1_3d(coord, smoothness, Exponent, jitter, metric, Distance, Color, Position);
     }
     else if (feature == "f2") {
-      voronoi_f2_3d(coord, Exponent, jitter, distance, Distance, Color, Position);
+      voronoi_f2_3d(coord, Exponent, jitter, metric, Distance, Color, Position);
     }
     else if (feature == "distance_to_edge") {
       voronoi_distance_to_edge_3d(coord, jitter, Distance);
@@ -1015,14 +1015,14 @@ shader node_voronoi_texture(
     vector4 coord4D = vector4(coord[0], coord[1], coord[2], w);
     vector4 outPosition4D;
     if (feature == "f1") {
-      voronoi_f1_4d(coord4D, Exponent, jitter, distance, Distance, Color, outPosition4D);
+      voronoi_f1_4d(coord4D, Exponent, jitter, metric, Distance, Color, outPosition4D);
     }
     else if (feature == "smooth_f1") {
       voronoi_smooth_f1_4d(
-          coord4D, smoothness, Exponent, jitter, distance, Distance, Color, outPosition4D);
+          coord4D, smoothness, Exponent, jitter, metric, Distance, Color, outPosition4D);
     }
     else if (feature == "f2") {
-      voronoi_f2_4d(coord4D, Exponent, jitter, distance, Distance, Color, outPosition4D);
+      voronoi_f2_4d(coord4D, Exponent, jitter, metric, Distance, Color, outPosition4D);
     }
     else if (feature == "distance_to_edge") {
       voronoi_distance_to_edge_4d(coord4D, jitter, Distance);
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index eb68c152108..9f59e7205b5 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -951,12 +951,12 @@ NODE_DEFINE(VoronoiTextureNode)
   dimensions_enum.insert("4D", 4);
   SOCKET_ENUM(dimensions, "Dimensions", dimensions_enum, 3);
 
-  static NodeEnum distance_enum;
-  distance_enum.insert("euclidean", NODE_VORONOI_EUCLIDEAN);
-  distance_enum.insert("manhattan", NODE_VORONOI_MANHATTAN);
-  distance_enum.insert("chebychev", NODE_VORONOI_CHEBYCHEV);
-  distance_enum.insert("minkowski", NODE_VORONOI_MINKOWSKI);
-  SOCKET_ENUM(distance, "Distance Metric", distance_enum, NODE_VORONOI_EUCLIDEAN);
+  static NodeEnum metric_enum;
+  metric_enum.insert("euclidean", NODE_VORONOI_EUCLIDEAN);
+  metric_enum.insert("manhattan", NODE_VORONOI_MANHATTAN);
+  metric_enum.insert("chebychev", NODE_VORONOI_CHEBYCHEV);
+  metric_enum.insert("minkowski", NODE_VORONOI_MINKOWSKI);
+  SOCKET_ENUM(metric, "Distance Metric", metric_enum, NODE_VORONOI_EUCLIDEAN);
 
   static NodeEnum feature_enum;
   feature_enum.insert("f1", NODE_VORONOI_F1);
@@ -1004,7 +1004,7 @@ void VoronoiTextureNode::compile(SVMCompiler &compiler)
 
   int vector_offset = tex_mapping.compile_begin(compiler, vector_in);
 
-  compiler.add_node(NODE_TEX_VORONOI, dimensions, feature, distance);
+  compiler.add_node(NODE_TEX_VORONOI, dimensions, feature, metric);
   compiler.add_node(compiler.encode_uchar4(vector_offset,
                                            compiler.stack_assign_if_linked(w_in),
                                            compiler.stack_assign_if_linked(scale_in),
@@ -1031,8 +1031,8 @@ void VoronoiTextureNode::compile(OSLCompiler &compiler)
   tex_mapping.compile(compiler);
 
   compiler.parameter(this, "dimensions");
-  compiler.parameter(this, "distance");
   compiler.parameter(this, "feature");
+  compiler.parameter(this, "metric");
   compiler.add(this, "node_voronoi_texture");
 }
 
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index e3fed25e677..a60c9caed79 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -220,7 +220,7 @@ class VoronoiTextureNode : public TextureNode {
   }
 
   int dimensions;
-  NodeVoronoiDistanceMetric distance;
+  NodeVoronoiDistanceMetric metric;
   NodeVoronoiFeature feature;
   float w, scale, exponent, smoothness, jitter;
   float3 vector;



More information about the Bf-blender-cvs mailing list