source/blender/blenkernel/BKE_subdiv_foreach.h

@@ -1,165 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2018 Blender Foundation. All rights reserved. */
-
-/** \file
- * \ingroup bke
- */
-
-#pragma once
-
-#include "BLI_sys_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct Mesh;
-struct Subdiv;
-struct SubdivForeachContext;
-struct SubdivToMeshSettings;
-
-typedef bool (*SubdivForeachTopologyInformationCb)(const struct SubdivForeachContext *context,
-                                                   int num_vertices,
-                                                   int num_edges,
-                                                   int num_loops,
-                                                   int num_polygons,
-                                                   const int *subdiv_polygon_offset);
-
-typedef void (*SubdivForeachVertexFromCornerCb)(const struct SubdivForeachContext *context,
-                                                void *tls,
-                                                int ptex_face_index,
-                                                float u,
-                                                float v,
-                                                int coarse_vertex_index,
-                                                int coarse_poly_index,
-                                                int coarse_corner,
-                                                int subdiv_vertex_index);
-
-typedef void (*SubdivForeachVertexFromEdgeCb)(const struct SubdivForeachContext *context,
-                                              void *tls,
-                                              int ptex_face_index,
-                                              float u,
-                                              float v,
-                                              int coarse_edge_index,
-                                              int coarse_poly_index,
-                                              int coarse_corner,
-                                              int subdiv_vertex_index);
-
-typedef void (*SubdivForeachVertexInnerCb)(const struct SubdivForeachContext *context,
-                                           void *tls,
-                                           int ptex_face_index,
-                                           float u,
-                                           float v,
-                                           int coarse_poly_index,
-                                           int coarse_corner,
-                                           int subdiv_vertex_index);
-
-typedef void (*SubdivForeachEdgeCb)(const struct SubdivForeachContext *context,
-                                    void *tls,
-                                    int coarse_edge_index,
-                                    int subdiv_edge_index,
-                                    bool is_loose,
-                                    int subdiv_v1,
-                                    int subdiv_v2);
-
-typedef void (*SubdivForeachLoopCb)(const struct SubdivForeachContext *context,
-                                    void *tls,
-                                    int ptex_face_index,
-                                    float u,
-                                    float v,
-                                    int coarse_loop_index,
-                                    int coarse_poly_index,
-                                    int coarse_corner,
-                                    int subdiv_loop_index,
-                                    int subdiv_vertex_index,
-                                    int subdiv_edge_index);
-
-typedef void (*SubdivForeachPolygonCb)(const struct SubdivForeachContext *context,
-                                       void *tls,
-                                       int coarse_poly_index,
-                                       int subdiv_poly_index,
-                                       int start_loop_index,
-                                       int num_loops);
-
-typedef void (*SubdivForeachLooseCb)(const struct SubdivForeachContext *context,
-                                     void *tls,
-                                     int coarse_vertex_index,
-                                     int subdiv_vertex_index);
-
-typedef void (*SubdivForeachVertexOfLooseEdgeCb)(const struct SubdivForeachContext *context,
-                                                 void *tls,
-                                                 int coarse_edge_index,
-                                                 float u,
-                                                 int subdiv_vertex_index);
-
-typedef struct SubdivForeachContext {
-  /* Is called when topology information becomes available.
-   * Is only called once.
-   *
-   * NOTE: If this callback returns false, the foreach loop is aborted.
-   */
-  SubdivForeachTopologyInformationCb topology_info;
-  /* These callbacks are called from every ptex which shares "emitting"
-   * vertex or edge.
-   */
-  SubdivForeachVertexFromCornerCb vertex_every_corner;
-  SubdivForeachVertexFromEdgeCb vertex_every_edge;
-  /* Those callbacks are run once per subdivision vertex, ptex is undefined
-   * as in it will be whatever first ptex face happened to be traversed in
-   * the multi-threaded environment and which shares "emitting" vertex or
-   * edge.
-   */
-  SubdivForeachVertexFromCornerCb vertex_corner;
-  SubdivForeachVertexFromEdgeCb vertex_edge;
-  /* Called exactly once, always corresponds to a single ptex face. */
-  SubdivForeachVertexInnerCb vertex_inner;
-  /* Called once for each loose vertex. One loose coarse vertex corresponds
-   * to a single subdivision vertex.
-   */
-  SubdivForeachLooseCb vertex_loose;
-  /* Called once per vertex created for loose edge. */
-  SubdivForeachVertexOfLooseEdgeCb vertex_of_loose_edge;
-  /* NOTE: If subdivided edge does not come from coarse edge, ORIGINDEX_NONE
-   * will be passed as coarse_edge_index.
-   */
-  SubdivForeachEdgeCb edge;
-  /* NOTE: If subdivided loop does not come from coarse loop, ORIGINDEX_NONE
-   * will be passed as coarse_loop_index.
-   */
-  SubdivForeachLoopCb loop;
-  SubdivForeachPolygonCb poly;
-
-  /* User-defined pointer, to allow callbacks know something about context the
-   * traversal is happening for.
-   */
-  void *user_data;
-
-  /* Initial value of TLS data. */
-  void *user_data_tls;
-  /* Size of TLS data. */
-  size_t user_data_tls_size;
-  /* Function to free TLS storage. */
-  void (*user_data_tls_free)(void *tls);
-} SubdivForeachContext;
-
-/* Invokes callbacks in the order and with values which corresponds to creation
- * of final subdivided mesh.
- *
- * Main goal is to abstract all the traversal routines to give geometry element
- * indices (for vertices, edges, loops, polygons) in the same way as subdivision
- * modifier will do for a dense mesh.
- *
- * Returns true if the whole topology was traversed, without any early exits.
- *
- * TODO(sergey): Need to either get rid of subdiv or of coarse_mesh.
- * The main point here is to be able to get base level topology, which can be
- * done with either of those. Having both of them is kind of redundant.
- */
-bool BKE_subdiv_foreach_subdiv_geometry(struct Subdiv *subdiv,
-                                        const struct SubdivForeachContext *context,
-                                        const struct SubdivToMeshSettings *mesh_settings,
-                                        const struct Mesh *coarse_mesh);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_subdiv_foreach.hh

