[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49359] trunk/blender/source/blender: code cleanup: replace MIN2/MAX2 with minf/maxf

Campbell Barton ideasman42 at gmail.com
Sun Jul 29 18:59:52 CEST 2012


Revision: 49359
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49359
Author:   campbellbarton
Date:     2012-07-29 16:59:51 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
code cleanup: replace MIN2/MAX2 with minf/maxf

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/boids.c
    trunk/blender/source/blender/blenkernel/intern/brush.c
    trunk/blender/source/blender/blenkernel/intern/colortools.c
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/blenlib/intern/pbvh.c
    trunk/blender/source/blender/blenlib/intern/scanfill.c
    trunk/blender/source/blender/blenlib/intern/voronoi.c
    trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
    trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    trunk/blender/source/blender/editors/interface/interface_panel.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
    trunk/blender/source/blender/editors/space_clip/clip_draw.c
    trunk/blender/source/blender/editors/space_clip/clip_editor.c
    trunk/blender/source/blender/editors/space_clip/clip_ops.c
    trunk/blender/source/blender/editors/space_clip/tracking_ops.c
    trunk/blender/source/blender/editors/space_clip/tracking_select.c
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/editors/space_nla/nla_edit.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    trunk/blender/source/blender/imbuf/intern/divers.c
    trunk/blender/source/blender/makesrna/intern/rna_cloth.c
    trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
    trunk/blender/source/blender/makesrna/intern/rna_main.c
    trunk/blender/source/blender/makesrna/intern/rna_mask.c
    trunk/blender/source/blender/makesrna/intern/rna_nla.c
    trunk/blender/source/blender/makesrna/intern/rna_rna.c
    trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
    trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    trunk/blender/source/blender/modifiers/intern/MOD_skin.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
    trunk/blender/source/blender/render/intern/source/imagetexture.c
    trunk/blender/source/blender/render/intern/source/rayshade.c
    trunk/blender/source/blender/render/intern/source/render_texture.c
    trunk/blender/source/blender/render/intern/source/rendercore.c
    trunk/blender/source/blender/render/intern/source/shadbuf.c
    trunk/blender/source/blender/render/intern/source/sss.c
    trunk/blender/source/blender/render/intern/source/zbuf.c

Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -1168,7 +1168,7 @@
 
 			/* constrain direction with maximum angular velocity */
 			angle = saacos(dot_v3v3(old_dir, wanted_dir));
-			angle = MIN2(angle, val.max_ave);
+			angle = minf(angle, val.max_ave);
 
 			cross_v3_v3v3(nor, old_dir, wanted_dir);
 			axis_angle_to_quat(q, nor, angle);

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -1052,13 +1052,13 @@
 static void brush_pressure_apply(BrushPainter *painter, Brush *brush, float pressure)
 {
 	if (BKE_brush_use_alpha_pressure(painter->scene, brush))
-		brush_alpha_set(painter->scene, brush, MAX2(0.0f, painter->startalpha * pressure));
+		brush_alpha_set(painter->scene, brush, maxf(0.0f, painter->startalpha * pressure));
 	if (BKE_brush_use_size_pressure(painter->scene, brush))
-		BKE_brush_size_set(painter->scene, brush, MAX2(1.0f, painter->startsize * pressure));
+		BKE_brush_size_set(painter->scene, brush, maxf(1.0f, painter->startsize * pressure));
 	if (brush->flag & BRUSH_JITTER_PRESSURE)
-		brush->jitter = MAX2(0.0f, painter->startjitter * pressure);
+		brush->jitter = maxf(0.0f, painter->startjitter * pressure);
 	if (brush->flag & BRUSH_SPACING_PRESSURE)
-		brush->spacing = MAX2(1.0f, painter->startspacing * (1.5f - pressure));
+		brush->spacing = maxf(1.0f, painter->startspacing * (1.5f - pressure));
 }
 
 void BKE_brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2], float jitterpos[2])
@@ -1158,7 +1158,7 @@
 		/* compute brush spacing adapted to brush radius, spacing may depend
 		 * on pressure, so update it */
 		brush_pressure_apply(painter, brush, painter->lastpressure);
-		spacing = MAX2(1.0f, radius) * brush->spacing * 0.01f;
+		spacing = maxf(1.0f, radius) * brush->spacing * 0.01f;
 
 		/* setup starting distance, direction vector and accumulated distance */
 		startdistance = painter->accumdistance;
