[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46240] trunk/blender/source/blender/bmesh : style cleanup: formatting and some float/double promotion
Campbell Barton
ideasman42 at gmail.com
Thu May 3 21:57:25 CEST 2012
Revision: 46240
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46240
Author: campbellbarton
Date: 2012-05-03 19:57:24 +0000 (Thu, 03 May 2012)
Log Message:
-----------
style cleanup: formatting and some float/double promotion
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_validate.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_hull.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -384,7 +384,7 @@
/* more of a weight then a distance */
far_cross_dist = (/* first we want to have a value close to zero mapped to 1 */
- 1.0 - fabsf(dot_v3v3(far_vec, far_cross_vec)) *
+ 1.0f - fabsf(dot_v3v3(far_vec, far_cross_vec)) *
/* second we multiply by the distance
* so points close to the center are not preferred */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -78,7 +78,7 @@
src[0] = v1->head.data;
src[1] = v2->head.data;
- w[0] = 1.0f-fac;
+ w[0] = 1.0f - fac;
w[1] = fac;
CustomData_bmesh_interp(&bm->vdata, src, w, NULL, 2, v->head.data);
}
@@ -198,20 +198,11 @@
static int compute_mdisp_quad(BMLoop *l, float v1[3], float v2[3], float v3[3], float v4[3],
float e1[3], float e2[3])
{
- float cent[3] = {0.0f, 0.0f, 0.0f}, n[3], p[3];
- BMLoop *l_first;
- BMLoop *l_iter;
-
+ float cent[3], n[3], p[3];
+
/* computer center */
- l_iter = l_first = BM_FACE_FIRST_LOOP(l->f);
- do {
- cent[0] += (float)l_iter->v->co[0];
- cent[1] += (float)l_iter->v->co[1];
- cent[2] += (float)l_iter->v->co[2];
- } while ((l_iter = l_iter->next) != l_first);
-
- mul_v3_fl(cent, (1.0 / (float)l->f->len));
-
+ BM_face_calc_center_mean(l->f, cent);
+
add_v3_v3v3(p, l->prev->v->co, l->v->co);
mul_v3_fl(p, 0.5);
add_v3_v3v3(n, l->next->v->co, l->v->co);
@@ -240,8 +231,8 @@
if (fabsf(2.0f * (x - y + z)) > FLT_EPSILON * 10.0f) {
float f2;
- f1 = (sqrt(y * y - 4.0 * x * z) - y + 2.0 * z) / (2.0 * (x - y + z));
- f2 = (-sqrt(y * y - 4.0 * x * z) - y + 2.0 * z) / (2.0 * (x - y + z));
+ f1 = ( sqrtf(y * y - 4.0f * x * z) - y + 2.0f * z) / (2.0f * (x - y + z));
+ f2 = (-sqrtf(y * y - 4.0f * x * z) - y + 2.0f * z) / (2.0f * (x - y + z));
f1 = fabsf(f1);
f2 = fabsf(f2);
@@ -252,7 +243,7 @@
f1 = -z / (y - 2 * z);
CLAMP(f1, 0.0f, 1.0f + FLT_EPSILON);
- if (isnan(f1) || f1 > 1.0 || f1 < 0.0f) {
+ if (isnan(f1) || f1 > 1.0f || f1 < 0.0f) {
int i;
for (i = 0; i < 2; i++) {
@@ -345,8 +336,8 @@
sub_v3_v3(v1, c); sub_v3_v3(v2, c);
sub_v3_v3(v3, c); sub_v3_v3(v4, c);
- mul_v3_fl(v1, 1.0 + eps); mul_v3_fl(v2, 1.0 + eps);
- mul_v3_fl(v3, 1.0 + eps); mul_v3_fl(v4, 1.0 + eps);
+ mul_v3_fl(v1, 1.0f + eps); mul_v3_fl(v2, 1.0f + eps);
+ mul_v3_fl(v3, 1.0f + eps); mul_v3_fl(v4, 1.0f + eps);
add_v3_v3(v1, c); add_v3_v3(v2, c);
add_v3_v3(v3, c); add_v3_v3(v4, c);
@@ -392,9 +383,9 @@
d = bm_loop_flip_equotion(mat, b, target_axis_x, target_axis_y, coord, 0, 1);
- if (fabsf(d) < 1e-4) {
+ if (fabsf(d) < 1e-4f) {
d = bm_loop_flip_equotion(mat, b, target_axis_x, target_axis_y, coord, 0, 2);
- if (fabsf(d) < 1e-4)
+ if (fabsf(d) < 1e-4f)
d = bm_loop_flip_equotion(mat, b, target_axis_x, target_axis_y, coord, 1, 2);
}
@@ -439,7 +430,7 @@
mdisp_axis_from_quad(v1, v2, v3, v4, axis_x, axis_y);
res = (int)sqrt(mdisps->totdisp);
- d = 1.0 / (float)(res - 1);
+ d = 1.0f / (float)(res - 1);
for (x = 0.0f, ix = 0; ix < res; x += d, ix++) {
for (y = 0.0f, iy = 0; iy < res; y += d, iy++) {
float co1[3], co2[3], co[3];
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -47,10 +47,14 @@
static void bm_mempool_init(BMesh *bm, const BMAllocTemplate *allocsize)
{
- bm->vpool = BLI_mempool_create(sizeof(BMVert), allocsize->totvert, bm_mesh_chunksize_default.totvert, BLI_MEMPOOL_ALLOW_ITER);
- bm->epool = BLI_mempool_create(sizeof(BMEdge), allocsize->totedge, bm_mesh_chunksize_default.totedge, BLI_MEMPOOL_ALLOW_ITER);
- bm->lpool = BLI_mempool_create(sizeof(BMLoop), allocsize->totloop, bm_mesh_chunksize_default.totloop, 0);
- bm->fpool = BLI_mempool_create(sizeof(BMFace), allocsize->totface, bm_mesh_chunksize_default.totface, BLI_MEMPOOL_ALLOW_ITER);
+ bm->vpool = BLI_mempool_create(sizeof(BMVert), allocsize->totvert,
+ bm_mesh_chunksize_default.totvert, BLI_MEMPOOL_ALLOW_ITER);
+ bm->epool = BLI_mempool_create(sizeof(BMEdge), allocsize->totedge,
+ bm_mesh_chunksize_default.totedge, BLI_MEMPOOL_ALLOW_ITER);
+ bm->lpool = BLI_mempool_create(sizeof(BMLoop), allocsize->totloop,
+ bm_mesh_chunksize_default.totloop, 0);
+ bm->fpool = BLI_mempool_create(sizeof(BMFace), allocsize->totface,
+ bm_mesh_chunksize_default.totface, BLI_MEMPOOL_ALLOW_ITER);
#ifdef USE_BMESH_HOLES
bm->looplistpool = BLI_mempool_create(sizeof(BMLoopList), allocsize[3], allocsize[3], FALSE, FALSE);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_validate.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_validate.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_validate.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -107,10 +107,12 @@
ERRMSG("edge %d: has invalid loop, loop is of face %d", i, BM_elem_index_get(l_iter->f));
}
else if (BM_vert_in_edge(e, l_iter->v) == FALSE) {
- ERRMSG("edge %d: has invalid loop with vert not in edge, loop is of face %d", i, BM_elem_index_get(l_iter->f));
+ ERRMSG("edge %d: has invalid loop with vert not in edge, loop is of face %d",
+ i, BM_elem_index_get(l_iter->f));
}
else if (BM_vert_in_edge(e, l_iter->next->v) == FALSE) {
- ERRMSG("edge %d: has invalid loop with next vert not in edge, loop is of face %d", i, BM_elem_index_get(l_iter->f));
+ ERRMSG("edge %d: has invalid loop with next vert not in edge, loop is of face %d",
+ i, BM_elem_index_get(l_iter->f));
}
} while ((l_iter = l_iter->radial_next) != l_first);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -1053,7 +1053,7 @@
/* first create the new edge, this is so we can copy the customdata from the old one
* if splice if disabled, always add in a new edge even if theres one there. */
- e_new = BM_edge_create(bm, v1, v2, e, (check_flag & BM_EDGEROT_CHECK_SPLICE)!=0);
+ e_new = BM_edge_create(bm, v1, v2, e, (check_flag & BM_EDGEROT_CHECK_SPLICE) != 0);
f_hflag_prev_1 = l1->f->head.hflag;
f_hflag_prev_2 = l2->f->head.hflag;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -1054,7 +1054,7 @@
BM_elem_index_set(ele, i); /* set_inline */
}
- bm->elem_index_dirty &= ~(BM_VERT|BM_EDGE|BM_FACE);
+ bm->elem_index_dirty &= ~(BM_VERT | BM_EDGE | BM_FACE);
BLI_mempool_destroy(oldpool);
}
@@ -1099,7 +1099,7 @@
BM_elem_index_set(ele, i); /* set_inline */
}
- bm->elem_index_dirty &= ~(BM_VERT|BM_EDGE|BM_FACE);
+ bm->elem_index_dirty &= ~(BM_VERT | BM_EDGE | BM_FACE);
BLI_mempool_destroy(oldpool);
}
@@ -1128,7 +1128,7 @@
BM_elem_index_set(ele, i); /* set_inline */
}
- bm->elem_index_dirty &= ~(BM_VERT|BM_EDGE|BM_FACE);
+ bm->elem_index_dirty &= ~(BM_VERT | BM_EDGE | BM_FACE);
}
void *BMO_slot_buffer_elem_first(BMOperator *op, const char *slotname)
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -900,7 +900,7 @@
BMVert *v1 = BM_edge_other_vert(e1, v);
BMVert *v2 = BM_edge_other_vert(e2, v);
- return M_PI - angle_v3v3v3(v1->co, v->co, v2->co);
+ return (float)M_PI - angle_v3v3v3(v1->co, v->co, v2->co);
}
else {
return DEG2RADF(90.0f);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-05-03 19:47:16 UTC (rev 46239)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-05-03 19:57:24 UTC (rev 46240)
@@ -151,10 +151,10 @@
/* done */
if (do_even) {
- mul_v3_fl(co_ofs, (fac * 0.5) * shell_angle_to_dist(0.5f * angle));
+ mul_v3_fl(co_ofs, (fac * 0.5f) * shell_angle_to_dist(0.5f * angle));
}
else {
- mul_v3_fl(co_ofs, fac * 0.5);
+ mul_v3_fl(co_ofs, fac * 0.5f);
}
}
@@ -208,9 +208,9 @@
BLI_smallhash_init(&hash);
BMO_ITER (e, &siter, bm, op, "geom", BM_EDGE) {
- BMO_elem_flag_enable(bm, e, BEVEL_FLAG|BEVEL_DEL);
- BMO_elem_flag_enable(bm, e->v1, BEVEL_FLAG|BEVEL_DEL);
- BMO_elem_flag_enable(bm, e->v2, BEVEL_FLAG|BEVEL_DEL);
+ BMO_elem_flag_enable(bm, e, BEVEL_FLAG | BEVEL_DEL);
+ BMO_elem_flag_enable(bm, e->v1, BEVEL_FLAG | BEVEL_DEL);
+ BMO_elem_flag_enable(bm, e->v2, BEVEL_FLAG | BEVEL_DEL);
if (BM_edge_face_count(e) < 2) {
BMO_elem_flag_disable(bm, e, BEVEL_DEL);
@@ -281,8 +281,8 @@
BMLoop *l;
BMIter liter;
- BMO_elem_flag_enable(bm, e->v1, BEVEL_FLAG|BEVEL_DEL);
- BMO_elem_flag_enable(bm, e->v2, BEVEL_FLAG|BEVEL_DEL);
+ BMO_elem_flag_enable(bm, e->v1, BEVEL_FLAG | BEVEL_DEL);
+ BMO_elem_flag_enable(bm, e->v2, BEVEL_FLAG | BEVEL_DEL);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list