[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41188] trunk/blender/source/blender: BLI_utildefine minor edits
Campbell Barton
ideasman42 at gmail.com
Sat Oct 22 05:39:17 CEST 2011
Revision: 41188
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41188
Author: campbellbarton
Date: 2011-10-22 03:39:13 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
BLI_utildefine minor edits
- removed AVG2, was only used once.
- remove unused LONGCOPY define.
- removed BLI_STRUCT_OFFSET, was only used once, replce with offsetof
- formatting edits, split some macros over multiple lines.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_blenlib.h
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-10-22 03:14:19 UTC (rev 41187)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-10-22 03:39:13 UTC (rev 41188)
@@ -141,7 +141,7 @@
ccgSubSurf_setUseAgeCounts(ccgSS, 1, 8, 8, 8);
}
- ccgSubSurf_setCalcVertexNormals(ccgSS, 1, BLI_STRUCT_OFFSET(DMGridData, no));
+ ccgSubSurf_setCalcVertexNormals(ccgSS, 1, offsetof(DMGridData, no));
return ccgSS;
}
Modified: trunk/blender/source/blender/blenlib/BLI_blenlib.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_blenlib.h 2011-10-22 03:14:19 UTC (rev 41187)
+++ trunk/blender/source/blender/blenlib/BLI_blenlib.h 2011-10-22 03:39:13 UTC (rev 41188)
@@ -84,13 +84,6 @@
#include "BLI_noise.h"
-/**
- * @param strct The structure of interest
- * @param member The name of a member field of @a strct
- * @retval The offset in bytes of @a member within @a strct
- */
-#define BLI_STRUCT_OFFSET(strct, member) ((int)(intptr_t) &((strct*) 0)->member)
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-10-22 03:14:19 UTC (rev 41187)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-10-22 03:39:13 UTC (rev 41188)
@@ -67,64 +67,114 @@
#define MAX3(x,y,z) MAX2( MAX2((x),(y)) , (z) )
#define MAX4(x,y,z,a) MAX2( MAX2((x),(y)) , MAX2((z),(a)) )
-#define INIT_MINMAX(min, max) { (min)[0]= (min)[1]= (min)[2]= 1.0e30f; (max)[0]= (max)[1]= (max)[2]= -1.0e30f; }
+#define INIT_MINMAX(min, max) { \
+ (min)[0]= (min)[1]= (min)[2]= 1.0e30f; \
+ (max)[0]= (max)[1]= (max)[2]= -1.0e30f; \
+ }
+#define INIT_MINMAX2(min, max) { \
+ (min)[0]= (min)[1]= 1.0e30f; \
+ (max)[0]= (max)[1]= -1.0e30f; \
+ }
+#define DO_MIN(vec, min) { \
+ if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
+ if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
+ if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \
+ }
+#define DO_MAX(vec, max) { \
+ if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
+ if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
+ if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; \
+ }
+#define DO_MINMAX(vec, min, max) { \
+ if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
+ if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
+ if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \
+ if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
+ if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
+ if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; \
+ }
+#define DO_MINMAX2(vec, min, max) { \
+ if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
+ if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
+ if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
+ if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
+ }
-#define INIT_MINMAX2(min, max) { (min)[0]= (min)[1]= 1.0e30f; (max)[0]= (max)[1]= -1.0e30f; }
-
-#define DO_MIN(vec, min) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
- if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
- if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; } \
-
-#define DO_MAX(vec, max) { if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
- if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
- if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; } \
-
-#define DO_MINMAX(vec, min, max) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
- if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
- if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \
- if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
- if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
- if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; } \
-
-#define DO_MINMAX2(vec, min, max) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
- if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
- if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
- if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; }
-
/* some math and copy defines */
#ifndef SWAP
-# define SWAP(type, a, b) { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
+# define SWAP(type, a, b) { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
#endif
-#define ABS(a) ( (a)<0 ? (-(a)) : (a) )
+#define ABS(a) ( (a)<0 ? (-(a)) : (a) )
-#define AVG2(x, y) ( 0.5 * ((x) + (y)) )
-
#define FTOCHAR(val) ((val)<=0.0f)? 0 : (((val)>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*(val))+0.5f))
#define FTOUSHORT(val) ((val >= 1.0f-0.5f/65535)? 65535: (val <= 0.0f)? 0: (unsigned short)(val*65535.0f + 0.5f))
-#define F3TOCHAR3(v2,v1) (v1)[0]=FTOCHAR((v2[0])); (v1)[1]=FTOCHAR((v2[1])); (v1)[2]=FTOCHAR((v2[2]))
-#define F3TOCHAR4(v2,v1) { (v1)[0]=FTOCHAR((v2[0])); (v1)[1]=FTOCHAR((v2[1])); (v1)[2]=FTOCHAR((v2[2])); \
- (v1)[3] = 255; }
-#define F4TOCHAR4(v2,v1) { (v1)[0]=FTOCHAR((v2[0])); (v1)[1]=FTOCHAR((v2[1])); (v1)[2]=FTOCHAR((v2[2])); \
- (v1)[3]=FTOCHAR((v2[3])); }
+#define F3TOCHAR3(v2, v1) { \
+ (v1)[0]= FTOCHAR((v2[0])); \
+ (v1)[1]= FTOCHAR((v2[1])); \
+ (v1)[2]= FTOCHAR((v2[2])); \
+ }
+#define F3TOCHAR4(v2, v1) { \
+ (v1)[0]= FTOCHAR((v2[0])); \
+ (v1)[1]= FTOCHAR((v2[1])); \
+ (v1)[2]= FTOCHAR((v2[2])); \
+ (v1)[3]= 255; \
+ }
+#define F4TOCHAR4(v2, v1) { \
+ (v1)[0]= FTOCHAR((v2[0])); \
+ (v1)[1]= FTOCHAR((v2[1])); \
+ (v1)[2]= FTOCHAR((v2[2])); \
+ (v1)[3]= FTOCHAR((v2[3])); \
+ }
+#define VECCOPY(v1, v2) { \
+ *(v1)= *(v2); \
+ *(v1+1)= *(v2+1); \
+ *(v1+2)= *(v2+2); \
+ }
+#define VECCOPY2D(v1, v2) { \
+ *(v1)= *(v2); \
+ *(v1+1)= *(v2+1); \
+ }
+#define QUATCOPY(v1, v2) { \
+ *(v1)= *(v2); \
+ *(v1+1)= *(v2+1); \
+ *(v1+2)= *(v2+2); \
+ *(v1+3)= *(v2+3); \
+ }
+#define VECADD(v1,v2,v3) { \
+ *(v1)= *(v2) + *(v3); \
+ *(v1+1)= *(v2+1) + *(v3+1); \
+ *(v1+2)= *(v2+2) + *(v3+2); \
+ }
+#define VECSUB(v1,v2,v3) { \
+ *(v1)= *(v2) - *(v3); \
+ *(v1+1)= *(v2+1) - *(v3+1); \
+ *(v1+2)= *(v2+2) - *(v3+2); \
+ }
+#define VECSUB2D(v1,v2,v3) { \
+ *(v1)= *(v2) - *(v3); \
+ *(v1+1)= *(v2+1) - *(v3+1); \
+ }
+#define VECADDFAC(v1,v2,v3,fac) { \
+ *(v1)= *(v2) + *(v3)*(fac); \
+ *(v1+1)= *(v2+1) + *(v3+1)*(fac); \
+ *(v1+2)= *(v2+2) + *(v3+2)*(fac); \
+ }
+#define VECSUBFAC(v1,v2,v3,fac) { \
+ *(v1)= *(v2) - *(v3)*(fac); \
+ *(v1+1)= *(v2+1) - *(v3+1)*(fac); \
+ *(v1+2)= *(v2+2) - *(v3+2)*(fac); \
+ }
+#define QUATADDFAC(v1,v2,v3,fac) { \
+ *(v1)= *(v2) + *(v3)*(fac); \
+ *(v1+1)= *(v2+1) + *(v3+1)*(fac); \
+ *(v1+2)= *(v2+2) + *(v3+2)*(fac); \
+ *(v1+3)= *(v2+3) + *(v3+3)*(fac); \
+ }
+#define INPR(v1, v2) ( (v1)[0]*(v2)[0] + (v1)[1]*(v2)[1] + (v1)[2]*(v2)[2] )
-#define VECCOPY(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2);}
-#define VECCOPY2D(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1);}
-#define QUATCOPY(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2); *(v1+3)= *(v2+3);}
-#define LONGCOPY(a, b, c) {int lcpc=c, *lcpa=(int *)a, *lcpb=(int *)b; while(lcpc-->0) *(lcpa++)= *(lcpb++);}
-
-
-#define VECADD(v1,v2,v3) {*(v1)= *(v2) + *(v3); *(v1+1)= *(v2+1) + *(v3+1); *(v1+2)= *(v2+2) + *(v3+2);}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list