Revision: 46602
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46602
Author: campbellbarton
Date: 2012-05-13 11:05:52 +0000 (Sun, 13 May 2012)
Log Message:
-----------
code cleanup: use vector math function minmax_v3v3_v3() and other minor vector
function edits.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_math_vector.h
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -2541,14 +2541,14 @@
}
/************** Bounding box ********************/
-static int minmax_armature(Object *ob, float min[3], float max[3])
+static int minmax_armature(Object *ob, float r_min[3], float r_max[3])
{
bPoseChannel *pchan;
/* For now, we assume BKE_pose_where_is has already been called (hence
we have valid data in pachan). */
for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
- DO_MINMAX(pchan->pose_head, min, max);
- DO_MINMAX(pchan->pose_tail, min, max);
+ minmax_v3v3_v3(r_min, r_max, pchan->pose_head);
+ minmax_v3v3_v3(r_min, r_max, pchan->pose_tail);
}
return (ob->pose->chanbase.first != NULL);
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-13 09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-13 11:05:52 UTC (rev 46602)
@@ -177,7 +177,7 @@
if (dm->numVertData) {
for (i = 0; i < dm->numVertData; i++) {
- DO_MINMAX(cddm->mvert[i].co, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, cddm->mvert[i].co);
}
}
else {
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -393,7 +393,7 @@
if (tot) doit = 1;
fp = dl->verts;
while (tot--) {
- DO_MINMAX(fp, min, max);
+ minmax_v3v3_v3(min, max, fp);
fp += 3;
}
dl = dl->next;
@@ -598,9 +598,9 @@
a = nu->pntsu;
bezt = nu->bezt;
while (a--) {
- DO_MINMAX(bezt->vec[0], min, max);
- DO_MINMAX(bezt->vec[1], min, max);
- DO_MINMAX(bezt->vec[2], min, max);
+ minmax_v3v3_v3(min, max, bezt->vec[0]);
+ minmax_v3v3_v3(min, max, bezt->vec[1]);
+ minmax_v3v3_v3(min, max, bezt->vec[2]);
bezt++;
}
}
@@ -608,7 +608,7 @@
a = nu->pntsu * nu->pntsv;
bp = nu->bp;
while (a--) {
- DO_MINMAX(bp->vec, min, max);
+ minmax_v3v3_v3(min, max, bp->vec);
bp++;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -1606,19 +1606,13 @@
if (cu->bb == NULL) cu->bb = MEM_callocN(sizeof(BoundBox),
"boundbox");
bb = cu->bb;
- dl = ob->disp.first;
-
- while (dl) {
- if (dl->type == DL_INDEX3) tot = dl->nr;
- else tot = dl->nr * dl->parts;
-
+ for (dl = ob->disp.first; dl; dl = dl->next) {
+ tot = (dl->type == DL_INDEX3) ? dl->nr : dl->nr *
dl->parts;
vert = dl->verts;
for (a = 0; a < tot; a++, vert += 3) {
- doit = 1;
- DO_MINMAX(vert, min, max);
+ minmax_v3v3_v3(min, max, vert);
}
-
- dl = dl->next;
+ doit = (tot != 0);
}
if (!doit) {
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-05-13 09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-05-13 11:05:52 UTC (rev 46602)
@@ -1229,12 +1229,12 @@
if (bmdm->tc->bm->totvert) {
if (bmdm->vertexCos) {
BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm,
BM_VERTS_OF_MESH, i) {
- DO_MINMAX(bmdm->vertexCos[i], min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r,
bmdm->vertexCos[i]);
}
}
else {
BM_ITER_MESH (eve, &iter, bmdm->tc->bm,
BM_VERTS_OF_MESH) {
- DO_MINMAX(eve->co, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, eve->co);
}
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -701,7 +701,7 @@
if (defvert_find_weight(dvert, index) >
0.0f) {
mul_m4_v3(cd.curvespace,
vertexCos[a]);
- DO_MINMAX(vertexCos[a],
cd.dmin, cd.dmax);
+ minmax_v3v3_v3(cd.dmin,
cd.dmax, vertexCos[a]);
}
}
@@ -736,7 +736,7 @@
for (a = 0; a < numVerts; a++) {
mul_m4_v3(cd.curvespace, vertexCos[a]);
- DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
+ minmax_v3v3_v3(cd.dmin, cd.dmax, vertexCos[a]);
}
for (a = 0; a < numVerts; a++) {
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -368,7 +368,7 @@
data = dl->verts;
while (tot--) {
/* Also weird... but longer. From utildefines. */
- DO_MINMAX(data, min, max);
+ minmax_v3v3_v3(min, max, data);
data += 3;
}
dl = dl->next;
@@ -2397,7 +2397,7 @@
INIT_MINMAX(min, max);
for (ml = mb->elems.first; ml; ml = ml->next) {
- DO_MINMAX(&ml->x, min, max);
+ minmax_v3v3_v3(min, max, &ml->x);
}
return (mb->elems.first != NULL);
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -3017,7 +3017,7 @@
int i = me->totvert;
MVert *mvert;
for (mvert = me->mvert; i--; mvert++) {
- DO_MINMAX(mvert->co, r_min, r_max);
+ minmax_v3v3_v3(r_min, r_max, mvert->co);
}
return (me->totvert != 0);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-05-13
09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-05-13
11:05:52 UTC (rev 46602)
@@ -2259,7 +2259,7 @@
for (a = 0; a < 8; a++) {
mul_m4_v3(ob->obmat, bb.vec[a]);
- DO_MINMAX(bb.vec[a], min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, bb.vec[a]);
}
change = TRUE;
}
@@ -2274,7 +2274,7 @@
for (v = 0; v < lt->pntsv; v++) {
for (u = 0; u < lt->pntsu; u++, bp++) {
mul_v3_m4v3(vec, ob->obmat,
bp->vec);
- DO_MINMAX(vec, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r,
vec);
}
}
}
@@ -2286,9 +2286,9 @@
bPoseChannel *pchan;
for (pchan = ob->pose->chanbase.first; pchan;
pchan = pchan->next) {
mul_v3_m4v3(vec, ob->obmat,
pchan->pose_head);
- DO_MINMAX(vec, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, vec);
mul_v3_m4v3(vec, ob->obmat,
pchan->pose_tail);
- DO_MINMAX(vec, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, vec);
}
change = TRUE;
}
@@ -2302,7 +2302,7 @@
for (a = 0; a < 8; a++) {
mul_m4_v3(ob->obmat, bb.vec[a]);
- DO_MINMAX(bb.vec[a], min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, bb.vec[a]);
}
change = TRUE;
}
@@ -2311,15 +2311,15 @@
}
if (change == FALSE) {
- DO_MINMAX(ob->obmat[3], min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, ob->obmat[3]);
copy_v3_v3(vec, ob->obmat[3]);
add_v3_v3(vec, ob->size);
- DO_MINMAX(vec, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, vec);
copy_v3_v3(vec, ob->obmat[3]);
sub_v3_v3(vec, ob->size);
- DO_MINMAX(vec, min_r, max_r);
+ minmax_v3v3_v3(min_r, max_r, vec);
}
}
@@ -2343,7 +2343,7 @@
for (i = 0; i < 8; i++) {
float vec[3];
mul_v3_m4v3(vec, dob->mat,
bb->vec[i]);
- DO_MINMAX(vec, r_min, r_max);
+ minmax_v3v3_v3(r_min, r_max,
vec);
}
ok = 1;
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-05-13 09:26:01 UTC (rev 46601)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-05-13 11:05:52 UTC (rev 46602)
@@ -414,9 +414,7 @@
/* make a map from original faces to CCGFaces */
faceMap = MEM_mallocN(totface * sizeof(*faceMap), "facemapuv");
-
- fi = ccgSubSurf_getFaceIterator(uvss);
- for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) {
+ for (fi = ccgSubSurf_getFaceIterator(uvss);
!ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) {
CCGFace *f = ccgFaceIterator_getCurrent(fi);
faceMap[GET_INT_FROM_POINTER(ccgSubSurf_getFaceFaceHandle(f))]
= f;
}
@@ -664,9 +662,9 @@
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
CCGSubSurf *ss = ccgdm->ss;
- CCGVertIterator *vi = ccgSubSurf_getVertIterator(ss);
- CCGEdgeIterator *ei = ccgSubSurf_getEdgeIterator(ss);
- CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
+ CCGVertIterator *vi;
+ CCGEdgeIterator *ei;
+ CCGFaceIterator *fi;
CCGKey key;
int i, edgeSize = ccgSubSurf_getEdgeSize(ss);
int gridSize = ccgSubSurf_getGridSize(ss);
@@ -676,22 +674,24 @@
if (!ccgSubSurf_getNumVerts(ss))
min_r[0] = min_r[1] = min_r[2] = max_r[0] = max_r[1] = max_r[2]
= 0.0;
- for (; !ccgVertIterator_isStopped(vi); ccgVertIterator_next(vi)) {
+ for (vi = ccgSubSurf_getVertIterator(ss);
!ccgVertIterator_isStopped(vi); ccgVertIterator_next(vi)) {
CCGVert *v = ccgVertIterator_getCurrent(vi);
float *co = ccgSubSurf_getVertData(ss, v);
minmax_v3_v3v3(co, min_r, max_r);
}
+ ccgVertIterator_free(vi);
- for (; !ccgEdgeIterator_isStopped(ei); ccgEdgeIterator_next(ei)) {
+ for (ei = ccgSubSurf_getEdgeIterator(ss);
!ccgEdgeIterator_isStopped(ei); ccgEdgeIterator_next(ei)) {
CCGEdge *e = ccgEdgeIterator_getCurrent(ei);
CCGElem *edgeData = ccgSubSurf_getEdgeDataArray(ss, e);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
