[Bf-blender-cvs] [47d0b2f14e8] geometry-nodes-level-set-nodes: Merge branch 'master' into geometry-nodes-level-set-nodes
Hans Goudey
noreply at git.blender.org
Mon Oct 25 20:14:36 CEST 2021
Commit: 47d0b2f14e818ee8e0116df47421ba0a52596790
Author: Hans Goudey
Date: Mon Oct 25 12:48:15 2021 -0500
Branches: geometry-nodes-level-set-nodes
https://developer.blender.org/rB47d0b2f14e818ee8e0116df47421ba0a52596790
Merge branch 'master' into geometry-nodes-level-set-nodes
===================================================================
===================================================================
diff --cc release/scripts/startup/nodeitems_builtins.py
index 7e79dc0bb20,b1a3d8a762d..45a8e726b81
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -593,23 -757,10 +757,21 @@@ geometry_node_categories =
NodeItem("ShaderNodeVectorMath"),
NodeItem("ShaderNodeVectorRotate"),
]),
- GeometryNodeCategory("GEO_OUTPUT", "Output", items=[
- NodeItem("GeometryNodeViewer"),
- ]),
GeometryNodeCategory("GEO_VOLUME", "Volume", items=[
- NodeItem("GeometryNodePointsToVolume"),
+ NodeItem("GeometryNodeLegacyPointsToVolume", poll=geometry_nodes_legacy_poll),
+
NodeItem("GeometryNodeVolumeToMesh"),
+ NodeItem("GeometryNodeMeshToLevelSet"),
+ NodeItem("GeometryNodeLevelSetBoolean"),
+ NodeItem("GeometryNodeLevelSetFilter"),
+ NodeItem("GeometryNodeLevelSetToFogVolume"),
+ NodeItem("GeometryNodeLevelSetToMask"),
+ NodeItem("GeometryNodeLevelSetMorph"),
+ NodeItem("GeometryNodeVolumeSample"),
+ ]),
+ GeometryNodeCategory("GEO_PRIMITIVES_VOLUME", "Volume Primitives", items=[
+ NodeItem("GeometryNodeLevelSetSphere"),
+ NodeItem("GeometryNodeLevelSetPlatonic"),
]),
GeometryNodeCategory("GEO_GROUP", "Group", items=node_group_items),
GeometryNodeCategory("GEO_LAYOUT", "Layout", items=[
diff --cc source/blender/blenkernel/BKE_node.h
index 27effceb7a0,c868eb414f7..29f38b080ae
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1477,22 -1485,69 +1485,78 @@@ int ntreeTexExecTree(struct bNodeTree *
#define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
#define GEO_NODE_VIEWER 1067
#define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
- #define GEO_NODE_CURVE_ENDPOINTS 1069
+ #define GEO_NODE_LEGACY_CURVE_ENDPOINTS 1069
#define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
- #define GEO_NODE_CURVE_TRIM 1071
- #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_CURVE_SPLINE_TYPE 1073
- #define GEO_NODE_CURVE_SELECT_HANDLES 1074
- #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
+ #define GEO_NODE_TRIM_CURVE 1071
+ #define GEO_NODE_LEGACY_CURVE_SET_HANDLES 1072
+ #define GEO_NODE_LEGACY_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_LEGACY_CURVE_SELECT_HANDLES 1074
+ #define GEO_NODE_FILL_CURVE 1075
+ #define GEO_NODE_INPUT_POSITION 1076
+ #define GEO_NODE_SET_POSITION 1077
+ #define GEO_NODE_INPUT_INDEX 1078
+ #define GEO_NODE_INPUT_NORMAL 1079
+ #define GEO_NODE_CAPTURE_ATTRIBUTE 1080
+ #define GEO_NODE_MATERIAL_SELECTION 1081
+ #define GEO_NODE_SET_MATERIAL 1082
+ #define GEO_NODE_REALIZE_INSTANCES 1083
+ #define GEO_NODE_ATTRIBUTE_STATISTIC 1084
+ #define GEO_NODE_SAMPLE_CURVE 1085
+ #define GEO_NODE_INPUT_TANGENT 1086
+ #define GEO_NODE_STRING_JOIN 1087
+ #define GEO_NODE_CURVE_PARAMETER 1088
+ #define GEO_NODE_FILLET_CURVE 1089
+ #define GEO_NODE_DISTRIBUTE_POINTS_ON_FACES 1090
+ #define GEO_NODE_STRING_TO_CURVES 1091
+ #define GEO_NODE_INSTANCE_ON_POINTS 1092
+ #define GEO_NODE_MESH_TO_POINTS 1093
+ #define GEO_NODE_POINTS_TO_VERTICES 1094
+ #define GEO_NODE_REVERSE_CURVE 1095
+ #define GEO_NODE_PROXIMITY 1096
+ #define GEO_NODE_SUBDIVIDE_CURVE 1097
+ #define GEO_NODE_INPUT_SPLINE_LENGTH 1098
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1099
+ #define GEO_NODE_CURVE_SET_HANDLES 1100
+ #define GEO_NODE_POINTS_TO_VOLUME 1101
+ #define GEO_NODE_CURVE_HANDLE_TYPE_SELECTION 1102
+ #define GEO_NODE_DELETE_GEOMETRY 1103
+ #define GEO_NODE_SEPARATE_GEOMETRY 1104
+ #define GEO_NODE_INPUT_RADIUS 1105
+ #define GEO_NODE_INPUT_CURVE_TILT 1106
+ #define GEO_NODE_INPUT_CURVE_HANDLES 1107
+ #define GEO_NODE_INPUT_SHADE_SMOOTH 1108
+ #define GEO_NODE_INPUT_SPLINE_RESOLUTION 1109
+ #define GEO_NODE_INPUT_SPLINE_CYCLIC 1110
+ #define GEO_NODE_SET_CURVE_RADIUS 1111
+ #define GEO_NODE_SET_CURVE_TILT 1112
+ #define GEO_NODE_SET_CURVE_HANDLES 1113
+ #define GEO_NODE_SET_SHADE_SMOOTH 1114
+ #define GEO_NODE_SET_SPLINE_RESOLUTION 1115
+ #define GEO_NODE_SET_SPLINE_CYCLIC 1116
+ #define GEO_NODE_SET_POINT_RADIUS 1117
+ #define GEO_NODE_INPUT_MATERIAL_INDEX 1118
+ #define GEO_NODE_SET_MATERIAL_INDEX 1119
+ #define GEO_NODE_TRANSLATE_INSTANCES 1120
+ #define GEO_NODE_SCALE_INSTANCES 1121
+ #define GEO_NODE_ROTATE_INSTANCES 1122
+ #define GEO_NODE_SPLIT_EDGES 1123
+ #define GEO_NODE_MESH_TO_CURVE 1124
+ #define GEO_NODE_TRANSFER_ATTRIBUTE 1125
+ #define GEO_NODE_SUBDIVISION_SURFACE 1126
+ #define GEO_NODE_CURVE_ENDPOINT_SELECTION 1127
+ #define GEO_NODE_RAYCAST 1128
+ #define GEO_NODE_CURVE_TO_POINTS 1130
+ #define GEO_NODE_INSTANCES_TO_POINTS 1131
+ #define GEO_NODE_IMAGE_TEXTURE 1132
++#define GEO_NODE_MESH_TO_LEVEL_SET 1133
++#define GEO_NODE_LEVEL_SET_BOOLEAN 1134
++#define GEO_NODE_LEVEL_SET_FILTER 1135
++#define GEO_NODE_LEVEL_SET_TO_FOG_VOLUME 1136
++#define GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE 1137
++#define GEO_NODE_LEVEL_SET_PRIMITIVE_PLATONIC 1138
++#define GEO_NODE_LEVEL_SET_MORPH 1139
++#define GEO_NODE_VOLUME_SAMPLE 1140
++#define GEO_NODE_LEVEL_SET_TO_MASK 1141
/** \} */
diff --cc source/blender/blenkernel/intern/node.cc
index 9a1e15c3b7e,0452481849b..66e136f4e6f
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5173,19 -5798,28 +5798,35 @@@ static void registerGeometryNodes(
register_node_type_geo_curve_to_points();
register_node_type_geo_curve_trim();
register_node_type_geo_delete_geometry();
+ register_node_type_geo_distribute_points_on_faces();
register_node_type_geo_edge_split();
+ register_node_type_geo_image_texture();
+ register_node_type_geo_input_curve_handles();
+ register_node_type_geo_input_curve_tilt();
+ register_node_type_geo_input_index();
+ register_node_type_geo_input_material_index();
register_node_type_geo_input_material();
+ register_node_type_geo_input_normal();
+ register_node_type_geo_input_position();
+ register_node_type_geo_input_radius();
+ register_node_type_geo_input_shade_smooth();
+ register_node_type_geo_input_spline_cyclic();
+ register_node_type_geo_input_spline_length();
+ register_node_type_geo_input_spline_resolution();
+ register_node_type_geo_input_tangent();
+ register_node_type_geo_instance_on_points();
+ register_node_type_geo_instances_to_points();
register_node_type_geo_is_viewport();
register_node_type_geo_join_geometry();
+ register_node_type_geo_level_set_boolean();
+ register_node_type_geo_level_set_filter();
+ register_node_type_geo_level_set_morph();
+ register_node_type_geo_level_set_primitive_platonic();
+ register_node_type_geo_level_set_primitive_sphere();
+ register_node_type_geo_level_set_to_fog_volume();
+ register_node_type_geo_level_set_to_mask();
- register_node_type_geo_material_assign();
register_node_type_geo_material_replace();
+ register_node_type_geo_material_selection();
register_node_type_geo_mesh_primitive_circle();
register_node_type_geo_mesh_primitive_cone();
register_node_type_geo_mesh_primitive_cube();
@@@ -5196,7 -5830,7 +5837,8 @@@
register_node_type_geo_mesh_primitive_uv_sphere();
register_node_type_geo_mesh_subdivide();
register_node_type_geo_mesh_to_curve();
+ register_node_type_geo_mesh_to_level_set();
+ register_node_type_geo_mesh_to_points();
register_node_type_geo_object_info();
register_node_type_geo_point_distribute();
register_node_type_geo_point_instance();
@@@ -5204,18 -5838,35 +5846,36 @@@
register_node_type_geo_point_scale();
register_node_type_geo_point_separate();
register_node_type_geo_point_translate();
+ register_node_type_geo_points_to_vertices();
register_node_type_geo_points_to_volume();
+ register_node_type_geo_proximity();
register_node_type_geo_raycast();
+ register_node_type_geo_realize_instances();
+ register_node_type_geo_rotate_instances();
register_node_type_geo_sample_texture();
- register_node_type_geo_select_by_handle_type();
- register_node_type_geo_select_by_material();
+ register_node_type_geo_scale_instances();
register_node_type_geo_separate_components();
+ register_node_type_geo_separate_geometry();
+ register_node_type_geo_set_curve_handles();
+ register_node_type_geo_set_curve_radius();
+ register_node_type_geo_set_curve_tilt();
+ register_node_type_geo_set_material_index();
+ register_node_type_geo_set_material();
+ register_node_type_geo_set_point_radius();
+ register_node_type_geo_set_position();
+ register_node_type_geo_set_shade_smooth();
+ register_node_type_geo_set_spline_cyclic();
+ register_node_type_geo_set_spline_resolution();
+ register_node_type_geo_string_join();
+ register_node_type_geo_string_to_curves();
register_node_type_geo_subdivision_surface();
register_node_type_geo_switch();
+ register_node_type_geo_transfer_attribute();
register_node_type_geo_transform();
+ register_node_type_geo_translate_instances();
register_node_type_geo_triangulate();
register_node_type_geo_viewer();
+ register_node_type_geo_volume_sample();
register_node_type_geo_volume_to_mesh();
}
diff --cc source/blender/makesdna/DNA_node_types.h
index 5830d5c3503,c2eb67b7dd8..b2ed6a1d65c
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -2014,49 -2180,32 +2202,60 @@@ typedef enum GeometryNodeCurvePrimitive
GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT_OFFSET = 1,
} GeometryNodeCurvePrimitiveBezierSegmentMode;
+ typedef enum GeometryNodeCurveResampleMode {
+ GEO_NODE_CURVE_RESAMPLE_COUNT = 0,
+ GEO_NODE_CURVE_RESAMPLE_LENGTH = 1,
+ GEO_NODE_CURVE_RESAMPLE_EVALUATED = 2,
+ } GeometryNodeCurveResampleMode;
+
typedef enum GeometryNodeCurveSampleMode {
- GEO_NODE_CURVE_SAMPLE_COUNT = 0,
+ GEO_NODE_CURVE_SAMPLE_FACTOR = 0,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list