diff options
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_snap.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 114 |
1 files changed, 82 insertions, 32 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 8000a3b03f1..654cc6b3080 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -55,6 +55,8 @@ #include "BKE_lattice.h" #include "BKE_main.h" #include "BKE_object.h" +#include "BKE_tessmesh.h" +#include "BKE_DerivedMesh.h" #include "WM_api.h" #include "WM_types.h" @@ -78,10 +80,11 @@ extern float originmat[3][3]; /* XXX object.c */ typedef struct TransVert { float *loc; - float oldloc[3], fac; + float oldloc[3], maploc[3], fac; float *val, oldval; int flag; float *nor; + int f1; } TransVert; static TransVert *transvmain=NULL; @@ -97,7 +100,7 @@ static void special_transvert_update(Object *obedit) if(obedit->type==OB_MESH) { Mesh *me= obedit->data; - recalc_editnormals(me->edit_mesh); // does face centers too + BM_Compute_Normals(me->edit_btmesh->bm); // does face centers too } else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) { Curve *cu= obedit->data; @@ -188,6 +191,19 @@ static void special_transvert_update(Object *obedit) } } +static void set_mapped_co(void *vuserdata, int index, float *co, float *UNUSED(no), short *UNUSED(no_s)) +{ + void ** userdata = vuserdata; + BMEditMesh *em = userdata[0]; + TransVert *tv = userdata[1]; + BMVert *eve = EDBM_get_vert_for_index(em, index); + + if (BM_GetIndex(eve) != -1 && !tv[BM_GetIndex(eve)].f1) { + copy_v3_v3(tv[BM_GetIndex(eve)].maploc, co); + tv[BM_GetIndex(eve)].f1 = 1; + } +} + /* copied from editobject.c, needs to be replaced with new transform code still */ /* mode flags: */ #define TM_ALL_JOINTS 1 /* all joints (for bones only) */ @@ -199,7 +215,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) BPoint *bp; TransVert *tv=NULL; MetaElem *ml; - EditVert *eve; + BMVert *eve; EditBone *ebo; float total, center[3], centroid[3]; int a; @@ -211,52 +227,87 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) if(obedit->type==OB_MESH) { Mesh *me= obedit->data; - EditMesh *em= me->edit_mesh; + BMEditMesh *em= me->edit_btmesh; + BMesh *bm = em->bm; + BMIter iter; + void *userdata[2] = {em, NULL}; + /*int proptrans= 0; */ /*UNUSED*/ // transform now requires awareness for select mode, so we tag the f1 flags in verts tottrans= 0; - if(em->selectmode & SCE_SELECT_VERTEX) { - for(eve= em->verts.first; eve; eve= eve->next) { - if(eve->h==0 && (eve->f & SELECT)) { - eve->f1= SELECT; + if(em->bm->selectmode & SCE_SELECT_VERTEX) { + BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + if(!BM_TestHFlag(eve, BM_HIDDEN) && BM_TestHFlag(eve, BM_SELECT)) { + BM_SetIndex(eve, 1); tottrans++; } - else eve->f1= 0; + else BM_SetIndex(eve, 0); } } - else if(em->selectmode & SCE_SELECT_EDGE) { - EditEdge *eed; - for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0; - for(eed= em->edges.first; eed; eed= eed->next) { - if(eed->h==0 && (eed->f & SELECT)) eed->v1->f1= eed->v2->f1= SELECT; + else if(em->bm->selectmode & SCE_SELECT_EDGE) { + BMEdge *eed; + + BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) + BM_SetIndex(eve, 0); + + BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + if(!BM_TestHFlag(eed, BM_HIDDEN) && BM_TestHFlag(eed, BM_SELECT)) + BM_SetIndex(eed->v1, 1), BM_SetIndex(eed->v2, 1); } - for(eve= em->verts.first; eve; eve= eve->next) if(eve->f1) tottrans++; + + BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) + if(BM_GetIndex(eve)) tottrans++; } else { - EditFace *efa; - for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0; - for(efa= em->faces.first; efa; efa= efa->next) { - if(efa->h==0 && (efa->f & SELECT)) { - efa->v1->f1= efa->v2->f1= efa->v3->f1= SELECT; - if(efa->v4) efa->v4->f1= SELECT; + BMFace *efa; + + BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) + BM_SetIndex(eve, 0); + + BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + if(!BM_TestHFlag(efa, BM_HIDDEN) && BM_TestHFlag(efa, BM_SELECT)) { + BMIter liter; + BMLoop *l; + + BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_SetIndex(l->v, 1); + } } } - for(eve= em->verts.first; eve; eve= eve->next) if(eve->f1) tottrans++; + + BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) + if(BM_GetIndex(eve)) tottrans++; } /* and now make transverts */ if(tottrans) { tv=transvmain= MEM_callocN(tottrans*sizeof(TransVert), "maketransverts"); - - for(eve= em->verts.first; eve; eve= eve->next) { - if(eve->f1) { + + a = 0; + BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + if(BM_GetIndex(eve)) { + BM_SetIndex(eve, a); VECCOPY(tv->oldloc, eve->co); tv->loc= eve->co; if(eve->no[0] != 0.0f || eve->no[1] != 0.0f ||eve->no[2] != 0.0f) tv->nor= eve->no; // note this is a hackish signal (ton) - tv->flag= eve->f1 & SELECT; + tv->flag= BM_GetIndex(eve) & SELECT; tv++; - } + a++; + } else BM_SetIndex(eve, -1); + } + + userdata[1] = transvmain; + } + + if (transvmain && em->derivedCage) { + EDBM_init_index_arrays(em, 1, 0, 0); + em->derivedCage->foreachMappedVert(em->derivedCage, set_mapped_co, userdata); + EDBM_free_index_arrays(em); + } else if (transvmain) { + tv = transvmain; + for (a=0; a<tottrans; a++, tv++) { + copy_v3_v3(tv->maploc, tv->loc); } } } @@ -870,10 +921,10 @@ static int snap_curs_to_active(bContext *C, wmOperator *UNUSED(op)) if (obedit->type == OB_MESH) { /* check active */ Mesh *me= obedit->data; - EditSelection ese; + BMEditSelection ese; - if (EM_get_actSelection(me->edit_mesh, &ese)) { - EM_editselection_center(curs, &ese); + if (EDBM_get_actSelection(me->edit_btmesh, &ese)) { + EDBM_editselection_center(me->edit_btmesh, curs, &ese); } mul_m4_v3(obedit->obmat, curs); @@ -958,7 +1009,7 @@ int minmax_verts(Object *obedit, float *min, float *max) tv= transvmain; for(a=0; a<tottrans; a++, tv++) { - VECCOPY(vec, tv->loc); + VECCOPY(vec, tv->maploc); mul_m3_v3(bmat, vec); add_v3_v3(vec, obedit->obmat[3]); add_v3_v3(centroid, vec); @@ -970,4 +1021,3 @@ int minmax_verts(Object *obedit, float *min, float *max) return 1; } - |