@@ -0,0 +1,157 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2018 Blender Foundation. All rights reserved. */
+
+/** \file
+ * \ingroup bke
+ */
+
+#pragma once
+
+#include "BLI_sys_types.h"
+
+struct Mesh;
+struct Subdiv;
+struct SubdivForeachContext;
+struct SubdivToMeshSettings;
+
+using SubdivForeachTopologyInformationCb = bool (*)(const SubdivForeachContext *context,
+                                                    int num_vertices,
+                                                    int num_edges,
+                                                    int num_loops,
+                                                    int num_polygons,
+                                                    const int *subdiv_polygon_offset);
+
+using SubdivForeachVertexFromCornerCb = void (*)(const SubdivForeachContext *context,
+                                                 void *tls,
+                                                 int ptex_face_index,
+                                                 float u,
+                                                 float v,
+                                                 int coarse_vertex_index,
+                                                 int coarse_poly_index,
+                                                 int coarse_corner,
+                                                 int subdiv_vertex_index);
+
+using SubdivForeachVertexFromEdgeCb = void (*)(const SubdivForeachContext *context,
+                                               void *tls,
+                                               int ptex_face_index,
+                                               float u,
+                                               float v,
+                                               int coarse_edge_index,
+                                               int coarse_poly_index,
+                                               int coarse_corner,
+                                               int subdiv_vertex_index);
+
+using SubdivForeachVertexInnerCb = void (*)(const SubdivForeachContext *context,
+                                            void *tls,
+                                            int ptex_face_index,
+                                            float u,
+                                            float v,
+                                            int coarse_poly_index,
+                                            int coarse_corner,
+                                            int subdiv_vertex_index);
+
+using SubdivForeachEdgeCb = void (*)(const SubdivForeachContext *context,
+                                     void *tls,
+                                     int coarse_edge_index,
+                                     int subdiv_edge_index,
+                                     bool is_loose,
+                                     int subdiv_v1,
+                                     int subdiv_v2);
+
+using SubdivForeachLoopCb = void (*)(const SubdivForeachContext *context,
+                                     void *tls,
+                                     int ptex_face_index,
+                                     float u,
+                                     float v,
+                                     int coarse_loop_index,
+                                     int coarse_poly_index,
+                                     int coarse_corner,
+                                     int subdiv_loop_index,
+                                     int subdiv_vertex_index,
+                                     int subdiv_edge_index);
+
+using SubdivForeachPolygonCb = void (*)(const SubdivForeachContext *context,
+                                        void *tls,
+                                        int coarse_poly_index,
+                                        int subdiv_poly_index,
+                                        int start_loop_index,
+                                        int num_loops);
+
+using SubdivForeachLooseCb = void (*)(const SubdivForeachContext *context,
+                                      void *tls,
+                                      int coarse_vertex_index,
+                                      int subdiv_vertex_index);
+
+using SubdivForeachVertexOfLooseEdgeCb = void (*)(const SubdivForeachContext *context,
+                                                  void *tls,
+                                                  int coarse_edge_index,
+                                                  float u,
+                                                  int subdiv_vertex_index);
+
+struct SubdivForeachContext {
+  /* Is called when topology information becomes available.
+   * Is only called once.
+   *
+   * NOTE: If this callback returns false, the foreach loop is aborted.
+   */
+  SubdivForeachTopologyInformationCb topology_info;
+  /* These callbacks are called from every ptex which shares "emitting"
+   * vertex or edge.
+   */
+  SubdivForeachVertexFromCornerCb vertex_every_corner;
+  SubdivForeachVertexFromEdgeCb vertex_every_edge;
+  /* Those callbacks are run once per subdivision vertex, ptex is undefined
+   * as in it will be whatever first ptex face happened to be traversed in
+   * the multi-threaded environment and which shares "emitting" vertex or
+   * edge.
+   */
+  SubdivForeachVertexFromCornerCb vertex_corner;
+  SubdivForeachVertexFromEdgeCb vertex_edge;
+  /* Called exactly once, always corresponds to a single ptex face. */
+  SubdivForeachVertexInnerCb vertex_inner;
+  /* Called once for each loose vertex. One loose coarse vertex corresponds
+   * to a single subdivision vertex.
+   */
+  SubdivForeachLooseCb vertex_loose;
+  /* Called once per vertex created for loose edge. */
+  SubdivForeachVertexOfLooseEdgeCb vertex_of_loose_edge;
+  /* NOTE: If subdivided edge does not come from coarse edge, ORIGINDEX_NONE
+   * will be passed as coarse_edge_index.
+   */
+  SubdivForeachEdgeCb edge;
+  /* NOTE: If subdivided loop does not come from coarse loop, ORIGINDEX_NONE
+   * will be passed as coarse_loop_index.
+   */
+  SubdivForeachLoopCb loop;
+  SubdivForeachPolygonCb poly;
+
+  /* User-defined pointer, to allow callbacks know something about context the
+   * traversal is happening for.
+   */
+  void *user_data;
+
+  /* Initial value of TLS data. */
+  void *user_data_tls;
+  /* Size of TLS data. */
+  size_t user_data_tls_size;
+  /* Function to free TLS storage. */
+  void (*user_data_tls_free)(void *tls);
+};
+
+/* Invokes callbacks in the order and with values which corresponds to creation
+ * of final subdivided mesh.
+ *
+ * Main goal is to abstract all the traversal routines to give geometry element
+ * indices (for vertices, edges, loops, polygons) in the same way as subdivision
+ * modifier will do for a dense mesh.
+ *
+ * Returns true if the whole topology was traversed, without any early exits.
+ *
+ * TODO(sergey): Need to either get rid of subdiv or of coarse_mesh.
+ * The main point here is to be able to get base level topology, which can be
+ * done with either of those. Having both of them is kind of redundant.
+ */
+bool BKE_subdiv_foreach_subdiv_geometry(Subdiv *subdiv,
+                                        const SubdivForeachContext *context,
+                                        const SubdivToMeshSettings *mesh_settings,
+                                        const Mesh *coarse_mesh);

