[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49361] trunk/blender/source/blender: add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these).

Campbell Barton ideasman42 at gmail.com
Sun Jul 29 20:14:20 CEST 2012


Revision: 49361
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49361
Author:   campbellbarton
Date:     2012-07-29 18:14:20 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    trunk/blender/source/blender/blenlib/intern/math_base_inline.c
    trunk/blender/source/blender/blenlib/intern/pbvh.c
    trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/editors/interface/interface_widgets.c
    trunk/blender/source/blender/editors/screen/glutil.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
    trunk/blender/source/blender/render/intern/raytrace/bvh.h
    trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -545,7 +545,9 @@
 	 * since sound is played outside of evaluating the imbufs, */
 	for (seq = metaseq->seqbase.first; seq; seq = seq->next) {
 		if (seq->type == SEQ_TYPE_META) {
-			seq_update_sound_bounds_recursive_rec(scene, seq, MAX2(start, metaseq_start(seq)), MIN2(end, metaseq_end(seq)));
+			seq_update_sound_bounds_recursive_rec(scene, seq,
+			                                      maxi(start, metaseq_start(seq)),
+			                                      mini(end, metaseq_end(seq)));
 		}
 		else if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE)) {
 			if (seq->scene_sound) {
@@ -3140,7 +3142,7 @@
 {
 	if (metaclip && seq->tmp) {
 		/* return the range clipped by the parents range */
-		return MAX2(seq_tx_get_final_left(seq, 0), seq_tx_get_final_left((Sequence *)seq->tmp, 1) );
+		return maxi(seq_tx_get_final_left(seq, 0), seq_tx_get_final_left((Sequence *)seq->tmp, TRUE));
 	}
 	else {
 		return (seq->start - seq->startstill) + seq->startofs;
@@ -3151,7 +3153,7 @@
 {
 	if (metaclip && seq->tmp) {
 		/* return the range clipped by the parents range */
-		return MIN2(seq_tx_get_final_right(seq, 0), seq_tx_get_final_right((Sequence *)seq->tmp, 1) );
+		return mini(seq_tx_get_final_right(seq, 0), seq_tx_get_final_right((Sequence *)seq->tmp, TRUE));
 	}
 	else {
 		return ((seq->start + seq->len) + seq->endstill) - seq->endofs;

Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -648,7 +648,7 @@
 // This functions returns the number of branches needed to have the requested number of leafs.
 static int implicit_needed_branches(int tree_type, int leafs)
 {
-	return MAX2(1, (leafs + tree_type - 3) / (tree_type - 1) );
+	return maxi(1, (leafs + tree_type - 3) / (tree_type - 1) );
 }
 
 /*

Modified: trunk/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base_inline.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/blenlib/intern/math_base_inline.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -143,12 +143,20 @@
 {
 	return (a < b) ? a : b;
 }
-
 MINLINE float maxf(float a, float b)
 {
 	return (a > b) ? a : b;
 }
 
+MINLINE int mini(int a, int b)
+{
+	return (a < b) ? a : b;
+}
+MINLINE int maxi(int a, int b)
+{
+	return (b < a) ? a : b;
+}
+
 MINLINE float signf(float f)
 {
 	return (f < 0.f) ? -1.f : 1.f;

Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -663,7 +663,7 @@
 	bvh->totgrid = totgrid;
 	bvh->gridkey = *key;
 	bvh->grid_hidden = grid_hidden;
-	bvh->leaf_limit = MAX2(LEAF_LIMIT / ((gridsize - 1) * (gridsize - 1)), 1);
+	bvh->leaf_limit = maxi(LEAF_LIMIT / ((gridsize - 1) * (gridsize - 1)), 1);
 
 	BB_reset(&cb);
 

Modified: trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp	2012-07-29 18:14:20 UTC (rev 49361)
@@ -303,7 +303,7 @@
 {
 	this->m_kg = maxf(minf(distortion, 1.0f), -0.999f);
 	// smaller dispersion range for somewhat more control
-	const float d = 0.25f * MAX2(MIN2(dispersion, 1.f), 0.f);
+	const float d = 0.25f * maxf(minf(dispersion, 1.0f), 0.0f);
 	this->m_kr = maxf(minf((this->m_kg + d), 1.0f), -0.999f);
 	this->m_kb = maxf(minf((this->m_kg - d), 1.0f), -0.999f);
 	this->m_maxk = MAX3(this->m_kr, this->m_kg, this->m_kb);

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -2418,7 +2418,7 @@
 			 * on the first item */
 			offset[0] = 0;
 			for (bt = block->buttons.first; bt; bt = bt->next)
-				offset[0] = MIN2(offset[0], -(bt->x1 + 0.8f * (bt->x2 - bt->x1)));
+				offset[0] = mini(offset[0], -(bt->x1 + 0.8f * (bt->x2 - bt->x1)));
 
 			offset[1] = 1.5 * UI_UNIT_Y;
 		}

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -346,7 +346,8 @@
 	const int vnum = ((roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)) == (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT) ||
 	                  (roundboxalign & (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) == (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) ? 1 : 2;
 
-	minsize = MIN2((rect->xmax - rect->xmin) * hnum, (rect->ymax - rect->ymin) * vnum);
+	minsize = mini((rect->xmax - rect->xmin) * hnum,
+	               (rect->ymax - rect->ymin) * vnum);
 	
 	if (2.0f * rad > minsize)
 		rad = 0.5f * minsize;

Modified: trunk/blender/source/blender/editors/screen/glutil.c
===================================================================
--- trunk/blender/source/blender/editors/screen/glutil.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/editors/screen/glutil.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -624,8 +624,8 @@
 	 * covers the entire screen).
 	 */
 	glGetFloatv(GL_SCISSOR_BOX, scissor);
-	draw_w = MIN2(img_w - off_x, ceil((scissor[2] - rast_x) / xzoom));
-	draw_h = MIN2(img_h - off_y, ceil((scissor[3] - rast_y) / yzoom));
+	draw_w = mini(img_w - off_x, ceil((scissor[2] - rast_x) / xzoom));
+	draw_h = mini(img_h - off_y, ceil((scissor[3] - rast_y) / yzoom));
 
 	if (draw_w > 0 && draw_h > 0) {
 		int old_row_length = glaGetOneInteger(GL_UNPACK_ROW_LENGTH);

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -852,7 +852,7 @@
 	
 		layout = uiBlockLayout(gnode->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
 		                       (int)(rect.xmin + NODE_MARGIN_X), (int)(rect.ymax + (group_header - (2.5f * dpi_fac))),
-		                       MIN2((int)(rect.xmax - rect.xmin - 18.0f), node_group_frame + 20), group_header, UI_GetStyle());
+		                       mini((int)(rect.xmax - rect.xmin - 18.0f), node_group_frame + 20), group_header, UI_GetStyle());
 		RNA_pointer_create(&ntree->id, &RNA_Node, gnode, &ptr);
 		uiTemplateIDBrowse(layout, (bContext *)C, &ptr, "node_tree", NULL, NULL, NULL);
 		uiBlockLayoutResolve(gnode->block, NULL, NULL);

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -1049,7 +1049,7 @@
 	glRectf(v2d->cur.xmin,  -1.0,  v2d->cur.xmax,  1.0);
 
 	/* Alternating horizontal stripes */
-	i = MAX2(1, ((int)v2d->cur.ymin) - 1);
+	i = maxi(1, ((int)v2d->cur.ymin) - 1);
 
 	glBegin(GL_QUADS);
 	while (i < v2d->cur.ymax) {
@@ -1068,7 +1068,7 @@
 	glEnd();
 	
 	/* Darker lines separating the horizontal bands */
-	i = MAX2(1, ((int)v2d->cur.ymin) - 1);
+	i = maxi(1, ((int)v2d->cur.ymin) - 1);
 	UI_ThemeColor(TH_GRID);
 	
 	glBegin(GL_LINES);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c	2012-07-29 18:14:20 UTC (rev 49361)
@@ -587,8 +587,8 @@
 					// n-agonal
 					int ov, nv;
 					float mind, maxd, lwt;
-					ys = MAX2((int)floor(bkh_b[2]*ct_crad + y), 0);
-					ye = MIN2((int)ceil(bkh_b[3]*ct_crad + y), new->y - 1);
+					ys = maxi((int)floor(bkh_b[2] * ct_crad + y), 0);
+					ye = mini((int)ceil(bkh_b[3] * ct_crad + y), new->y - 1);
 					for (sy=ys; sy<=ye; sy++) {
 						float fxs = 1e10f, fxe = -1e10f;
 						float yf = (sy - y)/ct_crad;

Modified: trunk/blender/source/blender/render/intern/raytrace/bvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/bvh.h	2012-07-29 17:49:14 UTC (rev 49360)
+++ trunk/blender/source/blender/render/intern/raytrace/bvh.h	2012-07-29 18:14:20 UTC (rev 49361)
@@ -88,8 +88,8 @@
 
 	RE_RC_COUNT(isec->raycounter->bb.test);
 	
-	if (t1x > t2y || t2x < t1y || t1x > t2z || t2x < t1z || t1y > t2z || t2y < t1z) return 0;
-	if (t2x < 0.0 || t2y < 0.0 || t2z < 0.0) return 0;
+	if (t1x > t2y  || t2x < t1y  || t1x > t2z || t2x < t1z || t1y > t2z || t2y < t1z) return 0;
+	if (t2x < 0.0f || t2y < 0.0f || t2z < 0.0f) return 0;
 	if (t1x > isec->dist || t1y > isec->dist || t1z > isec->dist) return 0;
 	RE_RC_COUNT(isec->raycounter->bb.hit);	
 

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list