[Bf-blender-cvs] [dbd7025] master: Code Cleanup: softbody macro use (function calls and expressions within macros)
Campbell Barton
noreply at git.blender.org
Sun Dec 1 02:37:56 CET 2013
Commit: dbd7025fae31f18037be39e9dcd8ed84e1ac41cd
Author: Campbell Barton
Date: Sun Dec 1 12:37:05 2013 +1100
http://developer.blender.org/rBdbd7025fae31f18037be39e9dcd8ed84e1ac41cd
Code Cleanup: softbody macro use (function calls and expressions within macros)
===================================================================
M source/blender/blenkernel/intern/softbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 5011080..4e2f708 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -234,7 +234,7 @@ static float _final_goal(Object *ob, BodyPoint *bp)/*jow_go_for2_5 */
if (!(ob->softflag & OB_SB_GOAL)) return (0.0f);
if (sb&&bp) {
if (bp->goal < 0.0f) return (0.0f);
- f = sb->mingoal + bp->goal*ABS(sb->maxgoal - sb->mingoal);
+ f = sb->mingoal + bp->goal * fabsf(sb->maxgoal - sb->mingoal);
f = pow(f, 4.0f);
return (f);
}
@@ -316,7 +316,7 @@ static ccd_Mesh *ccd_mesh_make(Object *ob)
/* blow it up with forcefield ranges */
- hull = MAX2(ob->pd->pdef_sbift, ob->pd->pdef_sboft);
+ hull = max_ff(ob->pd->pdef_sbift, ob->pd->pdef_sboft);
/* alloc and copy verts*/
pccd_M->mvert = MEM_dupallocN(cmd->xnew);
@@ -325,13 +325,13 @@ static ccd_Mesh *ccd_mesh_make(Object *ob)
for (i=0; i < pccd_M->totvert; i++) {
/* evaluate limits */
copy_v3_v3(v, pccd_M->mvert[i].co);
- pccd_M->bbmin[0] = MIN2(pccd_M->bbmin[0], v[0]-hull);
- pccd_M->bbmin[1] = MIN2(pccd_M->bbmin[1], v[1]-hull);
- pccd_M->bbmin[2] = MIN2(pccd_M->bbmin[2], v[2]-hull);
+ pccd_M->bbmin[0] = min_ff(pccd_M->bbmin[0], v[0] - hull);
+ pccd_M->bbmin[1] = min_ff(pccd_M->bbmin[1], v[1] - hull);
+ pccd_M->bbmin[2] = min_ff(pccd_M->bbmin[2], v[2] - hull);
- pccd_M->bbmax[0] = MAX2(pccd_M->bbmax[0], v[0]+hull);
- pccd_M->bbmax[1] = MAX2(pccd_M->bbmax[1], v[1]+hull);
- pccd_M->bbmax[2] = MAX2(pccd_M->bbmax[2], v[2]+hull);
+ pccd_M->bbmax[0] = max_ff(pccd_M->bbmax[0], v[0] + hull);
+ pccd_M->bbmax[1] = max_ff(pccd_M->bbmax[1], v[1] + hull);
+ pccd_M->bbmax[2] = max_ff(pccd_M->bbmax[2], v[2] + hull);
}
/* alloc and copy faces*/
@@ -349,44 +349,43 @@ static ccd_Mesh *ccd_mesh_make(Object *ob)
mima->maxx=mima->maxy=mima->maxz=-1e30f;
copy_v3_v3(v, pccd_M->mvert[mface->v1].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
copy_v3_v3(v, pccd_M->mvert[mface->v2].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
copy_v3_v3(v, pccd_M->mvert[mface->v3].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
if (mface->v4) {
copy_v3_v3(v, pccd_M->mvert[mface->v4].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
}
-
- mima++;
- mface++;
-
+ mima++;
+ mface++;
}
+
return pccd_M;
}
static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M)
@@ -414,7 +413,7 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M)
/* blow it up with forcefield ranges */
- hull = MAX2(ob->pd->pdef_sbift, ob->pd->pdef_sboft);
+ hull = max_ff(ob->pd->pdef_sbift, ob->pd->pdef_sboft);
/* rotate current to previous */
if (pccd_M->mprevvert) MEM_freeN(pccd_M->mprevvert);
@@ -426,23 +425,23 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M)
for (i=0; i < pccd_M->totvert; i++) {
/* evaluate limits */
copy_v3_v3(v, pccd_M->mvert[i].co);
- pccd_M->bbmin[0] = MIN2(pccd_M->bbmin[0], v[0]-hull);
- pccd_M->bbmin[1] = MIN2(pccd_M->bbmin[1], v[1]-hull);
- pccd_M->bbmin[2] = MIN2(pccd_M->bbmin[2], v[2]-hull);
+ pccd_M->bbmin[0] = min_ff(pccd_M->bbmin[0], v[0] - hull);
+ pccd_M->bbmin[1] = min_ff(pccd_M->bbmin[1], v[1] - hull);
+ pccd_M->bbmin[2] = min_ff(pccd_M->bbmin[2], v[2] - hull);
- pccd_M->bbmax[0] = MAX2(pccd_M->bbmax[0], v[0]+hull);
- pccd_M->bbmax[1] = MAX2(pccd_M->bbmax[1], v[1]+hull);
- pccd_M->bbmax[2] = MAX2(pccd_M->bbmax[2], v[2]+hull);
+ pccd_M->bbmax[0] = max_ff(pccd_M->bbmax[0], v[0] + hull);
+ pccd_M->bbmax[1] = max_ff(pccd_M->bbmax[1], v[1] + hull);
+ pccd_M->bbmax[2] = max_ff(pccd_M->bbmax[2], v[2] + hull);
/* evaluate limits */
copy_v3_v3(v, pccd_M->mprevvert[i].co);
- pccd_M->bbmin[0] = MIN2(pccd_M->bbmin[0], v[0]-hull);
- pccd_M->bbmin[1] = MIN2(pccd_M->bbmin[1], v[1]-hull);
- pccd_M->bbmin[2] = MIN2(pccd_M->bbmin[2], v[2]-hull);
+ pccd_M->bbmin[0] = min_ff(pccd_M->bbmin[0], v[0] - hull);
+ pccd_M->bbmin[1] = min_ff(pccd_M->bbmin[1], v[1] - hull);
+ pccd_M->bbmin[2] = min_ff(pccd_M->bbmin[2], v[2] - hull);
- pccd_M->bbmax[0] = MAX2(pccd_M->bbmax[0], v[0]+hull);
- pccd_M->bbmax[1] = MAX2(pccd_M->bbmax[1], v[1]+hull);
- pccd_M->bbmax[2] = MAX2(pccd_M->bbmax[2], v[2]+hull);
+ pccd_M->bbmax[0] = max_ff(pccd_M->bbmax[0], v[0] + hull);
+ pccd_M->bbmax[1] = max_ff(pccd_M->bbmax[1], v[1] + hull);
+ pccd_M->bbmax[2] = max_ff(pccd_M->bbmax[2], v[2] + hull);
}
@@ -456,72 +455,72 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M)
mima->maxx=mima->maxy=mima->maxz=-1e30f;
copy_v3_v3(v, pccd_M->mvert[mface->v1].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
copy_v3_v3(v, pccd_M->mvert[mface->v2].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
copy_v3_v3(v, pccd_M->mvert[mface->v3].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
if (mface->v4) {
copy_v3_v3(v, pccd_M->mvert[mface->v4].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
}
copy_v3_v3(v, pccd_M->mprevvert[mface->v1].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] - hull);
+ mima->maxx = max_ff(mima->maxx, v[0] + hull);
+ mima->maxy = max_ff(mima->maxy, v[1] + hull);
+ mima->maxz = max_ff(mima->maxz, v[2] + hull);
copy_v3_v3(v, pccd_M->mprevvert[mface->v2].co);
- mima->minx = MIN2(mima->minx, v[0]-hull);
- mima->miny = MIN2(mima->miny, v[1]-hull);
- mima->minz = MIN2(mima->minz, v[2]-hull);
- mima->maxx = MAX2(mima->maxx, v[0]+hull);
- mima->maxy = MAX2(mima->maxy, v[1]+hull);
- mima->maxz = MAX2(mima->maxz, v[2]+hull);
+ mima->minx = min_ff(mima->minx, v[0] - hull);
+ mima->miny = min_ff(mima->miny, v[1] - hull);
+ mima->minz = min_ff(mima->minz, v[2] -
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list