Commit: 9823ac076706ded9382f25549f825ec13b2127d2 Author: Fabian Schempp Date: Mon Jul 19 23:48:50 2021 +0200 Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance https://developer.blender.org/rB9823ac076706ded9382f25549f825ec13b2127d2
initial commit =================================================================== M release/scripts/startup/nodeitems_builtins.py M source/blender/blenkernel/BKE_node.h M source/blender/blenkernel/intern/node.cc 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_remesh_quads.cc =================================================================== diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 18e39a4d727..309c2b542bb 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -550,6 +550,7 @@ geometry_node_categories = [ NodeItem("GeometryNodeEdgeSplit"), NodeItem("GeometryNodeSubdivisionSurface"), NodeItem("GeometryNodeMeshSubdivide"), + NodeItem("GeometryNodeRemeshQuads"), ]), 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 9b8eca77e6b..e7ca27678a4 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1465,6 +1465,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_ENDPOINTS 1069 #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 #define GEO_NODE_CURVE_TRIM 1071 +#define GEO_NODE_REMESH_QUADS 1072 /** \} */ diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 3d5973b1d5e..e306113265c 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -5147,6 +5147,7 @@ static void registerGeometryNodes() register_node_type_geo_point_translate(); register_node_type_geo_points_to_volume(); register_node_type_geo_raycast(); + register_node_type_geo_remesh_quads(); register_node_type_geo_sample_texture(); register_node_type_geo_select_by_material(); register_node_type_geo_separate_components(); diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 130032ccf71..0e3c5343849 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -204,6 +204,7 @@ set(SRC geometry/nodes/node_geo_point_separate.cc geometry/nodes/node_geo_point_translate.cc geometry/nodes/node_geo_points_to_volume.cc + geometry/nodes/node_geo_remesh_quads.cc geometry/nodes/node_geo_raycast.cc geometry/nodes/node_geo_select_by_material.cc geometry/nodes/node_geo_separate_components.cc @@ -382,6 +383,20 @@ set(LIB bf_intern_sky ) +if(WITH_OPENVDB) + list(APPEND INC + ../../../intern/openvdb + ) + list(APPEND INC_SYS + ${OPENVDB_INCLUDE_DIRS} + ) + list(APPEND LIB + bf_intern_openvdb + ${OPENVDB_LIBRARIES} + ) + add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS}) +endif() + if(WITH_BULLET) list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h index 29a1d2cc853..fb2a6c41b28 100644 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.h @@ -92,6 +92,7 @@ void register_node_type_geo_point_separate(void); void register_node_type_geo_point_translate(void); void register_node_type_geo_points_to_volume(void); void register_node_type_geo_raycast(void); +void register_node_type_geo_remesh_quads(void); void register_node_type_geo_sample_texture(void); void register_node_type_geo_select_by_material(void); void register_node_type_geo_separate_components(void); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 42a0454d3e6..e2a90a2c30f 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -331,6 +331,7 @@ DefNode(GeometryNode, GEO_NODE_POINT_SEPARATE, 0, "POINT_SEPARATE", PointSeparat DefNode(GeometryNode, GEO_NODE_POINT_TRANSLATE, def_geo_point_translate, "POINT_TRANSLATE", PointTranslate, "Point Translate", "") DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume, "POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "") DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "") +DefNode(GeometryNode, GEO_NODE_REMESH_QUADS, 0, "REMESH_QUADS", RemeshQuads, "Remesh Quads", "") DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", SelectByMaterial, "Select by Material", "") DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "") DefNode(GeometryNode, GEO_NODE_MESH_SUBDIVIDE, 0, "MESH_SUBDIVIDE", MeshSubdivide, "Mesh Subdivide", "") diff --git a/source/blender/nodes/geometry/nodes/node_geo_remesh_quads.cc b/source/blender/nodes/geometry/nodes/node_geo_remesh_quads.cc new file mode 100644 index 00000000000..53367fc42bb --- /dev/null +++ b/source/blender/nodes/geometry/nodes/node_geo_remesh_quads.cc @@ -0,0 +1,99 @@ +/* + * 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 "BKE_mesh_remesh_voxel.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "node_geometry_util.hh" + +extern "C" { +Mesh *triangulate_mesh(Mesh *mesh, + const int quad_method, + const int ngon_method, + const int min_vertices, + const int flag); +} + +static bNodeSocketTemplate geo_node_remesh_quads_in[] = { + {SOCK_GEOMETRY, N_("Geometry")}, + {SOCK_INT, N_("Minimum Vertices"), 4, 0, 0, 0, 4, 10000}, + {-1, ""}, +}; + +static bNodeSocketTemplate geo_node_remesh_quads_out[] = { + {SOCK_GEOMETRY, N_("Geometry")}, + {-1, ""}, +}; + +//static void geo_node_remesh_quads_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +//{ +// uiItemR(layout, ptr, "quad_method", 0, "", ICON_NONE); +// uiItemR(layout, ptr, "ngon_method", 0, "", ICON_NONE); +//} + +//static void geo_remesh_quads_init(bNodeTree *UNUSED(ntree), bNode *node) +//{ +// node->custom1 = GEO_node_remesh_quads_QUAD_SHORTEDGE; +// node->custom2 = GEO_node_remesh_quads_NGON_BEAUTY; +//} +static void quadriflow_update_job(void *customdata, float progress, int *cancel){ +} + +namespace blender::nodes { +static void geo_node_remesh_quads_exec(GeoNodeExecParams params) +{ + GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry"); + const int min_vertices = std::max(params.extract_input<int>("Minimum Vertices"), 4); + + GeometryNodeTriangulateQuads quad_method = static_cast<GeometryNodeTriangulateQuads>( + params.node().custom1); + GeometryNodeTriangulateNGons ngon_method = static_cast<GeometryNodeTriangulateNGons>( + params.node().custom2); + + geometry_set = geometry_set_realize_instances(geometry_set); + + /* #triangulate_mesh might modify the input mesh currently. */ + Mesh *mesh_in = geometry_set.get_mesh_for_write(); + if (mesh_in != nullptr) { + Mesh *mesh_out = BKE_mesh_remesh_quadriflow_to_mesh_nomain( + mesh_in, + 100, + 0, + true, + true, + true, //use mesh curvature + (void *)quadriflow_update_job, + nullptr); + geometry_set.replace_mesh(mesh_out); + } + + params.set_output("Geometry", std::move(geometry_set)); +} +} // namespace blender::nodes + +void register_node_type_geo_remesh_quads() +{ + static bNodeType ntype; + + geo_node_type_base(&ntype, GEO_NODE_REMESH_QUADS, "Remesh Quads", NODE_CLASS_GEOMETRY, 0); + node_type_socket_templates(&ntype, geo_node_remesh_quads_in, geo_node_remesh_quads_out); + //node_type_init(&ntype, geo_remesh_quads_init); + ntype.geometry_node_execute = blender::nodes::geo_node_remesh_quads_exec; + //ntype.draw_buttons = geo_node_remesh_quads_layout; + nodeRegisterType(&ntype); +} _______________________________________________ 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