Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-19 17:53:37 +00:00
parent 439f0ef7dd
commit 80ad78dbb5
1 changed files with 86 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@@ -391,13 +391,10 @@ void vpaint_fill(Object *ob, unsigned int paintcol)
void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
{
Mesh *me;
MFace *mface;
MDeformWeight *dw, *uw;
int *indexar;
int index, vgroup;
unsigned int faceverts[5]={0,0,0,0,0};
unsigned char i;
int vgroup_mirror= -1;
unsigned int index;
int vgroup, vgroup_mirror= -1;
int selected;
int use_vert_sel;
@@ -412,8 +409,9 @@ void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
indexar= get_indexarray(me);
if(selected) {
for(index=0, mface=me->mface; index<me->totface; index++, mface++) {
if((mface->flag & ME_FACE_SEL)==0)
MFace *mf;
for(index=0, mf= me->mface; index<me->totface; index++, mf++) {
if((mf->flag & ME_FACE_SEL)==0)
indexar[index]= 0;
else
indexar[index]= index+1;
@@ -435,27 +433,25 @@ void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
for(index=0; index<me->totface; index++) {
if(indexar[index] && indexar[index]<=me->totface) {
mface= me->mface + (indexar[index]-1);
/* just so we can loop through the verts */
faceverts[0]= mface->v1;
faceverts[1]= mface->v2;
faceverts[2]= mface->v3;
faceverts[3]= mface->v4;
for (i=0; i<3 || faceverts[i]; i++) {
if(!me->dvert[faceverts[i]].flag) {
MFace *mf= &me->mface[indexar[index]-1];
unsigned int fidx= mf->v4 ? 3:2;
if(use_vert_sel && !(me->mvert[faceverts[i]].flag & SELECT)) {
do {
unsigned int vidx= *(&mf->v1 + fidx);
if(!me->dvert[vidx].flag) {
if(use_vert_sel && !(me->mvert[vidx].flag & SELECT)) {
continue;
}
dw= defvert_verify_index(me->dvert+faceverts[i], vgroup);
dw= defvert_verify_index(&me->dvert[vidx], vgroup);
if(dw) {
uw= defvert_verify_index(wp->wpaint_prev+faceverts[i], vgroup);
uw= defvert_verify_index(wp->wpaint_prev+vidx, vgroup);
uw->weight= dw->weight; /* set the undo weight */
dw->weight= paintweight;
if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
int j= mesh_get_x_mirror_vert(ob, faceverts[i]);
int j= mesh_get_x_mirror_vert(ob, vidx);
if(j>=0) {
/* copy, not paint again */
if(vgroup_mirror != -1) {
@@ -470,16 +466,19 @@ void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
}
}
}
(me->dvert+faceverts[i])->flag= 1;
me->dvert[vidx].flag= 1;
}
}
} while (fidx--);
}
}
index=0;
while (index<me->totvert) {
(me->dvert+index)->flag= 0;
index++;
{
MDeformVert *dv= me->dvert;
for(index= me->totvert; index != 0; index--, dv++) {
dv->flag= 0;
}
}
MEM_freeN(indexar);
@@ -995,7 +994,7 @@ static EnumPropertyItem *weight_paint_sample_enum_itemf(bContext *C, PointerRNA
const int totgroup= BLI_countlist(&vc.obact->defbase);
if(totgroup) {
MFace *mf= ((MFace *)me->mface) + index-1;
int fidx= mf->v4 ? 3:2;
unsigned int fidx= mf->v4 ? 3:2;
int *groups= MEM_callocN(totgroup*sizeof(int), "groups");
int found= FALSE;
@@ -1309,7 +1308,7 @@ static void enforce_locks(MDeformVert *odv, MDeformVert *ndv, int defbase_tot,
int total_valid = 0;
int total_changed = 0;
int i;
unsigned int i;
MDeformWeight *ndw;
MDeformWeight *odw;
MDeformWeight *ndw2;
@@ -1400,10 +1399,10 @@ static void enforce_locks(MDeformVert *odv, MDeformVert *ndv, int defbase_tot,
storedw = ndw->weight;
for(i = 0; i < ndv->totweight; i++) {
if(change_status[ndw->def_nr] == 2) {
odw2 = (odv->dw+i);
ndw2 = (ndv->dw+i);
odw2 = &odv->dw[i];
ndw2 = &ndv->dw[i];
if(!designatedw_changed) {
ndw->weight = (totchange_allowed + odw->weight + odw2->weight)/(1 + ndw2->weight/ndw->weight);
ndw->weight = (totchange_allowed + odw->weight + odw2->weight)/(1.0f + ndw2->weight/ndw->weight);
designatedw_changed = TRUE;
}
ndw2->weight = ndw->weight * ndw2->weight / storedw;
@@ -1419,8 +1418,12 @@ static void enforce_locks(MDeformVert *odv, MDeformVert *ndv, int defbase_tot,
}
else {
/* reset the weights */
for(i = 0; i < ndv->totweight; i++) {
ndv->dw[i].weight = odv->dw[i].weight;
unsigned int i;
MDeformWeight *dw_old= odv->dw;
MDeformWeight *dw_new= ndv->dw;
for (i= odv->totweight; i != 0; i--, dw_old++, dw_new++) {
dw_new->weight= dw_old->weight;
}
}
}
@@ -1432,10 +1435,11 @@ static void enforce_locks(MDeformVert *odv, MDeformVert *ndv, int defbase_tot,
static float get_mp_change(MDeformVert *odv, char *defbase_sel, float brush_change)
{
float selwsum = 0.0f;
int i;
MDeformWeight *dw;
for(i=0; i < odv->totweight; i++) {
if(defbase_sel[(dw= &odv->dw[i])->def_nr]) {
unsigned int i;
MDeformWeight *dw= odv->dw;
for (i= odv->totweight; i != 0; i--, dw++) {
if(defbase_sel[dw->def_nr]) {
selwsum += dw->weight;
}
}
@@ -1447,24 +1451,24 @@ static float get_mp_change(MDeformVert *odv, char *defbase_sel, float brush_chan
/* change the weights back to the wv's weights
* it assumes you already have the correct pointer index */
static void reset_to_prev(MDeformVert *wv, MDeformVert *dv)
static void reset_to_prev(MDeformVert *wv, MDeformVert *dvert)
{
int i;
MDeformWeight *d;
MDeformWeight *dw= dvert->dw;
MDeformWeight *w;
for(i = 0; i < dv->totweight; i++) {
d= &dv->dw[i];
w= defvert_find_index(wv, d->def_nr);
unsigned int i;
for (i= dvert->totweight; i != 0; i--, dw++) {
w= defvert_find_index(wv, dw->def_nr);
/* if there was no w when there is a d, then the old weight was 0 */
d->weight = w ? w->weight : 0.0f;
dw->weight = w ? w->weight : 0.0f;
}
}
static void clamp_weights(MDeformVert *dvert)
{
int i;
for (i = 0; i < dvert->totweight; i++) {
CLAMP((dvert->dw+i)->weight, 0.0f, 1.0f);
MDeformWeight *dw= dvert->dw;
unsigned int i;
for (i= dvert->totweight; i != 0; i--, dw++) {
CLAMP(dw->weight, 0.0f, 1.0f);
}
}
@@ -1499,12 +1503,12 @@ typedef struct WeightPaintInfo {
/* returns TRUE if it thinks you need to reset the weights due to
* normalizing while multi-painting */
static int apply_mp_locks_normalize(Mesh *me, const WeightPaintInfo *wpi,
const int index,
const unsigned int index,
MDeformWeight *dw, MDeformWeight *tdw,
float change, float oldChange,
float oldw, float neww)
{
MDeformVert *dv= me->dvert+index;
MDeformVert *dv= &me->dvert[index];
MDeformVert dv_test= {NULL};
dv_test.dw= MEM_dupallocN(dv->dw);
@@ -1556,10 +1560,9 @@ static int apply_mp_locks_normalize(Mesh *me, const WeightPaintInfo *wpi,
static int get_first_selected_nonzero_weight(MDeformVert *dvert, char *defbase_sel)
{
int i;
MDeformWeight *dw;
for(i=0; i< dvert->totweight; i++) {
dw = &dvert->dw[i];
if(defbase_sel[dw->def_nr] && dw->weight > 0) {
MDeformWeight *dw= dvert->dw;
for(i=0; i< dvert->totweight; i++, dw++) {
if(defbase_sel[dw->def_nr] && dw->weight > 0.0f) {
return i;
}
}
@@ -1573,7 +1576,7 @@ static char *wpaint_make_validmap(Object *ob);
static void do_weight_paint_vertex( /* vars which remain the same for every vert */
VPaint *wp, Object *ob, const WeightPaintInfo *wpi,
/* vars which change on each stroke */
int index, float alpha, float paintweight
const unsigned int index, float alpha, float paintweight
)
{
Mesh *me= ob->data;
@@ -1582,11 +1585,11 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
int vgroup= ob->actdef-1;
if(wp->flag & VP_ONLYVGROUP) {
dw= defvert_find_index(me->dvert+index, vgroup);
dw= defvert_find_index(&me->dvert[index], vgroup);
uw= defvert_find_index(wp->wpaint_prev+index, vgroup);
}
else {
dw= defvert_verify_index(me->dvert+index, vgroup);
dw= defvert_verify_index(&me->dvert[index], vgroup);
uw= defvert_verify_index(wp->wpaint_prev+index, vgroup);
}
if(dw==NULL || uw==NULL)
@@ -1601,7 +1604,7 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
(wpi->lock_flags == NULL || has_locked_group(&me->dvert[index], wpi->lock_flags) == FALSE))
{
wpaint_blend(wp, dw, uw, alpha, paintweight, wpi->do_flip, FALSE);
do_weight_paint_auto_normalize_all_groups(me->dvert+index, wpi->vgroup_validmap, wpi->do_auto_normalize);
do_weight_paint_auto_normalize_all_groups(&me->dvert[index], wpi->vgroup_validmap, wpi->do_auto_normalize);
if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
int j= mesh_get_x_mirror_vert(ob, index);
@@ -1633,15 +1636,15 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
/* setup multi-paint */
if(wpi->defbase_tot_sel > 1 && wpi->do_multipaint) {
dv.dw= MEM_dupallocN((me->dvert+index)->dw);
dv.dw= MEM_dupallocN(me->dvert[index].dw);
dv.flag = me->dvert[index].flag;
dv.totweight = (me->dvert+index)->totweight;
dv.totweight = me->dvert[index].totweight;
tdw = dw;
tuw = uw;
change = get_mp_change(wp->wpaint_prev+index, wpi->defbase_sel, neww - oldw);
if(change) {
if(!tdw->weight) {
i = get_first_selected_nonzero_weight(me->dvert+index, wpi->defbase_sel);
i = get_first_selected_nonzero_weight(&me->dvert[index], wpi->defbase_sel);
if(i>=0) {
tdw = &(me->dvert[index].dw[i]);
tuw = defvert_verify_index(wp->wpaint_prev+index, tdw->def_nr);
@@ -1657,7 +1660,7 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
if( testw > tuw->weight ) {
if(change > oldChange) {
/* reset the weights and use the new change */
reset_to_prev(wp->wpaint_prev+index, me->dvert+index);
reset_to_prev(wp->wpaint_prev+index, &me->dvert[index]);
}
else {
/* the old change was more significant, so set
@@ -1667,7 +1670,7 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
}
else {
if(change < oldChange) {
reset_to_prev(wp->wpaint_prev+index, me->dvert+index);
reset_to_prev(wp->wpaint_prev+index, &me->dvert[index]);
}
else {
change = 0;
@@ -1682,7 +1685,7 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
}
if(apply_mp_locks_normalize(me, wpi, index, dw, tdw, change, oldChange, oldw, neww)) {
reset_to_prev(&dv, me->dvert+index);
reset_to_prev(&dv, &me->dvert[index]);
change = 0;
oldChange = 0;
}
@@ -1690,7 +1693,7 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
MEM_freeN(dv.dw);
}
/* dvert may have been altered greatly */
dw = defvert_find_index(me->dvert+index, vgroup);
dw = defvert_find_index(&me->dvert[index], vgroup);
if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
int j= mesh_get_x_mirror_vert(ob, index);
@@ -1958,7 +1961,8 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
float mat[4][4];
float paintweight;
int *indexar;
int totindex, index, totw;
int totw;
unsigned int index, totindex;
float alpha;
float mval[2], pressure;
int use_vert_sel;
@@ -2075,22 +2079,24 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
if(brush->vertexpaint_tool==VP_BLUR) {
MDeformWeight *dw, *(*dw_func)(MDeformVert *, const int);
unsigned int fidx= mface->v4 ? 3:2;
if(wp->flag & VP_ONLYVGROUP)
dw_func= (MDeformWeight *(*)(MDeformVert *, const int))defvert_find_index;
else
dw_func= defvert_verify_index;
dw= dw_func(me->dvert+mface->v1, ob->actdef-1);
if(dw) {paintweight+= dw->weight; totw++;}
dw= dw_func(me->dvert+mface->v2, ob->actdef-1);
if(dw) {paintweight+= dw->weight; totw++;}
dw= dw_func(me->dvert+mface->v3, ob->actdef-1);
if(dw) {paintweight+= dw->weight; totw++;}
if(mface->v4) {
dw= dw_func(me->dvert+mface->v4, ob->actdef-1);
if(dw) {paintweight+= dw->weight; totw++;}
}
do {
unsigned int vidx= *(&mface->v1 + fidx);
dw= dw_func(me->dvert+vidx, ob->actdef-1);
if(dw) {
paintweight+= dw->weight;
totw++;
}
} while (fidx--);
}
}
}
@@ -2104,7 +2110,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
MFace *mf= me->mface + (indexar[index]-1);
unsigned int fidx= mf->v4 ? 3:2;;
do {
int vidx= *(&mf->v1 + fidx);
unsigned int vidx= *(&mf->v1 + fidx);
if(me->dvert[vidx].flag) {
alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*vidx, mval, pressure);
@@ -2366,12 +2372,12 @@ static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, wmEvent
return 1;
}
static void vpaint_paint_face(VPaint *vp, VPaintData *vpd, Object *ob, int index, const float mval[2], float pressure, int UNUSED(flip))
static void vpaint_paint_face(VPaint *vp, VPaintData *vpd, Object *ob, const unsigned int index, const float mval[2], float pressure, int UNUSED(flip))
{
ViewContext *vc = &vpd->vc;
Brush *brush = paint_brush(&vp->paint);
Mesh *me = get_mesh(ob);
MFace *mface= ((MFace*)me->mface) + index;
MFace *mface= &me->mface[index];
unsigned int *mcol= ((unsigned int*)me->mcol) + 4*index;
unsigned int *mcolorig= ((unsigned int*)vp->vpaint_prev) + 4*index;
float alpha;