Commit: 00541898a1c26022bec3a9f04c0557812add77f2 Author: Hans Goudey Date: Wed Sep 1 23:49:20 2021 -0500 Branches: geometry-nodes-level-set-nodes https://developer.blender.org/rB00541898a1c26022bec3a9f04c0557812add77f2
Merge branch 'master' into geometry-nodes-level-set-nodes =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index 9ded7d38f1a,5e0526ab262..dfacb4bfdc6 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1472,15 -1482,7 +1482,16 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_CURVE_SET_HANDLES 1072 #define GEO_NODE_CURVE_SPLINE_TYPE 1073 #define GEO_NODE_CURVE_SELECT_HANDLES 1074 - #define GEO_NODE_MESH_TO_LEVEL_SET 1075 - #define GEO_NODE_LEVEL_SET_BOOLEAN 1076 - #define GEO_NODE_LEVEL_SET_FILTER 1077 - #define GEO_NODE_LEVEL_SET_TO_FOG_VOLUME 1078 - #define GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE 1079 - #define GEO_NODE_LEVEL_SET_PRIMITIVE_PLATONIC 1080 - #define GEO_NODE_LEVEL_SET_MORPH 1081 - #define GEO_NODE_VOLUME_SAMPLE 1082 - #define GEO_NODE_LEVEL_SET_TO_MASK 1083 + #define GEO_NODE_CURVE_FILL 1075 ++#define GEO_NODE_MESH_TO_LEVEL_SET 1076 ++#define GEO_NODE_LEVEL_SET_BOOLEAN 1077 ++#define GEO_NODE_LEVEL_SET_FILTER 1078 ++#define GEO_NODE_LEVEL_SET_TO_FOG_VOLUME 1079 ++#define GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE 1080 ++#define GEO_NODE_LEVEL_SET_PRIMITIVE_PLATONIC 1081 ++#define GEO_NODE_LEVEL_SET_MORPH 1082 ++#define GEO_NODE_VOLUME_SAMPLE 1083 ++#define GEO_NODE_LEVEL_SET_TO_MASK 1084 /** \} */ diff --cc source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc index d971ac4cf21,8f34fff9f66..4804ee8920e --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc @@@ -28,19 -28,18 +28,17 @@@ #include "UI_interface.h" #include "UI_resources.h" - static bNodeSocketTemplate geo_node_points_to_volume_in[] = { - {SOCK_GEOMETRY, N_("Geometry")}, - {SOCK_FLOAT, N_("Voxel Size"), 0.3f, 0.0f, 0.0f, 0.0f, 0.01f, FLT_MAX, PROP_DISTANCE}, - {SOCK_FLOAT, N_("Voxel Amount"), 64.0f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX}, - {SOCK_STRING, N_("Radius")}, - {SOCK_FLOAT, N_("Radius"), 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX}, - {-1, ""}, - }; + namespace blender::nodes { - static bNodeSocketTemplate geo_node_points_to_volume_out[] = { - {SOCK_GEOMETRY, N_("Geometry")}, - {-1, ""}, - }; + static void geo_node_points_to_volume_declare(NodeDeclarationBuilder &b) + { + b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Float>("Density").default_value(1.0f).min(0.0f); + b.add_input<decl::Float>("Voxel Size").default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>("Voxel Amount").default_value(64.0f).min(0.0f); + b.add_input<decl::String>("Radius"); + b.add_input<decl::Float>("Radius", "Radius_001").default_value(0.5f).min(0.0f); + b.add_output<decl::Geometry>("Geometry"); + } static void geo_node_points_to_volume_layout(uiLayout *layout, bContext *UNUSED(C), @@@ -249,8 -263,7 +245,7 @@@ void register_node_type_geo_points_to_v static bNodeType ntype; geo_node_type_base( - &ntype, GEO_NODE_POINTS_TO_VOLUME, "Points to Volume", NODE_CLASS_GEOMETRY, 0); + &ntype, GEO_NODE_POINTS_TO_VOLUME, "Points to Level Set", NODE_CLASS_GEOMETRY, 0); - node_type_socket_templates(&ntype, geo_node_points_to_volume_in, geo_node_points_to_volume_out); node_type_storage(&ntype, "NodeGeometryPointsToVolume", node_free_standard_storage, _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs