[Bf-blender-cvs] [e9d95fddf94] temp-geometry-nodes-fields-prototype: Add tweaked mesh extrude node from Fabian
Hans Goudey
noreply at git.blender.org
Tue Aug 3 22:30:55 CEST 2021
Commit: e9d95fddf94ebad8eacb084e3bbe7dd0537ca092
Author: Hans Goudey
Date: Tue Aug 3 16:30:48 2021 -0400
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rBe9d95fddf94ebad8eacb084e3bbe7dd0537ca092
Add tweaked mesh extrude node from Fabian
===================================================================
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/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
A source/blender/nodes/geometry/nodes/node_geo_extrude.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index c7d155afd83..758e9c14450 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -553,6 +553,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeEdgeSplit"),
NodeItem("GeometryNodeSubdivisionSurface"),
NodeItem("GeometryNodeMeshSubdivide"),
+ NodeItem("GeometryNodeExtrude"),
]),
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 b98077b1d9c..7d23bf59909 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1477,6 +1477,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_CURVE_SET_HANDLES 1072
#define GEO_NODE_ATTRIBUTE 1073
#define GEO_NODE_INDEX 1074
+#define GEO_NODE_EXTRUDE 1075
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 213a1d3f64d..deccb081ecb 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5115,6 +5115,8 @@ static void registerGeometryNodes()
{
register_node_type_geo_group();
+ register_node_type_geo_extrude();
+
register_node_type_geo_attribute();
register_node_type_geo_attribute_clamp();
register_node_type_geo_attribute_color_ramp();
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index b2958a9e744..ad8158e2e6f 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -1446,4 +1446,114 @@ void BM_mesh_vert_coords_apply_with_mat4(BMesh *bm,
}
}
+/**
+* Use to select bmesh vertex data based on an array of bool.
+*/
+void BM_select_vertices(BMesh *bm, const bool *mask)
+{
+ BMIter iter;
+ BMVert *v;
+ int i = 0;
+ BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
+ if (mask[i]) {
+ BM_elem_flag_set(v, BM_ELEM_SELECT, true);
+ }
+ else {
+ BM_elem_flag_set(v, BM_ELEM_SELECT, false);
+ }
+ i++;
+ }
+}
+
+/**
+ * Use to select bmesh edge data based on an array of bool.
+ */
+void BM_select_edges(BMesh *bm, const bool *mask)
+{
+ BMIter iter;
+ BMEdge *e;
+ int i = 0;
+ BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
+ if (mask[i]) {
+ BM_elem_flag_set(e, BM_ELEM_SELECT, true);
+ }
+ else {
+ BM_elem_flag_set(e, BM_ELEM_SELECT, false);
+ }
+ i++;
+ }
+}
+
+/**
+ * Use to select bmesh face data based on an array of bool.
+ */
+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) {
+ if (mask[i]) {
+ BM_elem_flag_set(f, BM_ELEM_SELECT, true);
+ }
+ else {
+ BM_elem_flag_set(f, BM_ELEM_SELECT, false);
+ }
+ i++;
+ }
+}
+
+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) {
+ if (mask[i]) {
+ BM_elem_flag_set(v, BM_ELEM_TAG, true);
+ }
+ else {
+ BM_elem_flag_set(v, BM_ELEM_TAG, false);
+ }
+ i++;
+ }
+}
+
+/**
+ * Use to temporary tag bmesh edge data based on an array of bool.
+ */
+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) {
+ if (mask[i]) {
+ BM_elem_flag_set(e, BM_ELEM_TAG, true);
+ }
+ else {
+ BM_elem_flag_set(e, BM_ELEM_TAG, false);
+ }
+ i++;
+ }
+}
+
+/**
+ * Use to temporary tag bmesh face data based on an array of bool.
+ */
+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) {
+ if (mask[i]) {
+ BM_elem_flag_set(f, BM_ELEM_TAG, true);
+ }
+ else {
+ BM_elem_flag_set(f, BM_ELEM_TAG, false);
+ }
+ i++;
+ }
+}
/** \} */
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index bd0504b038a..eb7dcaac046 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -134,3 +134,10 @@ void BM_mesh_vert_coords_apply(BMesh *bm, const float (*vert_coords)[3]);
void BM_mesh_vert_coords_apply_with_mat4(BMesh *bm,
const float (*vert_coords)[3],
const float mat[4][4]);
+
+void BM_select_vertices(BMesh *bm, const bool *mask);
+void BM_select_edges(BMesh *bm, const bool *mask);
+void BM_select_faces(BMesh *bm, const bool *mask);
+void BM_tag_vertices(BMesh *bm, const bool *mask);
+void BM_tag_edges(BMesh *bm, const bool *mask);
+void BM_tag_faces(BMesh *bm, const bool *mask);
\ No newline at end of file
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index be8833e3710..902f5818499 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -141,6 +141,8 @@ set(SRC
function/nodes/node_fn_align_rotation_to_vector.cc
function/node_function_util.cc
+ geometry/nodes/node_geo_extrude.cc
+
geometry/nodes/node_geo_attribute.cc
geometry/nodes/node_geo_attribute_clamp.cc
geometry/nodes/node_geo_attribute_color_ramp.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 019f2c1d4bf..51dbe2f2c37 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -29,6 +29,8 @@ void register_node_tree_type_geo(void);
void register_node_type_geo_group(void);
void register_node_type_geo_custom_group(bNodeType *ntype);
+void register_node_type_geo_extrude(void);
+
void register_node_type_geo_attribute(void);
void register_node_type_geo_attribute_clamp(void);
void register_node_type_geo_attribute_color_ramp(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index ccca7819c4e..fa2c128692c 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -269,6 +269,9 @@ DefNode(FunctionNode, FN_NODE_INPUT_VECTOR, def_fn_input_vector, "INPUT_VECTOR",
DefNode(FunctionNode, FN_NODE_RANDOM_FLOAT, 0, "RANDOM_FLOAT", RandomFloat, "Random Float", "")
DefNode(FunctionNode, FN_NODE_ALIGN_ROTATION_TO_VECTOR, def_fn_align_rotation_to_vector, "ALIGN_ROTATION_TO_VECTOR", AlignRotationToVector, "Align Rotation to Vector", "")
+
+DefNode(GeometryNode, GEO_NODE_EXTRUDE, 0, "EXTRUDE", Extrude, "Mesh Extrude", "")
+
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE, def_geo_attribute, "ATTRIBUTE", Attribute, "Attribute", "")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_CLAMP, def_geo_attribute_clamp, "ATTRIBUTE_CLAMP", AttributeClamp, "Attribute Clamp", "")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COLOR_RAMP, def_geo_attribute_color_ramp, "ATTRIBUTE_COLOR_RAMP", AttributeColorRamp, "Attribute Color Ramp", "")
diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude.cc
new file mode 100644
index 00000000000..a938c705484
--- /dev/null
+++ b/source/blender/nodes/geometry/nodes/node_geo_extrude.cc
@@ -0,0 +1,133 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
+#include "UI_interface.h"
+
+#include "BKE_mesh.h"
+
+#include "bmesh.h"
+#include "bmesh_tools.h"
+
+#include "node_geometry_util.hh"
+
+static bNodeSocketTemplate geo_node_extrude_in[] = {
+ {SOCK_GEOMETRY, N_("Geometry")},
+ {SOCK_FLOAT, N_("Distance"), 0.0f, 0, 0, 0, FLT_MIN, FLT_MAX, PROP_DISTANCE},
+ {SOCK_FLOAT, N_("Inset"), 0.0f, 0, 0, 0, FLT_MIN, FLT_MAX, PROP_DISTANCE},
+ {SOCK_BOOLEAN, N_("Individual")},
+ {SOCK_BOOLEAN, N_("Selection"), 1, 0, 0, 0, 0, 0, PROP_NONE, SOCK_HIDE_VALUE},
+ {-1, ""},
+};
+
+static bNodeSocketTemplate geo_node_extrude_out[] = {
+ {SOCK_GEOMETRY, N_("Geometry")},
+ {-1, ""},
+};
+
+using blender::Span;
+
+static Mesh *extrude_mesh(const Mesh *mesh,
+ const Span<bool> selection,
+ const float distance,
+ const float inset,
+ const bool inset_individual_faces)
+{
+ BLI_assert(selection.size() == mesh->totpoly);
+ const BMeshCreateParams bmesh_create_params = {true};
+ const BMeshFromMeshParams bmesh_from_mesh_params = {
+ true, 0, 0, 0, {CD_MASK_ORIGINDEX, CD_MASK_ORIGINDEX, CD_MASK_ORIGINDEX}};
+
+ BMesh *bm = BKE_mesh_to_bmesh_ex(mesh, &bmesh_create_params, &bmesh_from_mesh_params);
+
+ BM_select_faces(bm, selection.data());
+ BMOperator op;
+ if (inset_individual_faces) {
+ BMO_op_initf(bm,
+ &op,
+ 0,
+ "inset_individual faces=%hf use_even_offset=%b thickness=%f depth=%f",
+ BM_ELEM_SELECT,
+ true,
+ inset,
+ distance);
+ }
+ else {
+ BMO_op_initf(bm,
+ &op,
+ 0,
+ "inset_region faces=%hf use_boundary=%b use_even_offset=%b thickness=%f depth=%f",
+ BM_ELEM_SELECT,
+ true,
+ true,
+ inset,
+ distance);
+ }
+ BMO_op_exec(bm, &op);
+ BMO_op_finish(bm, &op);
+
+ CustomD
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list