@@ -1176,7 +1176,7 @@
 				t = step / len;
 				press = (1.0f - t) * painter->lastpressure + t * pressure;
 				brush_pressure_apply(painter, brush, press);
-				spacing = MAX2(1.0f, radius) * brush->spacing * 0.01f;
+				spacing = maxf(1.0f, radius) * brush->spacing * 0.01f;
 
 				BKE_brush_jitter_pos(scene, brush, paintpos, finalpos);
 

Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -66,10 +66,10 @@
 	cumap->flag = CUMA_DO_CLIP;
 	if (tot == 4) cumap->cur = 3;   /* rhms, hack for 'col' curve? */
 	
-	clipminx = MIN2(minx, maxx);
-	clipminy = MIN2(miny, maxy);
-	clipmaxx = MAX2(minx, maxx);
-	clipmaxy = MAX2(miny, maxy);
+	clipminx = minf(minx, maxx);
+	clipminy = minf(miny, maxy);
+	clipmaxx = maxf(minx, maxx);
+	clipmaxy = maxf(miny, maxy);
 	
 	BLI_rctf_init(&cumap->curr, clipminx, clipmaxx, clipminy, clipmaxy);
 	cumap->clipr = cumap->curr;
@@ -463,8 +463,8 @@
 	bezt = MEM_callocN(cuma->totpoint * sizeof(BezTriple), "beztarr");
 	
 	for (a = 0; a < cuma->totpoint; a++) {
-		cuma->mintable = MIN2(cuma->mintable, cmp[a].x);
-		cuma->maxtable = MAX2(cuma->maxtable, cmp[a].x);
+		cuma->mintable = minf(cuma->mintable, cmp[a].x);
+		cuma->maxtable = maxf(cuma->maxtable, cmp[a].x);
 		bezt[a].vec[1][0] = cmp[a].x;
 		bezt[a].vec[1][1] = cmp[a].y;
 		if (cmp[a].flag & CUMA_VECTOR)
@@ -655,13 +655,13 @@
 		for (a = 0; a < cuma->totpoint; a++) {
 			if (cmp[a].flag & CUMA_SELECT) {
 				if (cmp[a].x < clipr->xmin)
-					dx = MIN2(dx, cmp[a].x - clipr->xmin);
+					dx = minf(dx, cmp[a].x - clipr->xmin);
 				else if (cmp[a].x > clipr->xmax)
-					dx = MAX2(dx, cmp[a].x - clipr->xmax);
+					dx = maxf(dx, cmp[a].x - clipr->xmax);
 				if (cmp[a].y < clipr->ymin)
-					dy = MIN2(dy, cmp[a].y - clipr->ymin);
+					dy = minf(dy, cmp[a].y - clipr->ymin);
 				else if (cmp[a].y > clipr->ymax)
-					dy = MAX2(dy, cmp[a].y - clipr->ymax);
+					dy = maxf(dy, cmp[a].y - clipr->ymax);
 			}
 		}
 		for (a = 0; a < cuma->totpoint; a++) {

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -3624,7 +3624,7 @@
 		cross_v3_v3v3(raxis, obvec, tarvec);
 		
 		rangle = dot_v3v3(obvec, tarvec);
-		rangle = acos(MAX2(-1.0f, MIN2(1.0f, rangle)) );
+		rangle = acos(maxf(-1.0f, minf(1.0f, rangle)));
 		
 		/* construct rotation matrix from the axis-angle rotation found above 
 		 *	- this call takes care to make sure that the axis provided is a unit vector first

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -995,8 +995,8 @@
 	if (event == CLAMP_PAT_DIM) {
 		for (a = 0; a < 2; a++) {
 			/* search shouldn't be resized smaller than pattern */
-			marker->search_min[a] = MIN2(pat_min[a], marker->search_min[a]);
-			marker->search_max[a] = MAX2(pat_max[a], marker->search_max[a]);
+			marker->search_min[a] = minf(pat_min[a], marker->search_min[a]);
+			marker->search_max[a] = maxf(pat_max[a], marker->search_max[a]);
 		}
 	}
 	else if (event == CLAMP_PAT_POS) {
@@ -1020,8 +1020,8 @@
 	else if (event == CLAMP_SEARCH_DIM) {
 		for (a = 0; a < 2; a++) {
 			/* search shouldn't be resized smaller than pattern */
-			marker->search_min[a] = MIN2(pat_min[a], marker->search_min[a]);
-			marker->search_max[a] = MAX2(pat_max[a], marker->search_max[a]);
+			marker->search_min[a] = minf(pat_min[a], marker->search_min[a]);
+			marker->search_max[a] = maxf(pat_max[a], marker->search_max[a]);
 		}
 	}
 	else if (event == CLAMP_SEARCH_POS) {
@@ -3272,7 +3272,7 @@
 
 						S = (-w * I - h * J) / (dx * I + dy * J + K);
 
-						scale = MAX2(scale, S);
+						scale = maxf(scale, S);
 					}
 				}
 			}
