[Bf-blender-cvs] [db07041c447] soc-2021-porting-modifiers-to-nodes-remesh-voxel: Geometry Nodes: Remesh Blocks

[Fabian Schempp]

Commit: db07041c447d0550d7755f6d92efa4f775d2e531
Author: Fabian Schempp
Date:   Wed Jul 14 00:28:50 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-voxel
https://developer.blender.org/rBdb07041c447d0550d7755f6d92efa4f775d2e531

Geometry Nodes: Remesh Blocks

This patch adds a Remesh Voxel node (compared to Remesh Blocks)
The node uses the BKE function for voxel remeshing used in the modifier as well.

Part of the GSOC 2021

Differential Revision: https://developer.blender.org/D11907

===================================================================



===================================================================

diff --cc release/scripts/startup/nodeitems_builtins.py
index ea68bd96c69,d617cfab988..9021cc859f3
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -546,8 -548,7 +548,8 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeTriangulate"),
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
-         NodeItem("GeometryNodeSubdivide"),
+         NodeItem("GeometryNodeMeshSubdivide"),
 +        NodeItem("GeometryNodeRemesh"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
@@@ -559,6 -560,7 +561,7 @@@
          NodeItem("GeometryNodeMeshLine"),
          NodeItem("GeometryNodeMeshUVSphere"),
      ]),
 -    
++
      GeometryNodeCategory("GEO_POINT", "Point", items=[
          NodeItem("GeometryNodePointDistribute"),
          NodeItem("GeometryNodePointInstance"),
diff --cc source/blender/blenkernel/BKE_node.h
index 848feebd549,b1a38ec5700..853f2601094
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1446,7 -1457,9 +1457,9 @@@ 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_REMESH_VOXEL 1069
+ #define GEO_NODE_CURVE_ENDPOINTS 1069
+ #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
 -
++#define GEO_NODE_REMESH_VOXEL 1071
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index 3b6da0e3bd2,e4c259ec9fc..2bbcf8e9142
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5093,10 -5149,8 +5149,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_sample_texture();
    register_node_type_geo_select_by_material();
    register_node_type_geo_separate_components();
-   register_node_type_geo_subdivide();
    register_node_type_geo_subdivision_surface();
    register_node_type_geo_switch();
 +  register_node_type_geo_remesh_voxel();
    register_node_type_geo_transform();
    register_node_type_geo_triangulate();
    register_node_type_geo_viewer();
diff --cc source/blender/nodes/CMakeLists.txt
index 706effbbbc3,dc19508be04..640639084fa
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -203,10 -206,8 +206,9 @@@ set(SR
    geometry/nodes/node_geo_raycast.cc
    geometry/nodes/node_geo_select_by_material.cc
    geometry/nodes/node_geo_separate_components.cc
-   geometry/nodes/node_geo_subdivide.cc
    geometry/nodes/node_geo_subdivision_surface.cc
    geometry/nodes/node_geo_switch.cc
 +        geometry/nodes/node_geo_remesh_voxel.cc
    geometry/nodes/node_geo_transform.cc
    geometry/nodes/node_geo_triangulate.cc
    geometry/nodes/node_geo_viewer.cc
diff --cc source/blender/nodes/NOD_static_types.h
index d8d6e01591f,73d4a002991..1d400704a78
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -330,10 -332,9 +332,10 @@@ DefNode(GeometryNode, GEO_NODE_POINTS_T
  DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
  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_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "Subdivide", "")
+ DefNode(GeometryNode, GEO_NODE_MESH_SUBDIVIDE, 0, "MESH_SUBDIVIDE", MeshSubdivide, "Mesh Subdivide", "")
  DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, 0, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "")
  DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
 +DefNode(GeometryNode, GEO_NODE_REMESH_VOXEL, 0, "REMESH_VOXEL", Remesh, "Voxel Remesh", "")
  DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
  DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
  DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")