[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52011] trunk/blender/source/blender/bmesh /operators/bmo_bevel.c: style cleanup
Campbell Barton
ideasman42 at gmail.com
Thu Nov 8 17:00:19 CET 2012
Revision: 52011
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52011
Author: campbellbarton
Date: 2012-11-08 16:00:18 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-11-08 15:12:21 UTC (rev 52010)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-11-08 16:00:18 UTC (rev 52011)
@@ -40,8 +40,8 @@
#define NEW_BEVEL 1
#ifdef NEW_BEVEL
-#define BEVEL_FLAG 1
-#define EDGE_SELECTED 2
+#define BEVEL_FLAG 1
+#define EDGE_SELECTED 2
#define BEVEL_EPSILON 1e-6
@@ -55,68 +55,68 @@
/* Data for one end of an edge involved in a bevel */
typedef struct EdgeHalf {
- struct EdgeHalf *next, *prev; /* in CCW order */
- BMEdge *e; /* original mesh edge */
- int isbev; /* is this edge beveled? */
- int isrev; /* is e->v2 the vertex at this end? */
- int seg; /* how many segments for the bevel */
- float offset; /* offset for this edge */
- BMFace *fprev; /* face between this edge and previous, if any */
- BMFace *fnext; /* face between this edge and next, if any */
- struct BoundVert *leftv; /* left boundary vert (looking along edge to end) */
- struct BoundVert *rightv; /* right boundary vert, if beveled */
+ struct EdgeHalf *next, *prev; /* in CCW order */
+ BMEdge *e; /* original mesh edge */
+ int isbev; /* is this edge beveled? */
+ int isrev; /* is e->v2 the vertex at this end? */
+ int seg; /* how many segments for the bevel */
+ float offset; /* offset for this edge */
+ BMFace *fprev; /* face between this edge and previous, if any */
+ BMFace *fnext; /* face between this edge and next, if any */
+ struct BoundVert *leftv; /* left boundary vert (looking along edge to end) */
+ struct BoundVert *rightv; /* right boundary vert, if beveled */
} EdgeHalf;
/* An element in a cyclic boundary of a Vertex Mesh (VMesh) */
typedef struct BoundVert {
- struct BoundVert *next, *prev; /* in CCW order */
- int index; /* used for vmesh indexing */
+ struct BoundVert *next, *prev; /* in CCW order */
+ int index; /* used for vmesh indexing */
NewVert nv;
- EdgeHalf *efirst; /* first of edges attached here: in CCW order */
+ EdgeHalf *efirst; /* first of edges attached here: in CCW order */
EdgeHalf *elast;
- EdgeHalf *ebev; /* beveled edge whose left side is attached here, if any */
+ EdgeHalf *ebev; /* beveled edge whose left side is attached here, if any */
} BoundVert;
/* Mesh structure replacing a vertex */
typedef struct VMesh {
enum {
- M_NONE, /* no polygon mesh needed */
- M_POLY, /* a simple polygon */
- M_ADJ, /* "adjacent edges" mesh pattern */
- M_CROSS, /* "cross edges" mesh pattern */
+ M_NONE, /* no polygon mesh needed */
+ M_POLY, /* a simple polygon */
+ M_ADJ, /* "adjacent edges" mesh pattern */
+ M_CROSS, /* "cross edges" mesh pattern */
} mesh_kind;
- int count; /* number of vertices in the boundary */
- int seg; /* common # of segments for segmented edges */
- BoundVert *boundstart; /* start of boundary double-linked list */
- NewVert *mesh; /* allocated array - size and structure depends on kind */
+ int count; /* number of vertices in the boundary */
+ int seg; /* common # of segments for segmented edges */
+ BoundVert *boundstart; /* start of boundary double-linked list */
+ NewVert *mesh; /* allocated array - size and structure depends on kind */
} VMesh;
/* Data for a vertex involved in a bevel */
typedef struct BevVert {
struct BevVert *next, *prev;
- BMVert *v; /* original mesh vertex */
- int edgecount; /* total number of edges around the vertex */
- int selcount; /* number of selected edges around the vertex */
- EdgeHalf *edges; /* array of size edgecount; CCW order from vertex normal side */
- VMesh *vmesh; /* mesh structure for replacing vertex */
+ BMVert *v; /* original mesh vertex */
+ int edgecount; /* total number of edges around the vertex */
+ int selcount; /* number of selected edges around the vertex */
+ EdgeHalf *edges; /* array of size edgecount; CCW order from vertex normal side */
+ VMesh *vmesh; /* mesh structure for replacing vertex */
} BevVert;
/*
* Bevel parameters and state
*/
typedef struct BevelParams {
- ListBase vertList; /* list of BevVert for each vertex involved in bevel */
- float offset; /* blender units to offset each side of a beveled edge */
- int seg; /* number of segments in beveled edge profile */
+ ListBase vertList; /* list of BevVert for each vertex involved in bevel */
+ float offset; /* blender units to offset each side of a beveled edge */
+ int seg; /* number of segments in beveled edge profile */
BMOperator *op;
} BevelParams;
/* Make a new BoundVert of the given kind, insert it at the end of the circular linked
* list with entry point bv->boundstart, and return it. */
-static BoundVert * add_new_bound_vert(VMesh *vm, float co[3])
+static BoundVert *add_new_bound_vert(VMesh *vm, float co[3])
{
- BoundVert *ans = (BoundVert*) MEM_callocN(sizeof(BoundVert), "BoundVert");
+ BoundVert *ans = (BoundVert *) MEM_callocN(sizeof(BoundVert), "BoundVert");
copy_v3_v3(ans->nv.co, co);
if (!vm->boundstart) {
ans->index = 0;
@@ -140,22 +140,22 @@
* j = ring index (0 <= j <= ns2)
* k = segment index (0 <= k <= ns)
* Not all of these are used, and some will share BMVerts */
-static NewVert* mesh_vert(VMesh* vm, int i, int j, int k)
+static NewVert *mesh_vert(VMesh *vm, int i, int j, int k)
{
- int nj = (vm -> seg / 2) + 1;
+ int nj = (vm->seg / 2) + 1;
int nk = vm->seg + 1;
return &vm->mesh[i * nk * nj + j * nk + k];
}
-static void create_mesh_bmvert(BMesh* bm, VMesh *vm, int i, int j, int k, BMVert *eg)
+static void create_mesh_bmvert(BMesh *bm, VMesh *vm, int i, int j, int k, BMVert *eg)
{
NewVert *nv = mesh_vert(vm, i, j, k);
nv->v = BM_vert_create(bm, nv->co, eg);
}
static void copy_mesh_vert(VMesh *vm, int ito, int jto, int kto,
- int ifrom, int jfrom, int kfrom)
+ int ifrom, int jfrom, int kfrom)
{
NewVert *nvto, *nvfrom;
@@ -166,7 +166,7 @@
}
/* find the EdgeHalf in bv's array that has edge bme */
-static EdgeHalf* find_edge_half(BevVert *bv, BMEdge *bme)
+static EdgeHalf *find_edge_half(BevVert *bv, BMEdge *bme)
{
int i;
@@ -179,12 +179,12 @@
/* Return the next EdgeHalf after from_e that is beveled.
* If from_e is NULL, find the first beveled edge. */
-static EdgeHalf* next_bev(BevVert *bv, EdgeHalf *from_e)
+static EdgeHalf *next_bev(BevVert *bv, EdgeHalf *from_e)
{
EdgeHalf *e;
if (from_e == NULL)
- from_e = &bv->edges[bv->edgecount -1];
+ from_e = &bv->edges[bv->edgecount - 1];
e = from_e;
do {
if (e->isbev)
@@ -195,7 +195,7 @@
}
/* find the BevVert corresponding to BMVert bmv */
-static BevVert* find_bevvert(BevelParams *bp, BMVert *bmv)
+static BevVert *find_bevvert(BevelParams *bp, BMVert *bmv)
{
BevVert *bv;
@@ -208,7 +208,7 @@
/* Return a good respresentative face (for materials, etc.) for faces
* created around/near BoundVert v */
-static BMFace* boundvert_rep_face(BoundVert *v)
+static BMFace *boundvert_rep_face(BoundVert *v)
{
BMFace *fans = NULL;
BMFace *firstf = NULL;
@@ -219,10 +219,10 @@
BLI_assert(v->efirst != NULL && v->elast != NULL);
e1 = v->efirst->e;
e2 = v->elast->e;
- BM_ITER_ELEM(f1, &iter1, e1, BM_FACES_OF_EDGE) {
+ BM_ITER_ELEM (f1, &iter1, e1, BM_FACES_OF_EDGE) {
if (!firstf)
firstf = f1;
- BM_ITER_ELEM(f2, &iter2, e2, BM_FACES_OF_EDGE) {
+ BM_ITER_ELEM (f2, &iter2, e2, BM_FACES_OF_EDGE) {
if (f1 == f2) {
fans = f1;
break;
@@ -246,11 +246,11 @@
if (totv == 3) {
f = BM_face_create_quad_tri(bm,
- vert_arr[0], vert_arr[1], vert_arr[2], NULL, facerep, 0);
+ vert_arr[0], vert_arr[1], vert_arr[2], NULL, facerep, 0);
}
else if (totv == 4) {
f = BM_face_create_quad_tri(bm,
- vert_arr[0], vert_arr[1], vert_arr[2], vert_arr[3], facerep, 0);
+ vert_arr[0], vert_arr[1], vert_arr[2], vert_arr[3], facerep, 0);
}
else {
int i;
@@ -268,7 +268,7 @@
if (facerep && f) {
int has_mdisps = CustomData_has_layer(&bm->ldata, CD_MDISPS);
BM_elem_attrs_copy(bm, bm, facerep, f);
- BM_ITER_ELEM(l, &iter, f, BM_LOOPS_OF_FACE) {
+ BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) {
BM_loop_interp_from_face(bm, l, facerep, TRUE, TRUE);
if (has_mdisps)
BM_loop_interp_multires(bm, l, facerep);
@@ -278,7 +278,7 @@
}
static BMFace *bev_create_quad_tri(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v3, BMVert *v4,
- BMFace *facerep)
+ BMFace *facerep)
{
BMVert *varr[4];
@@ -303,7 +303,7 @@
int on_right, float meetco[3])
{
float dir1[3], dir2[3], norm_v[3], norm_perp1[3], norm_perp2[3],
- off1a[3], off1b[3], off2a[3], off2b[3], isect2[3];
+ off1a[3], off1b[3], off2a[3], off2b[3], isect2[3];
/* get direction vectors for two offset lines */
sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co);
@@ -362,7 +362,7 @@
BMFace *f1, BMFace *f2, float meetco[3])
{
float dir1[3], dir2[3], norm_perp1[3], norm_perp2[3],
- off1a[3], off1b[3], off2a[3], off2b[3], isect2[3];
+ off1a[3], off1b[3], off2a[3], off2b[3], isect2[3];
BLI_assert(f1 != NULL && f2 != NULL);
@@ -399,9 +399,9 @@
float dir[3], no[3];
BMVert *v;
- v = e->isrev? e->e->v1 : e->e->v2;
+ v = e->isrev ? e->e->v1 : e->e->v2;
- sub_v3_v3v3(dir,BM_edge_other_vert(e->e, v)->co, v->co);
+ sub_v3_v3v3(dir, BM_edge_other_vert(e->e, v)->co, v->co);
normalize_v3(dir);
if (plane_no) {
copy_v3_v3(no, plane_no);
@@ -441,7 +441,7 @@
float otherco[3];
if (!isect_line_line_v3(e->v1->co, e->v2->co, co_a, co_b,
- projco, otherco)) {
+ projco, otherco)) {
BLI_assert(!"project meet failure");
copy_v3_v3(projco, e->v1->co);
}
@@ -464,16 +464,16 @@
}
/*
-* Search for crossing the line and line
-* a1-a2 lineA
-* b1-b2 line B
-* r - result, coordinate of crossing point
-*/
+ * Search for crossing the line and line
+ * a1-a2 lineA
+ * b1-b2 line B
+ * r - result, coordinate of crossing point
+ */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list