[Bf-blender-cvs] [79f8e7137d4] soc-2021-porting-modifiers-to-nodes-remesh-voxel: cleanup

[Fabian Schempp]

Commit: 79f8e7137d40d6899adebf02e4b417085637b03d
Author: Fabian Schempp
Date:   Tue Jul 6 22:22:53 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-voxel
https://developer.blender.org/rB79f8e7137d40d6899adebf02e4b417085637b03d

cleanup

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

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
R069	source/blender/nodes/geometry/nodes/node_geo_remesh.cc	source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc

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

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 433977f33f2..848feebd549 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1446,7 +1446,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
 #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
 #define GEO_NODE_VIEWER 1067
 #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
-#define GEO_NODE_REMESH 1069
+#define GEO_NODE_REMESH_VOXEL 1069
 /** \} */
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index d898b239329..3b6da0e3bd2 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5096,7 +5096,7 @@ static void registerGeometryNodes()
   register_node_type_geo_subdivide();
   register_node_type_geo_subdivision_surface();
   register_node_type_geo_switch();
-  register_node_type_geo_remesh();
+  register_node_type_geo_remesh_voxel();
   register_node_type_geo_transform();
   register_node_type_geo_triangulate();
   register_node_type_geo_viewer();
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 91980877eab..706effbbbc3 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -206,7 +206,7 @@ set(SRC
   geometry/nodes/node_geo_subdivide.cc
   geometry/nodes/node_geo_subdivision_surface.cc
   geometry/nodes/node_geo_switch.cc
-  geometry/nodes/node_geo_remesh.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 --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 12bc2a8a05a..d1857e1df79 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -88,7 +88,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(void);
+void register_node_type_geo_remesh_voxel(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 5d51e51b069..d8d6e01591f 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -333,7 +333,7 @@ DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", Se
 DefNode(GeometryNode, GEO_NODE_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "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, 0, "REMESH", Remesh, "Remesh", "")
+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", "")
diff --git a/source/blender/nodes/geometry/nodes/node_geo_remesh.cc b/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
similarity index 69%
rename from source/blender/nodes/geometry/nodes/node_geo_remesh.cc
rename to source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
index 86a3f74aec0..278e5e0f0e9 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_remesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
@@ -15,42 +15,45 @@
  */
 
 #include "UI_interface.h"
-#include "UI_resources.h"
+
 #include "BKE_mesh_remesh_voxel.h"
 
 #include "node_geometry_util.hh"
 
-static bNodeSocketTemplate geo_node_remesh_in[] = {
+static bNodeSocketTemplate geo_node_remesh_voxel_in[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
     {SOCK_FLOAT, N_("Voxel Size"), 1.0f, 0, 0, 0, 0.01f, FLT_MAX},
+    {SOCK_FLOAT, N_("Adaptivity"), 0.0f, 0, 0, 0, 0.0f, 1.0f},
     {-1, ""},
 };
 
-static bNodeSocketTemplate geo_node_remesh_out[] = {
+static bNodeSocketTemplate geo_node_remesh_voxel_out[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
     {-1, ""},
 };
 
 namespace blender::nodes {
-static void geo_node_remesh_exec(GeoNodeExecParams params)
+static void geo_node_remesh_voxel_exec(GeoNodeExecParams params)
 {
   GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
-  float voxel_size = params.extract_input<float>("Voxel Size");
+  const float voxel_size = params.extract_input<float>("Voxel Size");
+  const float adaptivity = params.extract_input<float>("Adaptivity");
+
   if(geometry_set.has_mesh()){
     Mesh *input_mesh = geometry_set.get_mesh_for_write();
-    Mesh *output_mesh = BKE_mesh_remesh_voxel_to_mesh_nomain(input_mesh, voxel_size, 0.5f, 0.0f);
+    Mesh *output_mesh = BKE_mesh_remesh_voxel_to_mesh_nomain(input_mesh, voxel_size, adaptivity, 0.0f);
     geometry_set.replace_mesh(output_mesh);
   }
   params.set_output("Geometry", std::move(geometry_set));
 }
 }  // namespace blender::nodes
 
-void register_node_type_geo_remesh()
+void register_node_type_geo_remesh_voxel()
 {
   static bNodeType ntype;
 
-  geo_node_type_base(&ntype, GEO_NODE_REMESH, "remesh", NODE_CLASS_GEOMETRY, 0);
-  node_type_socket_templates(&ntype, geo_node_remesh_in, geo_node_remesh_out);
-  ntype.geometry_node_execute = blender::nodes::geo_node_remesh_exec;
+  geo_node_type_base(&ntype, GEO_NODE_REMESH_VOXEL, "Voxel Remesh", NODE_CLASS_GEOMETRY, 0);
+  node_type_socket_templates(&ntype, geo_node_remesh_voxel_in, geo_node_remesh_voxel_out);
+  ntype.geometry_node_execute = blender::nodes::geo_node_remesh_voxel_exec;
   nodeRegisterType(&ntype);
 }