[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52260] trunk/blender/source/blender: code cleanup: replace most DO_MINMAX2 -> minmax_v2v2_v2
Campbell Barton
ideasman42 at gmail.com
Thu Nov 15 23:20:21 CET 2012
Revision: 52260
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52260
Author: campbellbarton
Date: 2012-11-15 22:20:18 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
code cleanup: replace most DO_MINMAX2 -> minmax_v2v2_v2
also add UNPACK macros's. handy for printing vectors for eg.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
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_node/node_group.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -761,7 +761,7 @@
{
MLoopUV *min = vmin, *max = vmax, *luv = data;
- DO_MINMAX2(luv->uv, min->uv, max->uv);
+ minmax_v2v2_v2(min->uv, max->uv, luv->uv);
}
static void layerAdd_mloopuv(void *data1, void *data2)
@@ -833,7 +833,7 @@
{
OrigSpaceLoop *min = vmin, *max = vmax, *luv = data;
- DO_MINMAX2(luv->uv, min->uv, max->uv);
+ minmax_v2v2_v2(min->uv, max->uv, luv->uv);
}
static void layerAdd_mloop_origspace(void *data1, void *data2)
Modified: trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -289,10 +289,10 @@
/* collapse loop with smaller AABB */
for (k = 0; k < tot_feather_point; k++) {
if (k >= check_b && k <= cur_a) {
- DO_MINMAX2(feather_points[k], min_a, max_a);
+ minmax_v2v2_v2(min_a, max_a, feather_points[k]);
}
else {
- DO_MINMAX2(feather_points[k], min_b, max_b);
+ minmax_v2v2_v2(min_b, max_b, feather_points[k]);
}
}
@@ -379,7 +379,7 @@
int next = i + 1;
float delta;
- DO_MINMAX2(feather_points[i], min, max);
+ minmax_v2v2_v2(min, max, feather_points[i]);
if (next == tot_feather_point) {
if (spline->flag & MASK_SPLINE_CYCLIC)
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -1124,10 +1124,10 @@
{
INIT_MINMAX2(min, max);
- DO_MINMAX2(marker->pattern_corners[0], min, max);
- DO_MINMAX2(marker->pattern_corners[1], min, max);
- DO_MINMAX2(marker->pattern_corners[2], min, max);
- DO_MINMAX2(marker->pattern_corners[3], min, max);
+ minmax_v2v2_v2(min, max, marker->pattern_corners[0]);
+ minmax_v2v2_v2(min, max, marker->pattern_corners[1]);
+ minmax_v2v2_v2(min, max, marker->pattern_corners[2]);
+ minmax_v2v2_v2(min, max, marker->pattern_corners[3]);
}
void BKE_tracking_marker_get_subframe_position(MovieTrackingTrack *track, float framenr, float pos[2])
@@ -3161,7 +3161,7 @@
if (track->flag & TRACK_USE_2D_STAB) {
MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
- DO_MINMAX2(marker->pos, min, max);
+ minmax_v2v2_v2(min, max, marker->pos);
ok = TRUE;
}
Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h 2012-11-15 22:20:18 UTC (rev 52260)
@@ -257,6 +257,15 @@
#define IN_RANGE(a, b, c) ((b < c) ? ((b < a && a < c) ? 1 : 0) : ((c < a && a < b) ? 1 : 0))
#define IN_RANGE_INCL(a, b, c) ((b < c) ? ((b <= a && a <= c) ? 1 : 0) : ((c <= a && a <= b) ? 1 : 0))
+/* unpack vector for args */
+#define UNPACK2(a) ((a)[0]), ((a)[1])
+#define UNPACK3(a) ((a)[0]), ((a)[1]), ((a)[2])
+#define UNPACK4(a) ((a)[0]), ((a)[1]), ((a)[2]), ((a)[3])
+/* op may be '&' or '*' */
+#define UNPACK2OP(a, op) op((a)[0]), op((a)[1])
+#define UNPACK3OP(a, op) op((a)[0]), op((a)[1]), op((a)[2])
+#define UNPACK4OP(a, op) op((a)[0]), op((a)[1]), op((a)[2]), op((a)[3])
+
/* array helpers */
#define ARRAY_LAST_ITEM(arr_start, arr_dtype, elem_size, tot) \
(arr_dtype *)((char *)arr_start + (elem_size * (tot - 1)))
Modified: trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp 2012-11-15 22:20:18 UTC (rev 52260)
@@ -202,9 +202,9 @@
INIT_MINMAX2(min, max);
- DO_MINMAX2(a->co, min, max);
- DO_MINMAX2(b->co, min, max);
- DO_MINMAX2(c->co, min, max);
+ minmax_v2v2_v2(min, max, a->co);
+ minmax_v2v2_v2(min, max, b->co);
+ minmax_v2v2_v2(min, max, c->co);
rect->xmin = min[0];
rect->ymin = min[1];
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -1059,11 +1059,11 @@
INIT_MINMAX2(min_uv, max_uv);
- DO_MINMAX2(uv1, min_uv, max_uv);
- DO_MINMAX2(uv2, min_uv, max_uv);
- DO_MINMAX2(uv3, min_uv, max_uv);
+ minmax_v2v2_v2(min_uv, max_uv, uv1);
+ minmax_v2v2_v2(min_uv, max_uv, uv2);
+ minmax_v2v2_v2(min_uv, max_uv, uv3);
if (is_quad)
- DO_MINMAX2(uv4, min_uv, max_uv);
+ minmax_v2v2_v2(min_uv, max_uv, uv4);
bounds_px->xmin = (int)(ibuf_x * min_uv[0]);
bounds_px->ymin = (int)(ibuf_y * min_uv[1]);
@@ -1089,7 +1089,7 @@
INIT_MINMAX2(min_uv, max_uv);
while (tot--) {
- DO_MINMAX2((*uv), min_uv, max_uv);
+ minmax_v2v2_v2(min_uv, max_uv, (*uv));
uv++;
}
@@ -2940,7 +2940,7 @@
fidx = mf->v4 ? 3 : 2;
do {
vCoSS = ps->screenCoords[*(&mf->v1 + fidx)];
- DO_MINMAX2(vCoSS, min, max);
+ minmax_v2v2_v2(min, max, vCoSS);
} while (fidx--);
project_paint_bucket_bounds(ps, min, max, bucketMin, bucketMax);
@@ -3205,7 +3205,7 @@
/* screen space, not clamped */
projScreenCo[0] = (float)(ps->winx / 2.0f) + (ps->winx / 2.0f) * projScreenCo[0];
projScreenCo[1] = (float)(ps->winy / 2.0f) + (ps->winy / 2.0f) * projScreenCo[1];
- DO_MINMAX2(projScreenCo, ps->screenMin, ps->screenMax);
+ minmax_v2v2_v2(ps->screenMin, ps->screenMax, projScreenCo);
}
}
else {
@@ -3220,7 +3220,7 @@
projScreenCo[0] = (float)(ps->winx / 2.0f) + (ps->winx / 2.0f) * projScreenCo[0] / projScreenCo[3];
projScreenCo[1] = (float)(ps->winy / 2.0f) + (ps->winy / 2.0f) * projScreenCo[1] / projScreenCo[3];
projScreenCo[2] = projScreenCo[2] / projScreenCo[3]; /* Use the depth for bucket point occlusion */
- DO_MINMAX2(projScreenCo, ps->screenMin, ps->screenMax);
+ minmax_v2v2_v2(ps->screenMin, ps->screenMax, projScreenCo);
}
else {
/* TODO - deal with cases where 1 side of a face goes behind the view ?
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -1284,7 +1284,7 @@
BKE_tracking_undistort_v2(tracking, pos, tpos);
- DO_MINMAX2(tpos, min, max);
+ minmax_v2v2_v2(min, max, tpos);
}
copy_v2_v2(pos, min);
Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -349,7 +349,7 @@
mul_v3_m4v3(pos, sc->stabmat, pos);
- DO_MINMAX2(pos, min, max);
+ minmax_v2v2_v2(min, max, pos);
ok = TRUE;
}
Modified: trunk/blender/source/blender/editors/space_node/node_group.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_group.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/editors/space_node/node_group.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -29,13 +29,18 @@
* \ingroup spnode
*/
+#include <stdlib.h>
+
#include "MEM_guardedalloc.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_anim_types.h"
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_rect.h"
+#include "BLI_math.h"
#include "BKE_action.h"
#include "BKE_animsys.h"
@@ -865,7 +870,7 @@
if (node == gnode)
continue;
if (node->flag & NODE_SELECT) {
- DO_MINMAX2((&node->locx), min, max);
+ minmax_v2v2_v2(min, max, &node->locx);
}
}
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -2486,7 +2486,7 @@
max[0] = aspx; max[1] = aspy;
for (a = 0, td = t->data; a < t->total; a++, td++) {
- DO_MINMAX2(td->loc, min, max);
+ minmax_v2v2_v2(min, max, td->loc);
}
if (resize) {
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-11-15 21:52:17 UTC (rev 52259)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-11-15 22:20:18 UTC (rev 52260)
@@ -616,7 +616,7 @@
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
if (uvedit_uv_select_test(em, scene, l)) {
luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
- DO_MINMAX2(luv->uv, r_min, r_max);
+ minmax_v2v2_v2(r_min, r_max, luv->uv);
sel = 1;
}
}
@@ -1327,7 +1327,7 @@
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
if (uvedit_uv_select_test(em, scene, l)) {
MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
- DO_MINMAX2(luv->uv, min, max);
+ minmax_v2v2_v2(min, max, luv->uv);
}
}
}
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list