[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31085] trunk/blender/source/blender/ modifiers/intern/MOD_screw.c: bugfix [#23179] Screw Modifier looses VGroups
Campbell Barton
ideasman42 at gmail.com
Fri Aug 6 01:40:21 CEST 2010
Revision: 31085
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31085
Author: campbellbarton
Date: 2010-08-06 01:40:21 +0200 (Fri, 06 Aug 2010)
Log Message:
-----------
bugfix [#23179] Screw Modifier looses VGroups
- flip option now flips faces rather then flipping loop order. Now it can copy vertex data in chunks the size of the original vertex count.
- converted macro's to static func's and some general cleanup.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_screw.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2010-08-05 22:35:23 UTC (rev 31084)
+++ trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2010-08-05 23:40:21 UTC (rev 31085)
@@ -61,39 +61,45 @@
MEdge *e;
} ScrewVertIter;
-#define ScrewVertIter_INIT(iter, array, v_init, dir)\
- iter.v_array = array;\
- iter.v = v_init;\
- if (v_init>=0) {\
- iter.v_poin = &array[v_init];\
- iter.v_other = iter.v_poin->v[dir];\
- if (dir)\
- iter.e = iter.v_poin->e[0];\
- else\
- iter.e = iter.v_poin->e[1];\
- } else {\
- iter.v_poin= NULL;\
- iter.e= NULL;\
+
+static void screwvert_iter_init(ScrewVertIter *iter, ScrewVertConnect *array, int v_init, int dir)
+{
+ iter->v_array = array;
+ iter->v = v_init;
+
+ if (v_init >= 0) {
+ iter->v_poin = &array[v_init];
+ iter->v_other = iter->v_poin->v[dir];
+ iter->e = iter->v_poin->e[!dir];
}
+ else {
+ iter->v_poin= NULL;
+ iter->e= NULL;
+ }
+}
-#define ScrewVertIter_NEXT(iter)\
- if (iter.v_poin->v[0] == iter.v_other) {\
- iter.v_other= iter.v;\
- iter.v= iter.v_poin->v[1];\
- } else if (iter.v_poin->v[1] == iter.v_other) {\
- iter.v_other= iter.v;\
- iter.v= iter.v_poin->v[0];\
- }\
- if (iter.v >=0) {\
- iter.v_poin= &iter.v_array[iter.v];\
- if ( iter.v_poin->e[0] != iter.e ) iter.e= iter.v_poin->e[0];\
- else iter.e= iter.v_poin->e[1];\
- } else {\
- iter.e= NULL;\
- iter.v_poin= NULL;\
+static void screwvert_iter_step(ScrewVertIter *iter)
+{
+ if (iter->v_poin->v[0] == iter->v_other) {
+ iter->v_other= iter->v;
+ iter->v= iter->v_poin->v[1];
}
-
+ else if (iter->v_poin->v[1] == iter->v_other) {
+ iter->v_other= iter->v;
+ iter->v= iter->v_poin->v[0];
+ }
+ if (iter->v >= 0) {
+ iter->v_poin= &iter->v_array[iter->v];
+ iter->e= iter->v_poin->e[(iter->v_poin->e[0] == iter->e)];
+ }
+ else {
+ iter->e= NULL;
+ iter->v_poin= NULL;
+ }
+}
+
+
static void initData(ModifierData *md)
{
ScrewModifierData *ltmd= (ScrewModifierData*) md;
@@ -131,9 +137,11 @@
int *origindex;
int mface_index=0;
+ int step;
int i, j;
int i1,i2;
- int steps= ltmd->steps;
+ int step_tot= ltmd->steps;
+ const int do_flip = ltmd->flag & MOD_SCREW_NORMAL_FLIP ? 1 : 0;
int maxVerts=0, maxEdges=0, maxFaces=0;
int totvert= dm->getNumVerts(dm);
int totedge= dm->getNumEdges(dm);
@@ -167,7 +175,7 @@
if (!totvert)
return CDDM_from_template(dm, 0, 0, 0);
- steps= useRenderParams ? ltmd->render_steps : ltmd->steps;
+ step_tot= useRenderParams ? ltmd->render_steps : ltmd->steps;
switch(ltmd->axis) {
case 0:
@@ -261,30 +269,30 @@
screw_ofs *= ltmd->iter;
/* multiplying the steps is a bit tricky, this works best */
- steps = ((steps + 1) * ltmd->iter) - (ltmd->iter - 1);
+ step_tot = ((step_tot + 1) * ltmd->iter) - (ltmd->iter - 1);
/* will the screw be closed?
* Note! smaller then FLT_EPSILON*100 gives problems with float precission so its never closed. */
if (fabs(screw_ofs) <= (FLT_EPSILON*100) && fabs(fabs(angle) - (M_PI * 2)) <= (FLT_EPSILON*100)) {
close= 1;
- steps--;
- if(steps < 2) steps= 2;
+ step_tot--;
+ if(step_tot < 2) step_tot= 2;
- maxVerts = totvert * steps; /* -1 because we're joining back up */
- maxEdges = (totvert * steps) + /* these are the edges between new verts */
- (totedge * steps); /* -1 because vert edges join */
- maxFaces = totedge * steps;
+ maxVerts = totvert * step_tot; /* -1 because we're joining back up */
+ maxEdges = (totvert * step_tot) + /* these are the edges between new verts */
+ (totedge * step_tot); /* -1 because vert edges join */
+ maxFaces = totedge * step_tot;
screw_ofs= 0.0f;
}
else {
close= 0;
- if(steps < 2) steps= 2;
+ if(step_tot < 2) step_tot= 2;
- maxVerts = totvert * steps; /* -1 because we're joining back up */
- maxEdges = (totvert * (steps-1)) + /* these are the edges between new verts */
- (totedge * steps); /* -1 because vert edges join */
- maxFaces = totedge * (steps-1);
+ maxVerts = totvert * step_tot; /* -1 because we're joining back up */
+ maxEdges = (totvert * (step_tot-1)) + /* these are the edges between new verts */
+ (totedge * step_tot); /* -1 because vert edges join */
+ maxFaces = totedge * (step_tot-1);
}
result= CDDM_from_template(dm, maxVerts, maxEdges, maxFaces);
@@ -398,11 +406,11 @@
for (i=0; i<totedge; i++, med_new++) {
vc= &vert_connect[med_new->v1];
- if (vc->v[0]==-1) { /* unused */
+ if (vc->v[0] == -1) { /* unused */
vc->v[0]= med_new->v2;
vc->e[0]= med_new;
}
- else if (vc->v[1]==-1) {
+ else if (vc->v[1] == -1) {
vc->v[1]= med_new->v2;
vc->e[1]= med_new;
}
@@ -413,11 +421,11 @@
vc= &vert_connect[med_new->v2];
/* same as above but swap v1/2 */
- if (vc->v[0]==-1) { /* unused */
+ if (vc->v[0] == -1) { /* unused */
vc->v[0]= med_new->v1;
vc->e[0]= med_new;
}
- else if (vc->v[1]==-1) {
+ else if (vc->v[1] == -1) {
vc->v[1]= med_new->v1;
vc->e[1]= med_new;
}
@@ -429,7 +437,7 @@
/* find the first vert */
vc= vert_connect;
for (i=0; i < totvert; i++, vc++) {
- int VBEST=-1, ed_loop_closed=0; /* vert and vert new */
+ int v_best=-1, ed_loop_closed=0; /* vert and vert new */
int ed_loop_flip;
float fl= -1.0f;
ScrewVertIter lt_iter;
@@ -437,14 +445,14 @@
/* Now do search for connected verts, order all edges and flip them
* so resulting faces are flipped the right way */
vc_tot_linked= 0; /* count the number of linked verts for this loop */
- if (vc->flag==0) {
+ if (vc->flag == 0) {
/*printf("Loop on connected vert: %i\n", i);*/
for(j=0; j<2; j++) {
/*printf("\tSide: %i\n", j);*/
- ScrewVertIter_INIT(lt_iter, vert_connect, i, j);
- if (j==1) {
- ScrewVertIter_NEXT(lt_iter);
+ screwvert_iter_init(<_iter, vert_connect, i, j);
+ if (j == 1) {
+ screwvert_iter_step(<_iter);
}
while (lt_iter.v_poin) {
/*printf("\t\tVERT: %i\n", lt_iter.v);*/
@@ -459,10 +467,10 @@
/*printf("Testing 2 floats %f : %f\n", fl, lt_iter.v_poin->dist);*/
if (fl <= lt_iter.v_poin->dist) {
fl= lt_iter.v_poin->dist;
- VBEST= lt_iter.v;
- /*printf("\t\t\tVERT BEST: %i\n", VBEST);*/
+ v_best= lt_iter.v;
+ /*printf("\t\t\tVERT BEST: %i\n", v_best);*/
}
- ScrewVertIter_NEXT(lt_iter);
+ screwvert_iter_step(<_iter);
if (!lt_iter.v_poin) {
/*printf("\t\t\tFound End Also Num %i\n", j);*/
/*endpoints[j]= lt_iter.v_other;*/ /* other is still valid */
@@ -472,14 +480,14 @@
}
/* now we have a collection of used edges. flip their edges the right way*/
- /*if (VBEST !=-1) - */
+ /*if (v_best != -1) - */
/*printf("Done Looking - vc_tot_linked: %i\n", vc_tot_linked);*/
if (vc_tot_linked>1) {
float vf_1, vf_2, vf_best;
- vc_tmp= &vert_connect[VBEST];
+ vc_tmp= &vert_connect[v_best];
tmpf1= vert_connect[vc_tmp->v[0]].co;
tmpf2= vert_connect[vc_tmp->v[1]].co;
@@ -531,9 +539,12 @@
/*printf("flip direction %i\n", ed_loop_flip);*/
- /* switch the flip option if set */
- if (ltmd->flag & MOD_SCREW_NORMAL_FLIP)
+ /* switch the flip option if set
+ * note: flip is now done at face level so copying vgroup slizes is easier */
+ /*
+ if (do_flip)
ed_loop_flip= !ed_loop_flip;
+ */
if (angle < 0.0f)
ed_loop_flip= !ed_loop_flip;
@@ -542,7 +553,7 @@
for(j=ed_loop_closed; j<2; j++) {
/*printf("Ordering Side J %i\n", j);*/
- ScrewVertIter_INIT(lt_iter, vert_connect, VBEST, j);
+ screwvert_iter_init(<_iter, vert_connect, v_best, j);
/*printf("\n\nStarting - Loop\n");*/
lt_iter.v_poin->flag= 1; /* so a non loop will traverse the other side */
@@ -550,7 +561,7 @@
/* If this is the vert off the best vert and
* the best vert has 2 edges connected too it
* then swap the flip direction */
- if (j==1 && (vc_tmp->v[0] > -1) && (vc_tmp->v[1] > -1))
+ if (j == 1 && (vc_tmp->v[0] > -1) && (vc_tmp->v[1] > -1))
ed_loop_flip= !ed_loop_flip;
while (lt_iter.v_poin && lt_iter.v_poin->flag != 2) {
@@ -559,7 +570,7 @@
lt_iter.v_poin->flag= 2;
if (lt_iter.e) {
if (lt_iter.v == lt_iter.e->v1) {
- if (ed_loop_flip==0) {
+ if (ed_loop_flip == 0) {
/*printf("\t\t\tFlipping 0\n");*/
SWAP(int, lt_iter.e->v1, lt_iter.e->v2);
}/* else {
@@ -567,7 +578,7 @@
}*/
}
else if (lt_iter.v == lt_iter.e->v2) {
- if (ed_loop_flip==1) {
+ if (ed_loop_flip == 1) {
/*printf("\t\t\tFlipping 1\n");*/
SWAP(int, lt_iter.e->v1, lt_iter.e->v2);
}/* else {
@@ -579,7 +590,7 @@
}/* else {
printf("\t\tNo Edge at this point\n");
}*/
- ScrewVertIter_NEXT(lt_iter);
+ screwvert_iter_step(<_iter);
}
}
}
@@ -591,8 +602,8 @@
*
* calculate vertex normals that can be propodated on lathing
* use edge connectivity work this out */
- if (vc->v[0]>=0) {
- if (vc->v[1]>=0) {
+ if (vc->v[0] >= 0) {
+ if (vc->v[1] >= 0) {
/* 2 edges connedted */
/* make 2 connecting vert locations relative to the middle vert */
sub_v3_v3v3(tmp_vec1, mvert_new[vc->v[0]].co, mvert_new[i].co);
@@ -647,34 +658,25 @@
}
}
else {
+ mv_orig= mvert_orig;
+ mv_new= mvert_new;
- if (ltmd->flag & MOD_SCREW_NORMAL_FLIP) {
- mv_orig= mvert_orig;
- mv_new= mvert_new + (totvert-1);
-
- for (i=0; i < totvert; i++, mv_new--, mv_orig++) {
- copy_v3_v3(mv_new->co, mv_orig->co);
- }
+ for (i=0; i < totvert; i++, mv_new++, mv_orig++) {
+ copy_v3_v3(mv_new->co, mv_orig->co);
}
- else {
- mv_orig= mvert_orig;
- mv_new= mvert_new;
-
- for (i=0; i < totvert; i++, mv_new++, mv_orig++) {
- copy_v3_v3(mv_new->co, mv_orig->co);
- }
- }
}
/* done with edge connectivity based normal flipping */
+ DM_copy_vert_data(dm, result, 0, 0, totvert);
/* Add Faces */
- for (i=1; i < steps; i++) {
+ for (step=1; step < step_tot; step++) {
+ const int varray_stride= totvert * step;
float step_angle;
float no_tx[3];
/* Rotation Matrix */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list