[Bf-blender-cvs] [2d8bf2dffdc] 2d: renaming and cleanup
Johnny Matthews
noreply at git.blender.org
Wed Feb 2 19:04:57 CET 2022
Commit: 2d8bf2dffdcf2e71457ab710c6817be0f60bfe09
Author: Johnny Matthews
Date: Wed Feb 2 10:06:58 2022 -0600
Branches: 2d
https://developer.blender.org/rB2d8bf2dffdcf2e71457ab710c6817be0f60bfe09
renaming and cleanup
===================================================================
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/node_tree_update.cc
M source/blender/editors/space_node/drawnode.cc
M source/blender/editors/space_node/node_relationships.cc
M source/blender/editors/space_node/node_templates.cc
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/modifiers/intern/MOD_nodes.cc
M source/blender/nodes/NOD_socket_declarations.hh
M source/blender/nodes/geometry/node_geometry_tree.cc
M source/blender/nodes/geometry/node_geometry_util.cc
M source/blender/nodes/geometry/nodes/node_geo_switch.cc
M source/blender/nodes/geometry/nodes/node_geo_viewer.cc
M source/blender/nodes/intern/node_exec.cc
M source/blender/nodes/intern/node_geometry_exec.cc
M source/blender/nodes/intern/node_socket.cc
M source/blender/nodes/intern/node_socket_declarations.cc
M source/blender/nodes/intern/node_util.c
M source/blender/nodes/intern/node_util.h
===================================================================
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 7276e5205f0..41cd4ac8155 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -322,7 +322,7 @@ static void library_foreach_node_socket(LibraryForeachIDData *data, bNodeSocket
}
case SOCK_FLOAT:
case SOCK_VECTOR:
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
case SOCK_RGBA:
case SOCK_BOOLEAN:
case SOCK_INT:
@@ -458,8 +458,8 @@ static void write_node_socket_default_value(BlendWriter *writer, bNodeSocket *so
case SOCK_VECTOR:
BLO_write_struct(writer, bNodeSocketValueVector, sock->default_value);
break;
- case SOCK_VECTOR2D:
- BLO_write_struct(writer, bNodeSocketValueVector2d, sock->default_value);
+ case SOCK_VECTOR_2D:
+ BLO_write_struct(writer, bNodeSocketValueVector2D, sock->default_value);
break;
case SOCK_RGBA:
BLO_write_struct(writer, bNodeSocketValueRGBA, sock->default_value);
@@ -885,7 +885,7 @@ static void lib_link_node_socket(BlendLibReader *reader, Library *lib, bNodeSock
}
case SOCK_FLOAT:
case SOCK_VECTOR:
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
case SOCK_RGBA:
case SOCK_BOOLEAN:
case SOCK_INT:
@@ -981,7 +981,7 @@ static void expand_node_socket(BlendExpander *expander, bNodeSocket *sock)
}
case SOCK_FLOAT:
case SOCK_VECTOR:
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
case SOCK_RGBA:
case SOCK_BOOLEAN:
case SOCK_INT:
@@ -1584,7 +1584,7 @@ static void socket_id_user_increment(bNodeSocket *sock)
}
case SOCK_FLOAT:
case SOCK_VECTOR:
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
case SOCK_RGBA:
case SOCK_BOOLEAN:
case SOCK_INT:
@@ -1638,7 +1638,7 @@ static void socket_id_user_decrement(bNodeSocket *sock)
}
case SOCK_FLOAT:
case SOCK_VECTOR:
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
case SOCK_RGBA:
case SOCK_BOOLEAN:
case SOCK_INT:
@@ -1772,7 +1772,7 @@ const char *nodeStaticSocketType(int type, int subtype)
default:
return "NodeSocketVector";
}
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
switch (subtype) {
// case PROP_TRANSLATION:
// return "NodeSocketVectorTranslation";
@@ -1784,11 +1784,11 @@ const char *nodeStaticSocketType(int type, int subtype)
// return "NodeSocketVectorAcceleration";
// case PROP_EULER:
// return "NodeSocketVectorEuler";
- // case PROP_XYZ:
- // return "NodeSocketVectorXYZ";
+ case PROP_XYZ:
+ return "NodeSocketVectorXYZ";
// case PROP_NONE:
default:
- return "NodeSocketVector2d";
+ return "NodeSocketVector2D";
}
case SOCK_RGBA:
return "NodeSocketColor";
@@ -1867,8 +1867,8 @@ const char *nodeStaticSocketInterfaceType(int type, int subtype)
default:
return "NodeSocketInterfaceVector";
}
- case SOCK_VECTOR2D:
- return "NodeSocketInterfaceVector2d";
+ case SOCK_VECTOR_2D:
+ return "NodeSocketInterfaceVector2D";
case SOCK_RGBA:
return "NodeSocketInterfaceColor";
case SOCK_STRING:
@@ -1902,8 +1902,8 @@ const char *nodeStaticSocketLabel(int type, int UNUSED(subtype))
return "Boolean";
case SOCK_VECTOR:
return "Vector";
- case SOCK_VECTOR2D:
- return "Vector2d";
+ case SOCK_VECTOR_2D:
+ return "Vector2D";
case SOCK_RGBA:
return "Color";
case SOCK_STRING:
diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc
index 9fafb57ae54..6c3ca1f81a6 100644
--- a/source/blender/blenkernel/intern/node_tree_update.cc
+++ b/source/blender/blenkernel/intern/node_tree_update.cc
@@ -82,7 +82,7 @@ namespace node_field_inferencing {
static bool is_field_socket_type(eNodeSocketDatatype type)
{
- return ELEM(type, SOCK_FLOAT, SOCK_INT, SOCK_BOOLEAN, SOCK_VECTOR, SOCK_RGBA);
+ return ELEM(type, SOCK_FLOAT, SOCK_INT, SOCK_BOOLEAN, SOCK_VECTOR, SOCK_VECTOR_2D, SOCK_RGBA);
}
static bool is_field_socket_type(const SocketRef &socket)
@@ -609,6 +609,20 @@ static int get_internal_link_type_priority(const bNodeSocketType *from, const bN
case SOCK_VECTOR:
switch (from->type) {
case SOCK_VECTOR:
+ return 5;
+ case SOCK_VECTOR_2D:
+ return 4;
+ case SOCK_FLOAT:
+ return 3;
+ case SOCK_INT:
+ return 2;
+ case SOCK_BOOLEAN:
+ return 1;
+ }
+ return -1;
+ case SOCK_VECTOR_2D:
+ switch (from->type) {
+ case SOCK_VECTOR_2D:
return 4;
case SOCK_FLOAT:
return 3;
@@ -618,18 +632,6 @@ static int get_internal_link_type_priority(const bNodeSocketType *from, const bN
return 1;
}
return -1;
- // case SOCK_VECTOR2D:
- // switch (from->type) {
- // case SOCK_VECTOR2D:
- // return 4;
- // case SOCK_FLOAT:
- // return 3;
- // case SOCK_INT:
- // return 2;
- // case SOCK_BOOLEAN:
- // return 1;
- // }
- // return -1;
case SOCK_FLOAT:
switch (from->type) {
case SOCK_FLOAT:
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 59d535e1525..2e6c7c280aa 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -1166,7 +1166,7 @@ static const float std_node_socket_colors[][4] = {
{0.96, 0.96, 0.96, 1.0}, /* SOCK_COLLECTION */
{0.62, 0.31, 0.64, 1.0}, /* SOCK_TEXTURE */
{0.92, 0.46, 0.51, 1.0}, /* SOCK_MATERIAL */
- {0.59, 0.59, 0.98, 1.0}, /* SOCK_VECTOR2D */
+ {0.59, 0.59, 0.98, 1.0}, /* SOCK_VECTOR_2D */
};
/* common color callbacks for standard types */
@@ -1289,18 +1289,13 @@ static void std_node_socket_draw(
}
}
break;
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
if (sock->flag & SOCK_COMPACT) {
uiTemplateComponentMenu(layout, ptr, "default_value", text);
}
else {
- if (sock->typeinfo->subtype == PROP_DIRECTION) {
- uiItemR(layout, ptr, "default_value", DEFAULT_FLAGS, "", ICON_NONE);
- }
- else {
- uiLayout *column = uiLayoutColumn(layout, true);
- uiItemR(column, ptr, "default_value", DEFAULT_FLAGS, text, ICON_NONE);
- }
+ uiLayout *column = uiLayoutColumn(layout, true);
+ uiItemR(column, ptr, "default_value", DEFAULT_FLAGS, text, ICON_NONE);
}
break;
case SOCK_RGBA: {
@@ -1427,14 +1422,8 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout
uiItemR(sub, ptr, "max_value", DEFAULT_FLAGS, IFACE_("Max"), ICON_NONE);
break;
}
- case SOCK_VECTOR: {
- uiItemR(col, ptr, "default_value", UI_ITEM_R_EXPAND, IFACE_("Default"), ICON_NONE);
- uiLayout *sub = uiLayoutColumn(col, true);
- uiItemR(sub, ptr, "min_value", DEFAULT_FLAGS, IFACE_("Min"), ICON_NONE);
- uiItemR(sub, ptr, "max_value", DEFAULT_FLAGS, IFACE_("Max"), ICON_NONE);
- break;
- }
- case SOCK_VECTOR2D: {
+ case SOCK_VECTOR:
+ case SOCK_VECTOR_2D: {
uiItemR(col, ptr, "default_value", UI_ITEM_R_EXPAND, IFACE_("Default"), ICON_NONE);
uiLayout *sub = uiLayoutColumn(col, true);
uiItemR(sub, ptr, "min_value", DEFAULT_FLAGS, IFACE_("Min"), ICON_NONE);
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index d7f0514cbb7..0667d498334 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -471,7 +471,7 @@ static bool socket_can_be_viewed(const OutputSocketRef &socket)
SOCK_GEOMETRY,
SOCK_FLOAT,
SOCK_VECTOR,
- SOCK_VECTOR2D,
+ SOCK_VECTOR_2D,
SOCK_INT,
SOCK_BOOLEAN,
SOCK_RGBA);
@@ -486,7 +486,7 @@ static CustomDataType socket_type_to_custom_data_type(const eNodeSocketDatatype
return CD_PROP_INT32;
case SOCK_VECTOR:
return CD_PROP_FLOAT3;
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
return CD_PROP_FLOAT2;
case SOCK_BOOLEAN:
return CD_PROP_BOOL;
@@ -2046,7 +2046,7 @@ static int get_main_socket_priority(const bNodeSocket *socket)
case SOCK_COLLECTION:
case SOCK_TEXTURE:
case SOCK_MATERIAL:
- case SOCK_VECTOR2D:
+ case SOCK_VECTOR_2D:
return 6;
}
return -1;
diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc
index 91cdaa6b98e..f072089c33c 100644
--- a/source/blender/editors/space_node/node_templates.cc
+++ b/source/blender/editors/space_node/node_templates.cc
@@ -394,8 +394,8 @@ static Vector<NodeLinkItem> ui_node_link_items(NodeLinkArg *arg,
else if (dynamic_cast<const decl::Vector *>(&socket_decl)) {
item.socket_type = SOCK_VECTOR;
}
- else if (dynamic_cast<const decl::Vector2d *>(&socket_decl)) {
- item.socket_type = SOCK_VECTOR2D;
+ else if (dynamic_cast<const decl::Vector2D *>(&socket_decl)) {
+ item.socket_type = SOCK_VECTOR_2D;
}
else if (dynamic_cast<const decl::Color *>(&socket_decl)) {
item.socket_type = SOCK_RGBA;
@@ -880,13 +880,8 @@ static void ui_node_draw_input(
switch (input->type) {
case SOCK_VECTOR:
- if (input->type == SOCK_VECTOR) {
- uiItemS(row);
- sub = uiLayoutColumn(row, true);
- }
- ATTR_FALLTHROUGH;
- case SOCK_VECTOR2D:
- if (input->type == SOCK_VECTOR2D) {
+ case SOCK_VECTOR_2D:
+ if (ELEM(input->type, SOCK_VECTOR_2D, SOCK_VECTOR)) {
uiItemS(row);
sub = uiLayoutColumn(row, true);
}
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_typ
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list