From 319036f2d57c3fd9463648c4187ed4a387b0ab33 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Apr 2013 12:00:37 +0000 Subject: fix [#35026] Curve build modifier --- source/blender/blenkernel/BKE_mesh.h | 2 + source/blender/blenkernel/intern/cdderivedmesh.c | 2 - source/blender/blenkernel/intern/mesh.c | 104 +++++++++++++++++++-- source/blender/blenkernel/intern/mesh_validate.c | 2 +- source/blender/blenkernel/intern/particle_system.c | 2 +- 5 files changed, 100 insertions(+), 12 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 429dacb90ef..d208a6b919d 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -36,6 +36,7 @@ struct ID; struct BoundBox; struct DispList; +struct EdgeHash; struct ListBase; struct BMEditMesh; struct BMesh; @@ -340,6 +341,7 @@ void BKE_mesh_loops_to_mface_corners(struct CustomData *fdata, struct CustomData const int polyindex, const int mf_len, const int numTex, const int numCol, const int hasPCol, const int hasOrigSpace); +void BKE_mesh_poly_edgehash_insert(struct EdgeHash *ehash, const struct MPoly *mp, const struct MLoop *mloop); void BKE_mesh_poly_calc_angles(struct MVert *mvert, struct MLoop *mloop, struct MPoly *mp, float angles[]); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 1a3f5a700b9..ee9812451eb 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1837,8 +1837,6 @@ DerivedMesh *CDDM_from_curve_displist(Object *ob, ListBase *dispbase) MEM_freeN(allloop); MEM_freeN(allpoly); - CDDM_calc_edges(dm); - return dm; } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 0d662711df0..1e1ea0479bd 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1202,6 +1202,80 @@ void BKE_mesh_from_metaball(ListBase *lb, Mesh *me) } } +/** + * Specialized function to use when we _know_ existing edges don't overlap with poly edges. + */ +static void make_edges_mdata_extend(MEdge **r_alledge, int *r_totedge, + const MPoly *mpoly, MLoop *mloop, + const int totpoly) +{ + int totedge = *r_totedge; + int totedge_new; + EdgeHash *eh; + const MPoly *mp; + int i; + + eh = BLI_edgehash_new(); + + for (i = 0, mp = mpoly; i < totpoly; i++, mp++) { + BKE_mesh_poly_edgehash_insert(eh, mp, mloop + mp->loopstart); + } + + totedge_new = BLI_edgehash_size(eh); + +#ifdef DEBUG + /* ensure that theres no overlap! */ + if (totedge_new) { + MEdge *medge = *r_alledge; + for (i = 0; i < totedge; i++, medge++) { + BLI_assert(BLI_edgehash_haskey(eh, medge->v1, medge->v2) == false); + } + } +#endif + + if (totedge_new) { + EdgeHashIterator *ehi; + MEdge *medge; + unsigned int e_index = totedge; + + *r_alledge = medge = (*r_alledge ? MEM_reallocN(*r_alledge, sizeof(MEdge) * (totedge + totedge_new)) : + MEM_callocN(sizeof(MEdge) * totedge_new, __func__)); + medge += totedge; + + totedge += totedge_new; + + /* --- */ + for (ehi = BLI_edgehashIterator_new(eh); + BLI_edgehashIterator_isDone(ehi) == FALSE; + BLI_edgehashIterator_step(ehi), ++medge, e_index++) + { + BLI_edgehashIterator_getKey(ehi, &medge->v1, &medge->v2); + BLI_edgehashIterator_setValue(ehi, SET_UINT_IN_POINTER(e_index)); + + medge->crease = medge->bweight = 0; + medge->flag = ME_EDGEDRAW | ME_EDGERENDER; + } + BLI_edgehashIterator_free(ehi); + + *r_totedge = totedge; + + + for (i = 0, mp = mpoly; i < totpoly; i++, mp++) { + MLoop *l = &mloop[mp->loopstart]; + MLoop *l_prev = (l + (mp->totloop - 1)); + int j; + for (j = 0; j < mp->totloop; j++, l++) { + /* lookup hashed edge index */ + l_prev->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(eh, l_prev->v, l->v)); + l_prev = l; + } + } + } + + BLI_edgehash_free(eh, NULL); +} + + /* Initialize mverts, medges and, faces for converting nurbs to mesh and derived mesh */ /* return non-zero on error */ int BKE_mesh_nurbs_to_mdata(Object *ob, MVert **allvert, int *totvert, @@ -1241,6 +1315,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase, cu = ob->data; + conv_polys |= cu->flag & CU_3D; /* 2d polys are filled with DL_INDEX3 displists */ conv_polys |= ob->type == OB_SURF; /* surf polys are never filled */ @@ -1461,17 +1536,16 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase, dl = dl->next; } + if (totvlak) { + make_edges_mdata_extend(alledge, &totedge, + *allpoly, *allloop, totvlak); + } + *_totpoly = totvlak; *_totloop = totloop; *_totedge = totedge; *_totvert = totvert; - /* not uded for bmesh */ -#if 0 - make_edges_mdata(*allvert, *allface, *allloop, *allpoly, totvert, totvlak, *_totloop, *_totpoly, 0, alledge, _totedge); - mfaces_strip_loose(*allface, _totface); -#endif - return 0; } @@ -1522,8 +1596,6 @@ void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use } BKE_mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop, me->totpoly, NULL); - - BKE_mesh_calc_edges(me, true, false); } else { me = BKE_mesh_add(G.main, "Mesh"); @@ -3415,6 +3487,22 @@ void BKE_mesh_poly_calc_angles(MVert *mvert, MLoop *mloop, #else /* equivalent the function above but avoid multiple subtractions + normalize */ +void BKE_mesh_poly_edgehash_insert(EdgeHash *ehash, const MPoly *mp, const MLoop *mloop) +{ + const MLoop *ml, *ml_next; + int i = mp->totloop; + + ml_next = mloop; /* first loop */ + ml = &ml_next[i - 1]; /* last loop */ + + while (i-- != 0) { + BLI_edgehash_insert(ehash, ml->v, ml_next->v, NULL); + + ml = ml_next; + ml_next++; + } +} + void BKE_mesh_poly_calc_angles(MVert *mvert, MLoop *mloop, MPoly *mp, float angles[]) { diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 3f118129dac..6fb83b83c25 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -37,9 +37,9 @@ #include "BLO_sys_types.h" +#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_math_base.h" -#include "BLI_utildefines.h" #include "BKE_deform.h" #include "BKE_depsgraph.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index f131e7297ed..74a50389cd5 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -62,6 +62,7 @@ #include "DNA_ipo_types.h" // XXX old animation system stuff... to be removed! #include "DNA_listBase.h" +#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_rand.h" #include "BLI_jitter.h" @@ -70,7 +71,6 @@ #include "BLI_kdtree.h" #include "BLI_kdopbvh.h" #include "BLI_threads.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BKE_main.h" -- cgit v1.2.3