[Bf-blender-cvs] [c107387a181] geometry-nodes-level-set-nodes: Merge branch 'master' into geometry-nodes-level-set-nodes
Hans Goudey
noreply at git.blender.org
Sun Oct 31 01:43:48 CEST 2021
Commit: c107387a181aeaecaa9b68b541c0d36aa4d1a3a7
Author: Hans Goudey
Date: Sat Oct 30 18:43:33 2021 -0500
Branches: geometry-nodes-level-set-nodes
https://developer.blender.org/rBc107387a181aeaecaa9b68b541c0d36aa4d1a3a7
Merge branch 'master' into geometry-nodes-level-set-nodes
===================================================================
===================================================================
diff --cc release/scripts/startup/nodeitems_builtins.py
index 45a8e726b81,34f447a7108..1da2f302196
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -759,19 -764,9 +764,20 @@@ geometry_node_categories =
]),
GeometryNodeCategory("GEO_VOLUME", "Volume", items=[
NodeItem("GeometryNodeLegacyPointsToVolume", poll=geometry_nodes_legacy_poll),
+ NodeItem("GeometryNodeLegacyVolumeToMesh", 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 29f38b080ae,58fea6d462c..cf16f1cec54
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1548,15 -1548,9 +1548,18 @@@ int ntreeTexExecTree(struct bNodeTree *
#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
+ #define GEO_NODE_VOLUME_TO_MESH 1133
+ #define GEO_NODE_INPUT_ID 1134
+ #define GEO_NODE_SET_ID 1135
++#define GEO_NODE_MESH_TO_LEVEL_SET 1136
++#define GEO_NODE_LEVEL_SET_BOOLEAN 1137
++#define GEO_NODE_LEVEL_SET_FILTER 1138
++#define GEO_NODE_LEVEL_SET_TO_FOG_VOLUME 1139
++#define GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE 1140
++#define GEO_NODE_LEVEL_SET_PRIMITIVE_PLATONIC 1141
++#define GEO_NODE_LEVEL_SET_MORPH 1142
++#define GEO_NODE_VOLUME_SAMPLE 1143
++#define GEO_NODE_LEVEL_SET_TO_MASK 1144
/** \} */
diff --cc source/blender/nodes/NOD_static_types.h
index 48281eda4a2,20ad4d359f1..19f833d138b
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -372,15 -367,8 +367,15 @@@ DefNode(GeometryNode, GEO_NODE_INSTANCE
DefNode(GeometryNode, GEO_NODE_INSTANCES_TO_POINTS, 0, "INSTANCES_TO_POINTS", InstancesToPoints, "Instances to Points", "")
DefNode(GeometryNode, GEO_NODE_IS_VIEWPORT, 0, "IS_VIEWPORT", IsViewport, "Is Viewport", "")
DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY", JoinGeometry, "Join Geometry", "")
+DefNode(GeometryNode, GEO_NODE_LEVEL_SET_BOOLEAN , def_geo_level_set_boolean, "LEVEL_SET_BOOLEAN", LevelSetBoolean, "Level Set Boolean", "")
+DefNode(GeometryNode, GEO_NODE_LEVEL_SET_FILTER , def_geo_level_set_filter, "LEVEL_SET_FILTER", LevelSetFilter, "Level Set Filter", "")
+DefNode(GeometryNode, GEO_NODE_LEVEL_SET_MORPH , def_geo_level_set_morph, "LEVEL_SET_MORPH", LevelSetMorph, "Level Set Morph", "")
- DefNode(GeometryNode, GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE , 0, "LEVEL_SET_PRIMITIVE_SPHERE", LevelSetSphere, "Level Set Sphere", "")
+DefNode(GeometryNode, GEO_NODE_LEVEL_SET_PRIMITIVE_PLATONIC , def_geo_level_set_primitive_platonic, "LEVEL_SET_PRIMITIVE_PLATONIC", LevelSetPlatonic, "Level Set Platonic", "")
++DefNode(GeometryNode, GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE , 0, "LEVEL_SET_PRIMITIVE_SPHERE", LevelSetSphere, "Level Set Sphere", "")
+DefNode(GeometryNode, GEO_NODE_LEVEL_SET_TO_FOG_VOLUME , 0, "LEVEL_SET_TO_FOG", LevelSetToFogVolume, "Level Set to Fog Volume", "")
+DefNode(GeometryNode, GEO_NODE_LEVEL_SET_TO_MASK , 0, "LEVEL_SET_TO_Mask", LevelSetToMask, "Level Set to Mask", "")
- DefNode(GeometryNode, GEO_NODE_REPLACE_MATERIAL, 0, "REPLACE_MATERIAL", ReplaceMaterial, "Replace Material", "")
DefNode(GeometryNode, GEO_NODE_MATERIAL_SELECTION, 0, "MATERIAL_SELECTION", MaterialSelection, "Material Selection", "")
+ DefNode(GeometryNode, GEO_NODE_MESH_BOOLEAN, def_geo_boolean, "MESH_BOOLEAN", MeshBoolean, "Mesh Boolean", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CIRCLE, def_geo_mesh_circle, "MESH_PRIMITIVE_CIRCLE", MeshCircle, "Mesh Circle", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CONE, def_geo_mesh_cone, "MESH_PRIMITIVE_CONE", MeshCone, "Cone", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CUBE, 0, "MESH_PRIMITIVE_CUBE", MeshCube, "Cube", "")
@@@ -389,9 -377,7 +384,8 @@@ DefNode(GeometryNode, GEO_NODE_MESH_PRI
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_ICO_SPHERE, 0, "MESH_PRIMITIVE_ICO_SPHERE", MeshIcoSphere, "Ico Sphere", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_LINE, def_geo_mesh_line, "MESH_PRIMITIVE_LINE", MeshLine, "Mesh Line", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_UV_SPHERE, 0, "MESH_PRIMITIVE_UV_SPHERE", MeshUVSphere, "UV Sphere", "")
- DefNode(GeometryNode, GEO_NODE_SUBDIVIDE_MESH, 0, "SUBDIVIDE_MESH", SubdivideMesh, "Subdivide Mesh", "")
DefNode(GeometryNode, GEO_NODE_MESH_TO_CURVE, 0, "MESH_TO_CURVE", MeshToCurve, "Mesh to Curve", "")
+DefNode(GeometryNode, GEO_NODE_MESH_TO_LEVEL_SET , 0, "MESH_TO_LEVEL_SET", MeshToLevelSet, "Mesh to Level Set", "")
DefNode(GeometryNode, GEO_NODE_MESH_TO_POINTS, def_geo_mesh_to_points, "MESH_TO_POINTS", MeshToPoints, "Mesh to Points", "")
DefNode(GeometryNode, GEO_NODE_OBJECT_INFO, def_geo_object_info, "OBJECT_INFO", ObjectInfo, "Object Info", "")
DefNode(GeometryNode, GEO_NODE_POINTS_TO_VERTICES, 0, "POINTS_TO_VERTICES", PointsToVertices, "Points to Vertices", "")
@@@ -399,7 -385,11 +393,12 @@@ DefNode(GeometryNode, GEO_NODE_POINTS_T
DefNode(GeometryNode, GEO_NODE_PROXIMITY, def_geo_proximity, "PROXIMITY", Proximity, "Geometry Proximity", "")
DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
DefNode(GeometryNode, GEO_NODE_REALIZE_INSTANCES, 0, "REALIZE_INSTANCES", RealizeInstances, "Realize Instances", "")
+ DefNode(GeometryNode, GEO_NODE_REPLACE_MATERIAL, 0, "REPLACE_MATERIAL", ReplaceMaterial, "Replace Material", "")
++DefNode(GeometryNode, GEO_NODE_REPLACE_MATERIAL, 0, "REPLACE_MATERIAL", ReplaceMaterial, "Replace Material", "")
+ DefNode(GeometryNode, GEO_NODE_RESAMPLE_CURVE, def_geo_curve_resample, "RESAMPLE_CURVE", ResampleCurve, "Resample Curve", "")
+ DefNode(GeometryNode, GEO_NODE_REVERSE_CURVE, 0, "REVERSE_CURVE", ReverseCurve, "Reverse Curve", "")
DefNode(GeometryNode, GEO_NODE_ROTATE_INSTANCES, 0, "ROTATE_INSTANCES", RotateInstances, "Rotate Instances", "")
+ DefNode(GeometryNode, GEO_NODE_SAMPLE_CURVE, def_geo_curve_sample, "SAMPLE_CURVE", SampleCurve, "Sample Curve", "")
DefNode(GeometryNode, GEO_NODE_SCALE_INSTANCES, 0, "SCALE_INSTANCES", ScaleInstances, "Scale Instances", "")
DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "")
DefNode(GeometryNode, GEO_NODE_SEPARATE_GEOMETRY, def_geo_separate_geometry, "SEPARATE_GEOMETRY", SeparateGeometry, "Separate Geometry", "")
@@@ -421,9 -415,9 +424,10 @@@ DefNode(GeometryNode, GEO_NODE_TRANSFER
DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
DefNode(GeometryNode, GEO_NODE_TRANSLATE_INSTANCES, 0, "TRANSLATE_INSTANCES", TranslateInstances, "Translate Instances", "")
DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
- DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")
- DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
+ DefNode(GeometryNode, GEO_NODE_TRIM_CURVE, def_geo_curve_trim, "TRIM_CURVE", TrimCurve, "Trim Curve", "")
+ DefNode(GeometryNode, GEO_NODE_VIEWER, def_geo_viewer, "VIEWER", Viewer, "Viewer", "")
+DefNode(GeometryNode, GEO_NODE_VOLUME_SAMPLE, 0, "VOLUME_SAMPLE", VolumeSample, "Sample Volume", "")
+ DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
/* undefine macros */
#undef DefNode
diff --cc source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
index d1b7c779bbc,18d674a38a4..4a980343eb7
--- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
@@@ -32,10 -32,11 +32,10 @@@ namespace blender::nodes
static void geo_node_points_to_volume_declare(NodeDeclarationBuilder &b)
{
- b.add_input<decl::Geometry>("Geometry");
- 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::Float>("Radius")
- b.add_input<decl::Geometry>(N_("Points"));
- b.add_input<decl::Float>(N_("Density")).default_value(1.0f).min(0.0f);
++ b.add_input<decl::Geometry>(N_("Geometry"));
+ b.add_input<decl::Float>(N_("Voxel Size")).default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE);
+ b.add_input<decl::Float>(N_("Voxel Amount")).default_value(64.0f).min(0.0f);
+ b.add_input<decl::Float>(N_("Radius"))
.default_value(0.5f)
.min(0.0f)
.subtype(PROP_DISTANCE)
@@@ -210,13 -222,14 +210,13 @@@ static void initialize_volume_component
Volume *volume = (Volume *)BKE_id_new_nomain(ID_VO, nullptr);
BKE_volume_init_grids(volume);
- const float density = params.get_input<float>("Density");
convert_to_grid_index_space(voxel_size, positions, radii);
- openvdb::FloatGrid::Ptr new_grid = generate_volume_from_points(positions, radii, density);
+ openvdb::FloatGrid::Ptr new_grid = generate_volume_from_points(positions, radii);
new_grid->tra
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list