@@ -3281,7 +3281,7 @@
 		stab->scale = scale;
 
 		if (stab->maxscale > 0.0f)
-			stab->scale = MIN2(stab->scale, stab->maxscale);
+			stab->scale = minf(stab->scale, stab->maxscale);
 	}
 	else {
 		stab->scale = 1.0f;

Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -189,8 +189,8 @@
 {
 	int i;
 	for (i = 0; i < 3; ++i) {
-		bb->bmin[i] = MIN2(bb->bmin[i], co[i]);
-		bb->bmax[i] = MAX2(bb->bmax[i], co[i]);
+		bb->bmin[i] = minf(bb->bmin[i], co[i]);
+		bb->bmax[i] = maxf(bb->bmax[i], co[i]);
 	}
 }
 
@@ -199,8 +199,8 @@
 {
 	int i;
 	for (i = 0; i < 3; ++i) {
-		bb->bmin[i] = MIN2(bb->bmin[i], bb2->bmin[i]);
-		bb->bmax[i] = MAX2(bb->bmax[i], bb2->bmax[i]);
+		bb->bmin[i] = minf(bb->bmin[i], bb2->bmin[i]);
+		bb->bmax[i] = maxf(bb->bmax[i], bb2->bmax[i]);
 	}
 }
 

Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -658,7 +658,7 @@
 				if (v1 == v2 || v2 == v3) break;
 				/* printf("test verts %x %x %x\n",v1,v2,v3); */
 				miny = minf(v1->xy[1], v3->xy[1]);
-				/*  miny= MIN2(v1->xy[1],v3->xy[1]); */
+				/*  miny= minf(v1->xy[1],v3->xy[1]); */
 				sc1 = sc + 1;
 				test = 0;
 

Modified: trunk/blender/source/blender/blenlib/intern/voronoi.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/voronoi.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/blenlib/intern/voronoi.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -259,9 +259,9 @@
 	x2 = (-b - sqrtf(disc)) / (2 * a);
 
 	if (p[1] < r[1])
-		ry = MAX2(x1, x2);
+		ry = maxf(x1, x2);
 	else
-		ry = MIN2(x1, x2);
+		ry = minf(x1, x2);
 
 	return ry;
 }

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -236,7 +236,7 @@
 
 		f1 = fabsf(f1);
 		f2 = fabsf(f2);
-		f1 = MIN2(f1, f2);
+		f1 = minf(f1, f2);
 		CLAMP(f1, 0.0f, 1.0f + FLT_EPSILON);
 	}
 	else {

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2012-07-29 15:48:38 UTC (rev 49358)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2012-07-29 16:59:51 UTC (rev 49359)
@@ -507,8 +507,8 @@
 
 #define GETMIN2_AXIS(a, b, ma, mb, axis)   \
 	{                                      \
-		ma[axis] = MIN2(a[axis], b[axis]); \
-		mb[axis] = MAX2(a[axis], b[axis]); \
+		ma[axis] = minf(a[axis], b[axis]); \
+		mb[axis] = maxf(a[axis], b[axis]); \
 	} (void)0
 
 #define GETMIN2(a, b, ma, mb)          \
@@ -538,17 +538,17 @@
 	
 	/* do an interval test on the x and y axes */
 	/* first do x axis */
-	if (ABS(v1[1] - v2[1]) < EPS &&
-	    ABS(v3[1] - v4[1]) < EPS &&
-	    ABS(v1[1] - v3[1]) < EPS)
+	if (fabsf(v1[1] - v2[1]) < EPS &&
+	    fabsf(v3[1] - v4[1]) < EPS &&
+	    fabsf(v1[1] - v3[1]) < EPS)
 	{
 		return (mv4[0] >= mv1[0] && mv3[0] <= mv2[0]);
 	}
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list