source/blender/blenkernel/BKE_subdiv_mesh.hh

@@ -9,16 +9,12 @@
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Mesh;
 struct MeshElemMap;
 struct MEdge;
 struct Subdiv;
 
-typedef struct SubdivToMeshSettings {
+struct SubdivToMeshSettings {
   /* Resolution at which regular ptex (created for quad polygon) are being
    * evaluated. This defines how many vertices final mesh will have: every
    * regular ptex has resolution^2 vertices. Special (irregular, or ptex
@@ -28,23 +24,20 @@ typedef struct SubdivToMeshSettings {
   int resolution;
   /* When true, only edges emitted from coarse ones will be displayed. */
   bool use_optimal_display;
-} SubdivToMeshSettings;
+};
 
 /* Create real hi-res mesh from subdivision, all geometry is "real". */
-struct Mesh *BKE_subdiv_to_mesh(struct Subdiv *subdiv,
-                                const SubdivToMeshSettings *settings,
-                                const struct Mesh *coarse_mesh);
+Mesh *BKE_subdiv_to_mesh(Subdiv *subdiv,
+                         const SubdivToMeshSettings *settings,
+                         const Mesh *coarse_mesh);
 
 /* Interpolate a position along the `coarse_edge` at the relative `u` coordinate. If `is_simple` is
  * false, this will perform a B-Spline interpolation using the edge neighbors, otherwise a linear
  * interpolation will be done base on the edge vertices. */
 void BKE_subdiv_mesh_interpolate_position_on_edge(const float (*coarse_positions)[3],
-                                                  const struct MEdge *coarse_edges,
-                                                  const struct MeshElemMap *vert_to_edge_map,
+                                                  const MEdge *coarse_edges,
+                                                  const MeshElemMap *vert_to_edge_map,
                                                   int coarse_edge_index,
                                                   bool is_simple,
                                                   float u,
                                                   float pos_r[3]);
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/CMakeLists.txt

