Hans Goudey
1af62cb3bf
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
233 lines
10 KiB
C++
233 lines
10 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#pragma once
|
|
|
|
/** \file
|
|
* \ingroup bke
|
|
*/
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct CustomData;
|
|
struct CustomData_MeshMasks;
|
|
struct MemArena;
|
|
struct Mesh;
|
|
|
|
/* Generic ways to map some geometry elements from a source mesh to a dest one. */
|
|
|
|
typedef struct MeshPairRemapItem {
|
|
int sources_num;
|
|
int *indices_src; /* NULL if no source found. */
|
|
float *weights_src; /* NULL if no source found, else, always normalized! */
|
|
/* UNUSED (at the moment). */
|
|
// float hit_dist; /* FLT_MAX if irrelevant or no source found. */
|
|
int island; /* For loops only. */
|
|
} MeshPairRemapItem;
|
|
|
|
/* All mapping computing func return this. */
|
|
typedef struct MeshPairRemap {
|
|
int items_num;
|
|
MeshPairRemapItem *items; /* array, one item per dest element. */
|
|
|
|
struct MemArena *mem; /* memory arena, internal use only. */
|
|
} MeshPairRemap;
|
|
|
|
/* Helpers! */
|
|
void BKE_mesh_remap_init(MeshPairRemap *map, int items_num);
|
|
void BKE_mesh_remap_free(MeshPairRemap *map);
|
|
|
|
void BKE_mesh_remap_item_define_invalid(MeshPairRemap *map, int index);
|
|
|
|
/* TODO:
|
|
* Add other 'from/to' mapping sources, like e.g. using a UVMap, etc.
|
|
* https://blenderartists.org/t/619105
|
|
*
|
|
* We could also use similar topology mappings inside a same mesh
|
|
* (cf. Campbell's 'select face islands from similar topology' wip work).
|
|
* Also, users will have to check, whether we can get rid of some modes here,
|
|
* not sure all will be useful!
|
|
*/
|
|
enum {
|
|
MREMAP_USE_VERT = 1 << 4,
|
|
MREMAP_USE_EDGE = 1 << 5,
|
|
MREMAP_USE_LOOP = 1 << 6,
|
|
MREMAP_USE_POLY = 1 << 7,
|
|
|
|
MREMAP_USE_NEAREST = 1 << 8,
|
|
MREMAP_USE_NORPROJ = 1 << 9,
|
|
MREMAP_USE_INTERP = 1 << 10,
|
|
MREMAP_USE_NORMAL = 1 << 11,
|
|
|
|
/* ***** Target's vertices ***** */
|
|
MREMAP_MODE_VERT = 1 << 24,
|
|
/* Nearest source vert. */
|
|
MREMAP_MODE_VERT_NEAREST = MREMAP_MODE_VERT | MREMAP_USE_VERT | MREMAP_USE_NEAREST,
|
|
|
|
/* Nearest vertex of nearest edge. */
|
|
MREMAP_MODE_VERT_EDGE_NEAREST = MREMAP_MODE_VERT | MREMAP_USE_EDGE | MREMAP_USE_NEAREST,
|
|
/* This one uses two verts of selected edge (weighted interpolation). */
|
|
/* Nearest point on nearest edge. */
|
|
MREMAP_MODE_VERT_EDGEINTERP_NEAREST = MREMAP_MODE_VERT | MREMAP_USE_EDGE | MREMAP_USE_NEAREST |
|
|
MREMAP_USE_INTERP,
|
|
|
|
/* Nearest vertex of nearest poly. */
|
|
MREMAP_MODE_VERT_POLY_NEAREST = MREMAP_MODE_VERT | MREMAP_USE_POLY | MREMAP_USE_NEAREST,
|
|
/* Those two use all verts of selected poly (weighted interpolation). */
|
|
/* Nearest point on nearest poly. */
|
|
MREMAP_MODE_VERT_POLYINTERP_NEAREST = MREMAP_MODE_VERT | MREMAP_USE_POLY | MREMAP_USE_NEAREST |
|
|
MREMAP_USE_INTERP,
|
|
/* Point on nearest face hit by ray from target vertex's normal. */
|
|
MREMAP_MODE_VERT_POLYINTERP_VNORPROJ = MREMAP_MODE_VERT | MREMAP_USE_POLY | MREMAP_USE_NORPROJ |
|
|
MREMAP_USE_INTERP,
|
|
|
|
/* ***** Target's edges ***** */
|
|
MREMAP_MODE_EDGE = 1 << 25,
|
|
|
|
/* Source edge which both vertices are nearest of dest ones. */
|
|
MREMAP_MODE_EDGE_VERT_NEAREST = MREMAP_MODE_EDGE | MREMAP_USE_VERT | MREMAP_USE_NEAREST,
|
|
|
|
/* Nearest source edge (using mid-point). */
|
|
MREMAP_MODE_EDGE_NEAREST = MREMAP_MODE_EDGE | MREMAP_USE_EDGE | MREMAP_USE_NEAREST,
|
|
|
|
/* Nearest edge of nearest poly (using mid-point). */
|
|
MREMAP_MODE_EDGE_POLY_NEAREST = MREMAP_MODE_EDGE | MREMAP_USE_POLY | MREMAP_USE_NEAREST,
|
|
|
|
/* Cast a set of rays from along dest edge,
|
|
* interpolating its vertices' normals, and use hit source edges. */
|
|
MREMAP_MODE_EDGE_EDGEINTERP_VNORPROJ = MREMAP_MODE_EDGE | MREMAP_USE_VERT | MREMAP_USE_NORPROJ |
|
|
MREMAP_USE_INTERP,
|
|
|
|
/* ***** Target's loops ***** */
|
|
/* NOTE: when islands are given to loop mapping func,
|
|
* all loops from the same destination face will always be mapped
|
|
* to loops of source faces within a same island, regardless of mapping mode. */
|
|
MREMAP_MODE_LOOP = 1 << 26,
|
|
|
|
/* Best normal-matching loop from nearest vert. */
|
|
MREMAP_MODE_LOOP_NEAREST_LOOPNOR = MREMAP_MODE_LOOP | MREMAP_USE_LOOP | MREMAP_USE_VERT |
|
|
MREMAP_USE_NEAREST | MREMAP_USE_NORMAL,
|
|
/* Loop from best normal-matching poly from nearest vert. */
|
|
MREMAP_MODE_LOOP_NEAREST_POLYNOR = MREMAP_MODE_LOOP | MREMAP_USE_POLY | MREMAP_USE_VERT |
|
|
MREMAP_USE_NEAREST | MREMAP_USE_NORMAL,
|
|
|
|
/* Loop from nearest vertex of nearest poly. */
|
|
MREMAP_MODE_LOOP_POLY_NEAREST = MREMAP_MODE_LOOP | MREMAP_USE_POLY | MREMAP_USE_NEAREST,
|
|
/* Those two use all verts of selected poly (weighted interpolation). */
|
|
/* Nearest point on nearest poly. */
|
|
MREMAP_MODE_LOOP_POLYINTERP_NEAREST = MREMAP_MODE_LOOP | MREMAP_USE_POLY | MREMAP_USE_NEAREST |
|
|
MREMAP_USE_INTERP,
|
|
/* Point on nearest face hit by ray from target loop's normal. */
|
|
MREMAP_MODE_LOOP_POLYINTERP_LNORPROJ = MREMAP_MODE_LOOP | MREMAP_USE_POLY | MREMAP_USE_NORPROJ |
|
|
MREMAP_USE_INTERP,
|
|
|
|
/* ***** Target's polygons ***** */
|
|
MREMAP_MODE_POLY = 1 << 27,
|
|
|
|
/* Nearest source poly. */
|
|
MREMAP_MODE_POLY_NEAREST = MREMAP_MODE_POLY | MREMAP_USE_POLY | MREMAP_USE_NEAREST,
|
|
/* Source poly from best normal-matching dest poly. */
|
|
MREMAP_MODE_POLY_NOR = MREMAP_MODE_POLY | MREMAP_USE_POLY | MREMAP_USE_NORMAL,
|
|
|
|
/* Project dest poly onto source mesh using its normal,
|
|
* and use interpolation of all intersecting source polys. */
|
|
MREMAP_MODE_POLY_POLYINTERP_PNORPROJ = MREMAP_MODE_POLY | MREMAP_USE_POLY | MREMAP_USE_NORPROJ |
|
|
MREMAP_USE_INTERP,
|
|
|
|
/* ***** Same topology, applies to all four elements types. ***** */
|
|
MREMAP_MODE_TOPOLOGY = MREMAP_MODE_VERT | MREMAP_MODE_EDGE | MREMAP_MODE_LOOP | MREMAP_MODE_POLY,
|
|
};
|
|
|
|
void BKE_mesh_remap_calc_source_cddata_masks_from_map_modes(
|
|
int vert_mode,
|
|
int edge_mode,
|
|
int loop_mode,
|
|
int poly_mode,
|
|
struct CustomData_MeshMasks *cddata_mask);
|
|
|
|
/**
|
|
* Compute a value of the difference between both given meshes.
|
|
* The smaller the result, the better the match.
|
|
*
|
|
* We return the inverse of the average of the inversed
|
|
* shortest distance from each dst vertex to src ones.
|
|
* In other words, beyond a certain (relatively small) distance, all differences have more or less
|
|
* the same weight in final result, which allows to reduce influence of a few high differences,
|
|
* in favor of a global good matching.
|
|
*/
|
|
float BKE_mesh_remap_calc_difference_from_mesh(const struct SpaceTransform *space_transform,
|
|
const float (*vert_positions_dst)[3],
|
|
int numverts_dst,
|
|
struct Mesh *me_src);
|
|
|
|
/**
|
|
* Set r_space_transform so that best bbox of dst matches best bbox of src.
|
|
*/
|
|
void BKE_mesh_remap_find_best_match_from_mesh(const float (*vert_positions_dst)[3],
|
|
int numverts_dst,
|
|
struct Mesh *me_src,
|
|
struct SpaceTransform *r_space_transform);
|
|
|
|
void BKE_mesh_remap_calc_verts_from_mesh(int mode,
|
|
const struct SpaceTransform *space_transform,
|
|
float max_dist,
|
|
float ray_radius,
|
|
const float (*vert_positions_dst)[3],
|
|
int numverts_dst,
|
|
bool dirty_nors_dst,
|
|
struct Mesh *me_src,
|
|
struct Mesh *me_dst,
|
|
MeshPairRemap *r_map);
|
|
|
|
void BKE_mesh_remap_calc_edges_from_mesh(int mode,
|
|
const struct SpaceTransform *space_transform,
|
|
float max_dist,
|
|
float ray_radius,
|
|
const float (*vert_positions_dst)[3],
|
|
int numverts_dst,
|
|
const struct MEdge *edges_dst,
|
|
int numedges_dst,
|
|
bool dirty_nors_dst,
|
|
struct Mesh *me_src,
|
|
struct Mesh *me_dst,
|
|
MeshPairRemap *r_map);
|
|
|
|
void BKE_mesh_remap_calc_loops_from_mesh(int mode,
|
|
const struct SpaceTransform *space_transform,
|
|
float max_dist,
|
|
float ray_radius,
|
|
struct Mesh *mesh_dst,
|
|
const float (*vert_positions_dst)[3],
|
|
int numverts_dst,
|
|
const struct MEdge *edges_dst,
|
|
int numedges_dst,
|
|
const struct MLoop *loops_dst,
|
|
int numloops_dst,
|
|
const struct MPoly *polys_dst,
|
|
int numpolys_dst,
|
|
struct CustomData *ldata_dst,
|
|
bool use_split_nors_dst,
|
|
float split_angle_dst,
|
|
bool dirty_nors_dst,
|
|
struct Mesh *me_src,
|
|
MeshRemapIslandsCalc gen_islands_src,
|
|
float islands_precision_src,
|
|
struct MeshPairRemap *r_map);
|
|
|
|
void BKE_mesh_remap_calc_polys_from_mesh(int mode,
|
|
const struct SpaceTransform *space_transform,
|
|
float max_dist,
|
|
float ray_radius,
|
|
const struct Mesh *mesh_dst,
|
|
const float (*vert_positions_dst)[3],
|
|
const struct MLoop *loops_dst,
|
|
const struct MPoly *polys_dst,
|
|
int numpolys_dst,
|
|
struct Mesh *me_src,
|
|
struct MeshPairRemap *r_map);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|