archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove some complexity in solidify code rim face creation.

Browse Source 
was doing a loop lookup when the index was already available.
This commit is contained in:
Campbell Barton
2012-01-17 13:18:23 +00:00
parent 4f268ec60a
commit 7e15c6ef97
1 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/blender/modifiers/intern/MOD_solidify.c
View File

@@ -586,7 +586,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
int eidx= new_edge_arr[i]; int eidx= new_edge_arr[i];
int fidx= edge_users[eidx]; int fidx= edge_users[eidx];
int flip, k1, k2; int flip, k1, k2;
MLoop *ml2;
if(fidx >= numFaces) { if(fidx >= numFaces) {
fidx -= numFaces; fidx -= numFaces;
@@ -603,38 +602,16 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
mp->loopstart = j+numLoops*2; mp->loopstart = j+numLoops*2;
mp->flag = mpoly[fidx].flag; mp->flag = mpoly[fidx].flag;
mp->totloop = 4; mp->totloop = 4;
ml2 = mloop + mpoly[fidx].loopstart; k1 = mpoly[fidx].loopstart + ((edge_order[eidx] + mp->totloop + 1) % mp->totloop);
for (k1=0; k1<mpoly[fidx].totloop; k1++, ml2++) { k2 = mpoly[fidx].loopstart + ((edge_order[eidx] % mp->totloop));
if (ml2->e == eidx)
break; CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops*2+j+0, 1);
} CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops*2+j+1, 1);
CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops*2+j+2, 1);
if (k1 == mpoly[fidx].totloop) { CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops*2+j+3, 1);
fprintf(stderr, "%s: solidify bad k1==totloop (bmesh internal error)\n", __func__);
}
if (ed->v2 == mloop[mpoly[fidx].loopstart+k1].v) {
k2 = (k1 + mp->totloop + 1)%mp->totloop;
SWAP(int, k1, k2);
}
else if (ed->v1 == mloop[mpoly[fidx].loopstart+k1].v) {
k2 = (k1+1)%mp->totloop;
}
else {
fprintf(stderr, "%s: solidify bad edge/vert\n", __func__);
k2 = k1;
}
k1 += mpoly[fidx].loopstart;
k2 += mpoly[fidx].loopstart;
if(flip) { if(flip) {
CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops*2+j, 1);
CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops*2+j+1, 1);
CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops*2+j+2, 1);
CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops*2+j+3, 1);
ml[j].v = ed->v1; ml[j].v = ed->v1;
ml[j++].e = eidx; ml[j++].e = eidx;
@@ -648,22 +625,17 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
ml[j++].e = numEdges*2 + old_vert_arr[ed->v1]; ml[j++].e = numEdges*2 + old_vert_arr[ed->v1];
} }
else { else {
CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops*2+j, 1); ml[j].v = ed->v2;
CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops*2+j+1, 1); ml[j++].e = eidx;
CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops*2+j+2, 1);
CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops*2+j+3, 1); ml[j].v = ed->v1;
ml[j++].e = numEdges*2 + old_vert_arr[ed->v1];
ml[j].v = ed->v1+numVerts; ml[j].v = ed->v1+numVerts;
ml[j++].e = eidx+numEdges; ml[j++].e = eidx+numEdges;
ml[j].v = ed->v2+numVerts; ml[j].v = ed->v2+numVerts;
ml[j++].e = numEdges*2 + old_vert_arr[ed->v2]; ml[j++].e = numEdges*2 + old_vert_arr[ed->v2];
ml[j].v = ed->v2;
ml[j++].e = eidx;
ml[j].v = ed->v1;
ml[j++].e = numEdges*2 + old_vert_arr[ed->v1];
} }
if (edge_origIndex) { if (edge_origIndex) {