From 305d341ec2c2c5c6485ad6cd719e9472e4bb460d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 13 May 2012 11:05:52 +0000 Subject: code cleanup: use vector math function minmax_v3v3_v3() and other minor vector function edits. --- source/blender/editors/armature/editarmature.c | 4 ++-- source/blender/editors/armature/meshlaplacian.c | 10 +++++----- source/blender/editors/mesh/editface.c | 2 +- source/blender/editors/mesh/editmesh_tools.c | 2 +- source/blender/editors/mesh/meshtools.c | 14 ++++++-------- source/blender/editors/object/object_transform.c | 2 +- source/blender/editors/physics/particle_edit.c | 4 ++-- source/blender/editors/space_view3d/view3d_edit.c | 4 ++-- source/blender/editors/space_view3d/view3d_snap.c | 12 ++++++------ source/blender/editors/transform/transform_manipulator.c | 2 +- source/blender/editors/uvedit/uvedit_unwrap_ops.c | 9 +++------ 11 files changed, 30 insertions(+), 35 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index f698153eb7f..8e2dfb72703 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -569,8 +569,8 @@ void docenter_armature(Scene *scene, Object *ob, float cursor[3], int centermode float min[3], max[3]; INIT_MINMAX(min, max); for (ebone = arm->edbo->first; ebone; ebone = ebone->next) { - DO_MINMAX(ebone->head, min, max); - DO_MINMAX(ebone->tail, min, max); + minmax_v3v3_v3(min, max, ebone->head); + minmax_v3v3_v3(min, max, ebone->tail); } mid_v3_v3v3(cent, min, max); } diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index ccba3599318..b975d156868 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -451,11 +451,11 @@ static void heat_ray_tree_create(LaplacianSystem *sys) float bb[6]; INIT_MINMAX(bb, bb + 3); - DO_MINMAX(verts[mf->v1], bb, bb + 3); - DO_MINMAX(verts[mf->v2], bb, bb + 3); - DO_MINMAX(verts[mf->v3], bb, bb + 3); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v1]); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v2]); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v3]); if (mf->v4) { - DO_MINMAX(verts[mf->v4], bb, bb + 3); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v4]); } BLI_bvhtree_insert(sys->heat.bvhtree, a, bb, 2); @@ -1753,7 +1753,7 @@ static void harmonic_coordinates_bind(Scene *UNUSED(scene), MeshDeformModifierDa INIT_MINMAX(mdb->min, mdb->max); for (a = 0; a < mdb->totcagevert; a++) - DO_MINMAX(mdb->cagecos[a], mdb->min, mdb->max); + minmax_v3v3_v3(mdb->min, mdb->max, mdb->cagecos[a]); /* allocate memory */ mdb->size = (2 << (mmd->gridsize - 1)) + 2; diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5f6384d6b24..63704f5b8e6 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -427,7 +427,7 @@ int paintface_minmax(Object *ob, float r_min[3], float r_max[3]) copy_v3_v3(vec, (mvert[ml->v].co)); mul_m3_v3(bmat, vec); add_v3_v3v3(vec, vec, ob->obmat[3]); - DO_MINMAX(vec, r_min, r_max); + minmax_v3v3_v3(r_min, r_max, vec); } ok = TRUE; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 2f317ed87c2..9be71218da0 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -734,7 +734,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, wmEvent BM_ITER_MESH (v1, &iter, vc.em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v1, BM_ELEM_SELECT)) { - DO_MINMAX(v1->co, min, max); + minmax_v3v3_v3(min, max, v1->co); done = 1; } } diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index aa89eaa0c6d..989f1a36f99 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -806,7 +806,7 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, const float co[3], char m BMVert *eve; BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { - DO_MINMAX(eve->co, min, max); + minmax_v3v3_v3(min, max, eve->co); } } else { @@ -814,19 +814,17 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, const float co[3], char m int a; for (a = 0, mvert = me->mvert; a < me->totvert; a++, mvert++) - DO_MINMAX(mvert->co, min, max); + minmax_v3v3_v3(min, max, mvert->co); } /* for quick unit coordinate calculus */ copy_v3_v3(MeshOctree.offs, min); - MeshOctree.offs[0] -= MOC_THRESH; /* we offset it 1 threshold unit extra */ - MeshOctree.offs[1] -= MOC_THRESH; - MeshOctree.offs[2] -= MOC_THRESH; + /* we offset it 1 threshold unit extra */ + add_v3_fl(MeshOctree.offs, -MOC_THRESH); sub_v3_v3v3(MeshOctree.div, max, min); - MeshOctree.div[0] += 2 * MOC_THRESH; /* and divide with 2 threshold unit more extra (try 8x8 unit grid on paint) */ - MeshOctree.div[1] += 2 * MOC_THRESH; - MeshOctree.div[2] += 2 * MOC_THRESH; + /* and divide with 2 threshold unit more extra (try 8x8 unit grid on paint) */ + add_v3_fl(MeshOctree.div, 2.0f * MOC_THRESH); mul_v3_fl(MeshOctree.div, 1.0f / MOC_RES); if (MeshOctree.div[0] == 0.0f) MeshOctree.div[0] = 1.0f; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 34395163ad3..9c58717ec53 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -697,7 +697,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) mul_v3_fl(cent, 1.0f / (float)total); } else { - DO_MINMAX(eve->co, min, max); + minmax_v3v3_v3(min, max, eve->co); mid_v3_v3v3(cent, min, max); } } diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 64f4ffe4881..9f5e700616e 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3100,8 +3100,8 @@ static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm, if (pa_minmax==0) { INIT_MINMAX(p_min, p_max); - DO_MINMAX(co1, p_min, p_max); - DO_MINMAX(co2, p_min, p_max); + minmax_v3v3_v3(p_min, p_max, co1); + minmax_v3v3_v3(p_min, p_max, co2); } else { copy_v3_v3(p_min, pa_minmax); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index bfd293ee5b6..e35c0e1c654 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2189,9 +2189,9 @@ static int viewselected_exec(bContext *C, wmOperator *UNUSED(op)) bPoseChannel *pchan_tx = pchan->custom_tx ? pchan->custom_tx : pchan; ok = 1; mul_v3_m4v3(vec, ob->obmat, pchan_tx->pose_head); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); mul_v3_m4v3(vec, ob->obmat, pchan_tx->pose_tail); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); } } } diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index dfb3714948b..5af1829af5a 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -501,7 +501,7 @@ static void make_trans_verts(Object *obedit, float min[3], float max[3], int mod if (tv->flag & SELECT) { add_v3_v3(centroid, tv->oldloc); total += 1.0f; - DO_MINMAX(tv->oldloc, min, max); + minmax_v3v3_v3(min, max, tv->oldloc); } } if (total != 0.0f) { @@ -856,7 +856,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) if ((track->flag & TRACK_HAS_BUNDLE) && TRACK_SELECTED(track)) { ok = 1; mul_v3_m4v3(pos, obmat, track->bundle_pos); - DO_MINMAX(pos, min, max); + minmax_v3v3_v3(min, max, pos); } track = track->next; @@ -898,7 +898,7 @@ static int snap_curs_to_sel(bContext *C, wmOperator *UNUSED(op)) mul_m3_v3(bmat, vec); add_v3_v3(vec, obedit->obmat[3]); add_v3_v3(centroid, vec); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); } if (v3d->around == V3D_CENTROID) { @@ -923,7 +923,7 @@ static int snap_curs_to_sel(bContext *C, wmOperator *UNUSED(op)) copy_v3_v3(vec, pchan->pose_head); mul_m4_v3(obact->obmat, vec); add_v3_v3(centroid, vec); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); count++; } } @@ -943,7 +943,7 @@ static int snap_curs_to_sel(bContext *C, wmOperator *UNUSED(op)) } add_v3_v3(centroid, vec); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); count++; } CTX_DATA_END; @@ -1082,7 +1082,7 @@ int ED_view3d_minmax_verts(Object *obedit, float min[3], float max[3]) mul_m3_v3(bmat, vec); add_v3_v3(vec, obedit->obmat[3]); add_v3_v3(centroid, vec); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); } MEM_freeN(transvmain); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 94f6640ca5b..a869af56537 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -114,7 +114,7 @@ static void calc_tw_center(Scene *scene, float *co) float *min= scene->twmin; float *max= scene->twmax; - DO_MINMAX(co, min, max); + minmax_v3v3_v3(min, max, co); add_v3_v3(twcent, co); } diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 6b03b5a1a8a..e504e37cb20 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -870,13 +870,12 @@ static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result, switch (around) { case V3D_CENTER: /* bounding box center */ - min[0] = min[1] = min[2] = 1e20f; - max[0] = max[1] = max[2] = -1e20f; + INIT_MINMAX(min, max); BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { - DO_MINMAX(l->v->co, min, max); + minmax_v3v3_v3(min, max, l->v->co); } } } @@ -886,9 +885,7 @@ static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result, case V3D_CURSOR: /*cursor center*/ cursx = give_cursor(scene, v3d); /* shift to objects world */ - result[0] = cursx[0] - ob->obmat[3][0]; - result[1] = cursx[1] - ob->obmat[3][1]; - result[2] = cursx[2] - ob->obmat[3][2]; + sub_v3_v3v3(result, cursx, ob->obmat[3]); break; case V3D_LOCAL: /*object center*/ -- cgit v1.2.3