griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add normal option to ED_transverts

Browse Source
This commit is contained in:
Campbell Barton
2014-03-31 14:55:55 +11:00
parent 0055162b75
commit 4e7872ce46
2 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/include/ED_transverts.h
View File

@@ -36,12 +36,14 @@ struct Object;
typedef struct TransVert {
float *loc;
float oldloc[3], maploc[3];
float normal[3];
int flag;
} TransVert;
typedef struct TransVertStore {
struct TransVert *transverts;
int transverts_tot;
int mode;
} TransVertStore;
void ED_transverts_create_from_obedit(TransVertStore *tvs, struct Object *obedit, const int mode);
@@ -59,12 +61,15 @@ enum {
/* mode flags: */
enum {
TM_ALL_JOINTS = 1, /* all joints (for bones only) */
TM_SKIP_HANDLES = 2 /* skip handles when control point is selected (for curves only) */
TM_ALL_JOINTS = (1 << 0), /* all joints (for bones only) */
TM_SKIP_HANDLES = (1 << 1), /* skip handles when control point is selected (for curves only) */
TM_CALC_NORMALS = (1 << 2), /* fill in normals when available */
};
/* SELECT == (1 << 0) */
#define TX_VERT_USE_MAPLOC (1 << 1)
enum {
/* SELECT == (1 << 0) */
TX_VERT_USE_MAPLOC = (1 << 1),
TX_VERT_USE_NORMAL = (1 << 2), /* avoid nonzero check */
};
#endif /* __ED_TRANSVERTS_H__ */

72
source/blender/editors/util/ed_transverts.c
View File

@@ -53,6 +53,7 @@
/* copied from editobject.c, now uses (almost) proper depgraph */
void ED_transverts_update_obedit(TransVertStore *tvs, Object *obedit)
{
const int mode = tvs->mode;
BLI_assert(ED_transverts_check_obedit(obedit) == true);
DAG_id_tag_update(obedit->data, 0);
@@ -68,32 +69,45 @@ void ED_transverts_update_obedit(TransVertStore *tvs, Object *obedit)
while (nu) {
/* keep handles' vectors unchanged */
if (nu->bezt) {
if (nu->bezt && (mode & TM_SKIP_HANDLES)) {
int a = nu->pntsu;
TransVert *tv = tvs->transverts;
BezTriple *bezt = nu->bezt;
while (a--) {
if (bezt->f1 & SELECT) tv++;
if (bezt->hide == 0) {
bool skip_handle = false;
if (bezt->f2 & SELECT)
skip_handle = (mode & TM_SKIP_HANDLES) != 0;
if (bezt->f2 & SELECT) {
float v[3];
if (bezt->f1 & SELECT) {
sub_v3_v3v3(v, (tv - 1)->oldloc, tv->oldloc);
add_v3_v3v3(bezt->vec[0], bezt->vec[1], v);
if ((bezt->f1 & SELECT) && !skip_handle) {
BLI_assert(tv->loc == bezt->vec[0]);
tv++;
}
if (bezt->f3 & SELECT) {
sub_v3_v3v3(v, (tv + 1)->oldloc, tv->oldloc);
add_v3_v3v3(bezt->vec[2], bezt->vec[1], v);
if (bezt->f2 & SELECT) {
float v[3];
if (((bezt->f1 & SELECT) && !skip_handle) == 0) {
sub_v3_v3v3(v, tv->loc, tv->oldloc);
add_v3_v3(bezt->vec[0], v);
}
if (((bezt->f3 & SELECT) && !skip_handle) == 0) {
sub_v3_v3v3(v, tv->loc, tv->oldloc);
add_v3_v3(bezt->vec[2], v);
}
BLI_assert(tv->loc == bezt->vec[1]);
tv++;
}
tv++;
if ((bezt->f3 & SELECT) && !skip_handle) {
BLI_assert(tv->loc == bezt->vec[2]);
tv++;
}
}
if (bezt->f3 & SELECT) tv++;
bezt++;
}
}
@@ -271,6 +285,12 @@ void ED_transverts_create_from_obedit(TransVertStore *tvs, Object *obedit, const
copy_v3_v3(tv->oldloc, eve->co);
tv->loc = eve->co;
tv->flag = (BM_elem_index_get(eve) == TM_INDEX_ON) ? SELECT : 0;
if (mode & TM_CALC_NORMALS) {
tv->flag |= TX_VERT_USE_NORMAL;
copy_v3_v3(tv->normal, eve->no);
}
tv++;
a++;
}
@@ -353,14 +373,20 @@ void ED_transverts_create_from_obedit(TransVertStore *tvs, Object *obedit, const
bezt = nu->bezt;
while (a--) {
if (bezt->hide == 0) {
int skip_handle = 0;
bool skip_handle = false;
if (bezt->f2 & SELECT)
skip_handle = mode & TM_SKIP_HANDLES;
skip_handle = (mode & TM_SKIP_HANDLES) != 0;
if ((bezt->f1 & SELECT) && !skip_handle) {
copy_v3_v3(tv->oldloc, bezt->vec[0]);
tv->loc = bezt->vec[0];
tv->flag = bezt->f1 & SELECT;
if (mode & TM_CALC_NORMALS) {
tv->flag |= TX_VERT_USE_NORMAL;
BKE_nurb_bezt_calc_plane(nu, bezt, tv->normal);
}
tv++;
tvs->transverts_tot++;
}
@@ -368,6 +394,12 @@ void ED_transverts_create_from_obedit(TransVertStore *tvs, Object *obedit, const
copy_v3_v3(tv->oldloc, bezt->vec[1]);
tv->loc = bezt->vec[1];
tv->flag = bezt->f2 & SELECT;
if (mode & TM_CALC_NORMALS) {
tv->flag |= TX_VERT_USE_NORMAL;
BKE_nurb_bezt_calc_plane(nu, bezt, tv->normal);
}
tv++;
tvs->transverts_tot++;
}
@@ -375,6 +407,12 @@ void ED_transverts_create_from_obedit(TransVertStore *tvs, Object *obedit, const
copy_v3_v3(tv->oldloc, bezt->vec[2]);
tv->loc = bezt->vec[2];
tv->flag = bezt->f3 & SELECT;
if (mode & TM_CALC_NORMALS) {
tv->flag |= TX_VERT_USE_NORMAL;
BKE_nurb_bezt_calc_plane(nu, bezt, tv->normal);
}
tv++;
tvs->transverts_tot++;
}
@@ -448,6 +486,8 @@ void ED_transverts_create_from_obedit(TransVertStore *tvs, Object *obedit, const
MEM_freeN(tvs->transverts);
tvs->transverts = NULL;
}
tvs->mode = mode;
}
void ED_transverts_free(TransVertStore *tvs)