diff options
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_query_uv.cc')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_query_uv.cc | 65 |
1 files changed, 43 insertions, 22 deletions
diff --git a/source/blender/bmesh/intern/bmesh_query_uv.cc b/source/blender/bmesh/intern/bmesh_query_uv.cc index 0e2385ff4e2..2bc24078bad 100644 --- a/source/blender/bmesh/intern/bmesh_query_uv.cc +++ b/source/blender/bmesh/intern/bmesh_query_uv.cc @@ -12,6 +12,7 @@ #include "BLI_math_vec_types.hh" #include "BLI_utildefines_stack.h" +#include "BKE_attribute.hh" #include "BKE_customdata.h" #include "DNA_meshdata_types.h" @@ -19,12 +20,36 @@ #include "bmesh.h" #include "intern/bmesh_private.h" +BMUVOffsets BM_uv_map_get_offsets(const BMesh *bm) +{ + using namespace blender; + using namespace blender::bke; + const int layer_index = CustomData_get_layer_index(&bm->ldata, CD_PROP_FLOAT2); + if (layer_index == -1) { + return {-1, -1, -1, -1}; + } + + char const *name = bm->ldata.layers[layer_index].name; + char buffer[MAX_CUSTOMDATA_LAYER_NAME]; + + BMUVOffsets offsets; + offsets.uv = bm->ldata.layers[layer_index].offset; + offsets.select_vert = CustomData_get_offset_named( + &bm->ldata, CD_PROP_BOOL, get_uv_map_vert_selection_name(name, buffer)); + offsets.select_edge = CustomData_get_offset_named( + &bm->ldata, CD_PROP_BOOL, get_uv_map_edge_selection_name(name, buffer)); + offsets.pin = CustomData_get_offset_named( + &bm->ldata, CD_PROP_BOOL, get_uv_map_pin_name(name, buffer)); + + return offsets; +} + static void uv_aspect(const BMLoop *l, const float aspect[2], const int cd_loop_uv_offset, float r_uv[2]) { - const float *uv = ((const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset))->uv; + const float *uv = BM_ELEM_CD_GET_FLOAT_P(l, cd_loop_uv_offset); r_uv[0] = uv[0] * aspect[0]; r_uv[1] = uv[1] * aspect[1]; } @@ -81,8 +106,8 @@ void BM_face_uv_calc_center_median(const BMFace *f, const int cd_loop_uv_offset, zero_v2(r_cent); l_iter = l_first = BM_FACE_FIRST_LOOP(f); do { - const MLoopUV *luv = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_iter, cd_loop_uv_offset); - add_v2_v2(r_cent, luv->uv); + const float *luv = BM_ELEM_CD_GET_FLOAT_P(l_iter, cd_loop_uv_offset); + add_v2_v2(r_cent, luv); } while ((l_iter = l_iter->next) != l_first); mul_v2_fl(r_cent, 1.0f / float(f->len)); @@ -96,8 +121,7 @@ float BM_face_uv_calc_cross(const BMFace *f, const int cd_loop_uv_offset) int i = 0; l_iter = l_first = BM_FACE_FIRST_LOOP(f); do { - const MLoopUV *luv = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_iter, cd_loop_uv_offset); - uvs[i++] = luv->uv; + uvs[i++] = BM_ELEM_CD_GET_FLOAT2_P(l_iter, cd_loop_uv_offset); } while ((l_iter = l_iter->next) != l_first); return cross_poly_v2(reinterpret_cast<const float(*)[2]>(uvs.data()), f->len); } @@ -108,31 +132,30 @@ void BM_face_uv_minmax(const BMFace *f, float min[2], float max[2], const int cd const BMLoop *l_first; l_iter = l_first = BM_FACE_FIRST_LOOP(f); do { - const MLoopUV *luv = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_iter, cd_loop_uv_offset); - minmax_v2v2_v2(min, max, luv->uv); + const float *luv = BM_ELEM_CD_GET_FLOAT_P(l_iter, cd_loop_uv_offset); + minmax_v2v2_v2(min, max, luv); } while ((l_iter = l_iter->next) != l_first); } bool BM_loop_uv_share_edge_check(BMLoop *l_a, BMLoop *l_b, const int cd_loop_uv_offset) { BLI_assert(l_a->e == l_b->e); - MLoopUV *luv_a_curr = (MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_a, cd_loop_uv_offset); - MLoopUV *luv_a_next = (MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_a->next, cd_loop_uv_offset); - MLoopUV *luv_b_curr = (MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_b, cd_loop_uv_offset); - MLoopUV *luv_b_next = (MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_b->next, cd_loop_uv_offset); + float *luv_a_curr = BM_ELEM_CD_GET_FLOAT_P(l_a, cd_loop_uv_offset); + float *luv_a_next = BM_ELEM_CD_GET_FLOAT_P(l_a->next, cd_loop_uv_offset); + float *luv_b_curr = BM_ELEM_CD_GET_FLOAT_P(l_b, cd_loop_uv_offset); + float *luv_b_next = BM_ELEM_CD_GET_FLOAT_P(l_b->next, cd_loop_uv_offset); if (l_a->v != l_b->v) { std::swap(luv_b_curr, luv_b_next); } - return (equals_v2v2(luv_a_curr->uv, luv_b_curr->uv) && - equals_v2v2(luv_a_next->uv, luv_b_next->uv)); + return (equals_v2v2(luv_a_curr, luv_b_curr) && equals_v2v2(luv_a_next, luv_b_next)); } bool BM_loop_uv_share_vert_check(BMLoop *l_a, BMLoop *l_b, const int cd_loop_uv_offset) { BLI_assert(l_a->v == l_b->v); - const MLoopUV *luv_a = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_a, cd_loop_uv_offset); - const MLoopUV *luv_b = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_b, cd_loop_uv_offset); - if (!equals_v2v2(luv_a->uv, luv_b->uv)) { + const float *luv_a = BM_ELEM_CD_GET_FLOAT_P(l_a, cd_loop_uv_offset); + const float *luv_b = BM_ELEM_CD_GET_FLOAT_P(l_b, cd_loop_uv_offset); + if (!equals_v2v2(luv_a, luv_b)) { return false; } return true; @@ -150,11 +173,9 @@ bool BM_edge_uv_share_vert_check(BMEdge *e, BMLoop *l_a, BMLoop *l_b, const int const BMLoop *l_other_b = BM_loop_other_vert_loop_by_edge(l_b, e); { - const MLoopUV *luv_other_a = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_other_a, - cd_loop_uv_offset); - const MLoopUV *luv_other_b = (const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_other_b, - cd_loop_uv_offset); - if (!equals_v2v2(luv_other_a->uv, luv_other_b->uv)) { + const float *luv_other_a = BM_ELEM_CD_GET_FLOAT_P(l_other_a, cd_loop_uv_offset); + const float *luv_other_b = BM_ELEM_CD_GET_FLOAT_P(l_other_b, cd_loop_uv_offset); + if (!equals_v2v2(luv_other_a, luv_other_b)) { return false; } } @@ -172,7 +193,7 @@ bool BM_face_uv_point_inside_test(const BMFace *f, const float co[2], const int BLI_assert(BM_face_is_normal_valid(f)); for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f); i < f->len; i++, l_iter = l_iter->next) { - projverts[i] = ((const MLoopUV *)BM_ELEM_CD_GET_VOID_P(l_iter, cd_loop_uv_offset))->uv; + projverts[i] = BM_ELEM_CD_GET_FLOAT2_P(l_iter, cd_loop_uv_offset); } return isect_point_poly_v2( |