@@ -469,8 +469,8 @@ set(SRC
   BKE_subdiv_ccg.h
   BKE_subdiv_deform.h
   BKE_subdiv_eval.h
-  BKE_subdiv_foreach.h
-  BKE_subdiv_mesh.h
+  BKE_subdiv_foreach.hh
+  BKE_subdiv_mesh.hh
   BKE_subdiv_modifier.h
   BKE_subdiv_topology.h
   BKE_subsurf.h

source/blender/blenkernel/intern/mesh_wrapper.cc

@@ -40,7 +40,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_subdiv.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 #include "BKE_subdiv_modifier.h"
 
 #include "DEG_depsgraph.h"

source/blender/blenkernel/intern/multires_reshape_smooth.cc

@@ -22,8 +22,8 @@
 #include "BKE_multires.h"
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_eval.h"
-#include "BKE_subdiv_foreach.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_foreach.hh"
+#include "BKE_subdiv_mesh.hh"
 
 #include "opensubdiv_converter_capi.h"
 #include "opensubdiv_evaluator_capi.h"

source/blender/blenkernel/intern/multires_reshape_util.cc

@@ -24,8 +24,8 @@
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_ccg.h"
 #include "BKE_subdiv_eval.h"
-#include "BKE_subdiv_foreach.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_foreach.hh"
+#include "BKE_subdiv_mesh.hh"
 
 #include "DEG_depsgraph_query.h"
 

source/blender/blenkernel/intern/multires_reshape_vertcos.cc

@@ -12,8 +12,8 @@
 
 #include "BLI_math_vector.h"
 
-#include "BKE_subdiv_foreach.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_foreach.hh"
+#include "BKE_subdiv_mesh.hh"
 
 struct MultiresReshapeAssignVertcosContext {
   const MultiresReshapeContext *reshape_context;

source/blender/blenkernel/intern/multires_subdiv.cc

@@ -16,7 +16,7 @@
 #include "BKE_modifier.h"
 #include "BKE_multires.h"
 #include "BKE_subdiv.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 
 void BKE_multires_subdiv_settings_init(SubdivSettings *settings, const MultiresModifierData *mmd)
 {

source/blender/blenkernel/intern/subdiv_deform.cc

@@ -18,8 +18,8 @@
 #include "BKE_customdata.h"
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_eval.h"
-#include "BKE_subdiv_foreach.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_foreach.hh"
+#include "BKE_subdiv_mesh.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/subdiv_foreach.cc

@@ -5,7 +5,7 @@
  * \ingroup bke
  */
 
-#include "BKE_subdiv_foreach.h"
+#include "BKE_subdiv_foreach.hh"
 
 #include "atomic_ops.h"
 
@@ -20,7 +20,7 @@
 #include "BKE_key.h"
 #include "BKE_mesh.h"
 #include "BKE_subdiv.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/subdiv_mesh.cc

@@ -24,8 +24,8 @@
 #include "BKE_mesh_mapping.h"
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_eval.h"
-#include "BKE_subdiv_foreach.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_foreach.hh"
+#include "BKE_subdiv_mesh.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/draw/intern/draw_cache_impl_subdivision.cc

@@ -16,8 +16,8 @@
 #include "BKE_scene.h"
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_eval.h"
-#include "BKE_subdiv_foreach.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_foreach.hh"
+#include "BKE_subdiv_mesh.hh"
 #include "BKE_subdiv_modifier.h"
 
 #include "BLI_linklist.h"

source/blender/editors/uvedit/uvedit_unwrap_ops.cc

@@ -42,7 +42,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_subdiv.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 #include "BKE_subdiv_modifier.h"
 
 #include "DEG_depsgraph.h"

source/blender/modifiers/intern/MOD_multires.cc

@@ -29,7 +29,7 @@
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_ccg.h"
 #include "BKE_subdiv_deform.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 #include "BKE_subsurf.h"
 
 #include "UI_interface.h"

source/blender/modifiers/intern/MOD_subsurf.cc

@@ -30,7 +30,7 @@
 #include "BKE_subdiv.h"
 #include "BKE_subdiv_ccg.h"
 #include "BKE_subdiv_deform.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 #include "BKE_subdiv_modifier.h"
 #include "BKE_subsurf.h"
 

source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc

@@ -2,7 +2,7 @@
 
 #include "BKE_mesh.h"
 #include "BKE_subdiv.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 
 #include "UI_interface.h"
 #include "UI_resources.h"

source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc

@@ -9,7 +9,7 @@
 #include "BKE_attribute.hh"
 #include "BKE_mesh.h"
 #include "BKE_subdiv.h"
-#include "BKE_subdiv_mesh.h"
+#include "BKE_subdiv_mesh.hh"
 
 #include "UI_interface.h"
 #include "UI_resources.h"