[Bf-blender-cvs] [2bba77045f4] temp-geometry-nodes-fields-prototype: Extrude and Move Node
Fabian Schempp
noreply at git.blender.org
Tue Aug 10 09:57:26 CEST 2021
Commit: 2bba77045f4086ca266c803e6435c78997fecba1
Author: Fabian Schempp
Date: Tue Aug 10 09:33:24 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB2bba77045f4086ca266c803e6435c78997fecba1
Extrude and Move Node
This adds an additional version of the extrude node, which operates on
vertices, edges and faces and moves the extruded region by a given
offset vector.
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_mesh.h
M source/blender/bmesh/operators/bmo_extrude.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/geometry/nodes/node_geo_extrude.cc
A source/blender/nodes/geometry/nodes/node_geo_extrude_and_move.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 4933f28151c..5561ac7992a 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -547,6 +547,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeSubdivisionSurface"),
NodeItem("GeometryNodeMeshSubdivide"),
NodeItem("GeometryNodeExtrude"),
+ NodeItem("GeometryNodeExtrudeAndMove"),
]),
GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
NodeItem("GeometryNodeMeshCircle"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index ae78ec7bb55..c7bb8e3ed47 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1481,6 +1481,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_INDEX 1076
#define GEO_NODE_EXTRUDE 1077
#define GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS 1078
+#define GEO_NODE_EXTRUDE_AND_MOVE 1079
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 953bb2c3d87..ae959859fbf 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5115,7 +5115,9 @@ static void registerGeometryNodes()
{
register_node_type_geo_group();
- register_node_type_geo_align_rotation_to_vector();
+ register_node_type_geo_extrude();
+
+ register_node_type_geo_attribute();
register_node_type_geo_attribute_clamp();
register_node_type_geo_attribute_color_ramp();
register_node_type_geo_attribute_combine_xyz();
@@ -5156,7 +5158,8 @@ static void registerGeometryNodes()
register_node_type_geo_curve_trim();
register_node_type_geo_delete_geometry();
register_node_type_geo_edge_split();
- register_node_type_geo_extrude();
+ register_node_type_geo_extrude_and_move();
+ register_node_type_geo_index();
register_node_type_geo_input_material();
register_node_type_geo_is_viewport();
register_node_type_geo_join_geometry();
@@ -5191,6 +5194,7 @@ static void registerGeometryNodes()
register_node_type_geo_triangulate();
register_node_type_geo_viewer();
register_node_type_geo_volume_to_mesh();
+ register_node_type_geo_attribute_store_anonymous();
}
static void registerFunctionNodes()
@@ -5200,6 +5204,7 @@ static void registerFunctionNodes()
register_node_type_fn_float_to_int();
register_node_type_fn_input_string();
register_node_type_fn_input_vector();
+ register_node_type_fn_align_rotation_to_vector();
register_node_type_fn_random_float();
}
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 23d31586fa0..53cf597466a 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -1455,7 +1455,12 @@ void BM_select_vertices(BMesh *bm, const bool *mask)
BMVert *v;
int i = 0;
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
- BM_elem_flag_set(v, BM_ELEM_SELECT, mask[i]);
+ if (mask[i]) {
+ BM_elem_flag_set(v, BM_ELEM_SELECT, true);
+ }
+ else {
+ BM_elem_flag_set(v, BM_ELEM_SELECT, false);
+ }
i++;
}
}
@@ -1469,7 +1474,12 @@ void BM_select_edges(BMesh *bm, const bool *mask)
BMEdge *e;
int i = 0;
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
- BM_elem_flag_set(e, BM_ELEM_SELECT, mask[i]);
+ if (mask[i]) {
+ BM_elem_flag_set(e, BM_ELEM_SELECT, true);
+ }
+ else {
+ BM_elem_flag_set(e, BM_ELEM_SELECT, false);
+ }
i++;
}
}
@@ -1482,58 +1492,18 @@ void BM_select_faces(BMesh *bm, const bool *mask)
BMIter iter;
BMFace *f;
int i = 0;
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
BM_elem_flag_set(f, BM_ELEM_SELECT, mask[i]);
- i++;
- }
-}
-
-void BM_get_selected_faces(BMesh *bm, bool **selection)
-{
- BMIter iter;
- BMFace *f;
- int i = 0;
- *selection = MEM_malloc_arrayN((size_t)bm->totface, sizeof(bool), "bm faces");
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
- (*selection)[i] = BM_elem_flag_test(f, BM_ELEM_SELECT);
- i++;
- }
- // BMO_slot_map_elem_get()
-}
-
-void BM_get_tagged_faces(BMesh *bm, bool **selection)
-{
- BMIter iter;
- BMFace *f;
- int i = 0;
- *selection = MEM_malloc_arrayN((size_t)bm->totface, sizeof(bool), "bm faces");
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
- (*selection)[i] = BM_elem_flag_test(f, BM_ELEM_TAG);
- i++;
}
}
-void BM_tag_new_faces(BMesh *bm, BMOperator *b_mesh_operator)
-{
- BMIter iter;
- BMFace *f;
- int i = 0;
- //*selection = MEM_malloc_arrayN((size_t)bm->totface, sizeof(bool), "bm faces");
- BM_mesh_elem_hflag_disable_all(bm, BM_FACE, BM_ELEM_TAG, false);
- BMO_ITER (f, &iter, b_mesh_operator->slots_out, "faces.out", BM_FACE) {
- BM_elem_flag_enable(f, BM_ELEM_TAG);
- }
- // BMO_slot_map_elem_get()
-}
-
void BM_tag_vertices(BMesh *bm, const bool *mask)
{
BMIter iter;
BMVert *v;
int i = 0;
- BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) {
BM_elem_flag_set(v, BM_ELEM_TAG, mask[i]);
- i++;
}
}
@@ -1545,9 +1515,8 @@ void BM_tag_edges(BMesh *bm, const bool *mask)
BMIter iter;
BMEdge *e;
int i = 0;
- BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
+ BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, i) {
BM_elem_flag_set(e, BM_ELEM_TAG, mask[i]);
- i++;
}
}
@@ -1559,9 +1528,8 @@ void BM_tag_faces(BMesh *bm, const bool *mask)
BMIter iter;
BMFace *f;
int i = 0;
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
BM_elem_flag_set(f, BM_ELEM_TAG, mask[i]);
- i++;
}
}
@@ -1570,9 +1538,8 @@ void BM_get_tagged_faces(BMesh *bm, bool *selection)
BMIter iter;
BMFace *f;
int i = 0;
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
selection[i] = BM_elem_flag_test(f, BM_ELEM_TAG);
- i++;
}
}
@@ -1591,9 +1558,28 @@ void BM_get_selected_faces(BMesh *bm, bool *selection)
BMIter iter;
BMFace *f;
int i = 0;
- BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
selection[i] = BM_elem_flag_test(f, BM_ELEM_SELECT);
- i++;
+ }
+}
+
+void BM_get_selected_edges(BMesh *bm, bool *selection)
+{
+ BMIter iter;
+ BMEdge *e;
+ int i = 0;
+ BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, i) {
+ selection[i] = BM_elem_flag_test(e, BM_ELEM_SELECT);
+ }
+}
+
+void BM_get_selected_vertices(BMesh *bm, bool *selection)
+{
+ BMIter iter;
+ BMVert *v;
+ int i = 0;
+ BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) {
+ selection[i] = BM_elem_flag_test(v, BM_ELEM_SELECT);
}
}
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index 475372f4089..2e9e3402903 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -144,4 +144,6 @@ void BM_tag_faces(BMesh *bm, const bool *mask);
void BM_get_tagged_faces(BMesh *bm, bool *selection);
void BM_get_selected_faces(BMesh *bm, bool *selection);
+void BM_get_selected_edges(BMesh *bm, bool *selection);
+void BM_get_selected_vertices(BMesh *bm, bool *selection);
void BM_tag_new_faces(BMesh *bm, BMOperator *b_mesh_operator);
\ No newline at end of file
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index 0cedc2324f2..5e50f8fa495 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -471,6 +471,7 @@ void bmo_extrude_face_region_exec(BMesh *bm, BMOperator *op)
for (e = BMO_iter_new(&siter, dupeop.slots_out, "boundary_map.out", 0); e;
e = BMO_iter_step(&siter)) {
BMVert *f_verts[4];
+
#ifdef USE_EDGE_REGION_FLAGS
BMEdge *f_edges[4];
#endif
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index d18f856ff2f..ad59101a75a 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9622,6 +9622,25 @@ static void def_geo_curve_primitive_line(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
}
+static void def_geo_extrude_and_move(StructRNA *srna)
+{
+ PropertyRNA *prop;
+
+ static const EnumPropertyItem rna_node_geometry_extrude_domain_items[] = {
+ {0, "VERTEX", 0, "Vertex", "Extrude Vertices"},
+ {1, "EDGE", 0, "Edge", "Extrude Edges"},
+ {2, "FACE", 0, "Face", "Extrude Faces"},
+ {0, NULL, 0, NULL, NULL},
+ };
+
+ prop = RNA_def_property(srna, "extrude_mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "custom1");
+ RNA_def_property_enum_items(prop, rna_node_geometry_extrude_domain_items);
+ RNA_def_property_enum_default(prop, GEO_NODE_POINT_DISTRIBUTE_RANDOM);
+ RNA_def_property_ui_text(prop, "Extrude Mode", "Select mesh domain to extrude");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
+}
+
static void def_geo_point_rotate(StructRNA *srna)
{
static const EnumPropertyItem type_items[] = {
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index e377c8e4857..b529bacf962 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -138,9 +138,11 @@ set(SRC
function/nodes/node_fn_input_string.cc
function/nodes/node_fn_input_vector.cc
function/nodes/node_fn_random_float.cc
+ function/nodes/node_fn_align_rotation_to_vector.cc
function/node_function_util.cc
- geometry/nodes/node_geo_align_rotation_to_vector.cc
+ geometry/nodes/node_geo_attribute_store_anonymous.cc
+ geometry/nodes/node_geo_attribute.cc
geometry/nodes/node_geo_attribute_clamp.cc
geometry/nodes/node_geo_attribute_color_ramp.cc
geometry/nodes/node_geo_attribute_combine_xyz.cc
@@ -185,6 +187,8 @@ set(SRC
geometry/nodes/node_geo_delete_geometry
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list