[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45302] trunk/blender/source/blender: code cleanup: use uppercase defines and change drawFCurveFade into static function.
Campbell Barton
ideasman42 at gmail.com
Sat Mar 31 06:05:12 CEST 2012
Revision: 45302
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45302
Author: campbellbarton
Date: 2012-03-31 04:04:58 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
code cleanup: use uppercase defines and change drawFCurveFade into static function.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_graph/graph_draw.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
Modified: trunk/blender/source/blender/editors/space_graph/graph_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_draw.c 2012-03-31 03:36:15 UTC (rev 45301)
+++ trunk/blender/source/blender/editors/space_graph/graph_draw.c 2012-03-31 04:04:58 UTC (rev 45302)
@@ -73,19 +73,11 @@
* drawing components for some F-Curve (fcu)
* - selected F-Curves should be more visible than partially visible ones
*/
-#define drawFCurveFade(fcu) ( ((fcu)->flag & FCURVE_SELECTED)? 1.0f : U.fcu_inactive_alpha )
+static float fcurve_display_alpha(FCurve *fcu)
+{
+ return (fcu->flag & FCURVE_SELECTED) ? 1.0f : U.fcu_inactive_alpha;
+}
-/* set the color for some point from some value given packed into an int
- * - intV: integer value containing color info packed into an int
- * - alpha: float value describing the
- */
-#define cpackA(intVC, alpha) \
- { \
- float _cpackCol[3]; \
- cpack_to_rgb(intVC, &_cpackCol[0], &_cpackCol[1], &_cpackCol[2]); \
- glColor4f(_cpackCol[0], _cpackCol[1], _cpackCol[2], alpha); \
- }
-
/* *************************** */
/* F-Curve Modifier Drawing */
@@ -263,7 +255,7 @@
static void set_fcurve_vertex_color (FCurve *fcu, short sel)
{
/* Fade the 'intensity' of the vertices based on the selection of the curves too */
- int alphaOffset= (int)((drawFCurveFade(fcu) - 1.0f) * 255);
+ int alphaOffset= (int)((fcurve_display_alpha(fcu) - 1.0f) * 255);
/* Set color of curve vertex based on state of curve (i.e. 'Edit' Mode) */
if ((fcu->flag & FCURVE_PROTECTED)==0) {
@@ -369,7 +361,7 @@
/* only draw first handle if previous segment had handles */
if ((!prevbezt && (bezt->ipo==BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo==BEZT_IPO_BEZ))) {
UI_GetThemeColor3ubv(basecol + bezt->h1, col);
- col[3]= drawFCurveFade(fcu) * 255;
+ col[3]= fcurve_display_alpha(fcu) * 255;
glColor4ubv((GLubyte *)col);
glVertex2fv(fp); glVertex2fv(fp+3);
@@ -378,7 +370,7 @@
/* only draw second handle if this segment is bezier */
if (bezt->ipo == BEZT_IPO_BEZ) {
UI_GetThemeColor3ubv(basecol + bezt->h2, col);
- col[3]= drawFCurveFade(fcu) * 255;
+ col[3]= fcurve_display_alpha(fcu) * 255;
glColor4ubv((GLubyte *)col);
glVertex2fv(fp+3); glVertex2fv(fp+6);
@@ -391,7 +383,7 @@
{
fp= bezt->vec[0];
UI_GetThemeColor3ubv(basecol + bezt->h1, col);
- col[3]= drawFCurveFade(fcu) * 255;
+ col[3]= fcurve_display_alpha(fcu) * 255;
glColor4ubv((GLubyte *)col);
glVertex2fv(fp); glVertex2fv(fp+3);
@@ -403,7 +395,7 @@
{
fp= bezt->vec[1];
UI_GetThemeColor3ubv(basecol + bezt->h2, col);
- col[3]= drawFCurveFade(fcu) * 255;
+ col[3]= fcurve_display_alpha(fcu) * 255;
glColor4ubv((GLubyte *)col);
glVertex2fv(fp); glVertex2fv(fp+3);
@@ -867,7 +859,7 @@
/* set whatever color the curve has set
* - unselected curves draw less opaque to help distinguish the selected ones
*/
- glColor4f(fcu->color[0], fcu->color[1], fcu->color[2], drawFCurveFade(fcu));
+ glColor4f(fcu->color[0], fcu->color[1], fcu->color[2], fcurve_display_alpha(fcu));
}
/* draw active F-Curve thicker than the rest to make it stand out */
Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-03-31 03:36:15 UTC (rev 45301)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-03-31 04:04:58 UTC (rev 45302)
@@ -43,7 +43,7 @@
#include "MEM_guardedalloc.h"
-#include "BLI_blenlib.h"
+#include "BLI_fileops.h"
#include "imbuf.h"
Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.c 2012-03-31 03:36:15 UTC (rev 45301)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.c 2012-03-31 04:04:58 UTC (rev 45302)
@@ -881,12 +881,12 @@
else { // rectangular
unsigned int k, Nym = Ny-1, stm = 1 << (Mx + My);
for (i=0; stm>0; i++) {
- #define pred(k) (((k & Nym) << Mx) + (k >> My))
- for (j=pred(i); j>i; j=pred(j));
+ #define PRED(k) (((k & Nym) << Mx) + (k >> My))
+ for (j=PRED(i); j>i; j=PRED(j));
if (j < i) continue;
- for (k=i, j=pred(i); j!=i; k=j, j=pred(j), stm--)
+ for (k=i, j=PRED(i); j!=i; k=j, j=PRED(j), stm--)
{ t=data[j], data[j]=data[k], data[k]=t; }
- #undef pred
+ #undef PRED
stm--;
}
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-03-31 03:36:15 UTC (rev 45301)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-03-31 04:04:58 UTC (rev 45302)
@@ -33,7 +33,7 @@
#include "node_composite_util.h"
-#define avg(a,b) ((a+b)/2)
+#define AVG(a, b) ((a + b) / 2)
/* ******************* Color Spill Supression ********************************* */
static bNodeSocketTemplate cmp_node_color_spill_in[]={
@@ -96,7 +96,7 @@
{
NodeColorspill *ncs;
ncs=node->storage;
- out[0]=in[0]-(ncs->limscale * avg(in[1], in[2]) );
+ out[0]=in[0]-(ncs->limscale * AVG(in[1], in[2]) );
}
static void do_average_spillmap_red_fac(bNode *node, float* out, float *in, float *fac)
@@ -104,14 +104,14 @@
NodeColorspill *ncs;
ncs=node->storage;
- out[0] = *fac * (in[0]-(ncs->limscale * avg(in[1], in[2]) ));
+ out[0] = *fac * (in[0]-(ncs->limscale * AVG(in[1], in[2]) ));
}
static void do_average_spillmap_green(bNode *node, float* out, float *in)
{
NodeColorspill *ncs;
ncs=node->storage;
- out[0]=in[1]-(ncs->limscale * avg(in[0], in[2]) );
+ out[0]=in[1]-(ncs->limscale * AVG(in[0], in[2]) );
}
static void do_average_spillmap_green_fac(bNode *node, float* out, float *in, float *fac)
@@ -119,14 +119,14 @@
NodeColorspill *ncs;
ncs=node->storage;
- out[0] = *fac * (in[0]-(ncs->limscale * avg(in[0], in[2]) ));
+ out[0] = *fac * (in[0]-(ncs->limscale * AVG(in[0], in[2]) ));
}
static void do_average_spillmap_blue(bNode *node, float* out, float *in)
{
NodeColorspill *ncs;
ncs=node->storage;
- out[0]=in[2]-(ncs->limscale * avg(in[0], in[1]) );
+ out[0]=in[2]-(ncs->limscale * AVG(in[0], in[1]) );
}
static void do_average_spillmap_blue_fac(bNode *node, float* out, float *in, float *fac)
@@ -134,7 +134,7 @@
NodeColorspill *ncs;
ncs=node->storage;
- out[0] = *fac * (in[0]-(ncs->limscale * avg(in[0], in[1]) ));
+ out[0] = *fac * (in[0]-(ncs->limscale * AVG(in[0], in[1]) ));
}
static void do_apply_spillmap_red(bNode *node, float* out, float *in, float *map)
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-03-31 03:36:15 UTC (rev 45301)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-03-31 04:04:58 UTC (rev 45302)
@@ -2809,36 +2809,36 @@
submodule = PyModule_Create(&BPy_BM_types_module_def);
-#define mod_type_add(s, t) \
+#define MODULE_TYPE_ADD(s, t) \
PyModule_AddObject(s, t.tp_name, (PyObject *)&t); Py_INCREF((PyObject *)&t)
/* bmesh_py_types.c */
- mod_type_add(submodule, BPy_BMesh_Type);
- mod_type_add(submodule, BPy_BMVert_Type);
- mod_type_add(submodule, BPy_BMEdge_Type);
- mod_type_add(submodule, BPy_BMFace_Type);
- mod_type_add(submodule, BPy_BMLoop_Type);
- mod_type_add(submodule, BPy_BMElemSeq_Type);
- mod_type_add(submodule, BPy_BMVertSeq_Type);
- mod_type_add(submodule, BPy_BMEdgeSeq_Type);
- mod_type_add(submodule, BPy_BMFaceSeq_Type);
- mod_type_add(submodule, BPy_BMLoopSeq_Type);
- mod_type_add(submodule, BPy_BMIter_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMesh_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMVert_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMEdge_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMFace_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLoop_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMElemSeq_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMVertSeq_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMEdgeSeq_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMFaceSeq_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLoopSeq_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMIter_Type);
/* bmesh_py_types_select.c */
- mod_type_add(submodule, BPy_BMEditSelSeq_Type);
- mod_type_add(submodule, BPy_BMEditSelIter_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMEditSelSeq_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMEditSelIter_Type);
/* bmesh_py_types_customdata.c */
- mod_type_add(submodule, BPy_BMLayerAccessVert_Type);
- mod_type_add(submodule, BPy_BMLayerAccessEdge_Type);
- mod_type_add(submodule, BPy_BMLayerAccessFace_Type);
- mod_type_add(submodule, BPy_BMLayerAccessLoop_Type);
- mod_type_add(submodule, BPy_BMLayerCollection_Type);
- mod_type_add(submodule, BPy_BMLayerItem_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLayerAccessVert_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLayerAccessEdge_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLayerAccessFace_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLayerAccessLoop_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLayerCollection_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLayerItem_Type);
/* bmesh_py_types_meshdata.c */
- mod_type_add(submodule, BPy_BMLoopUV_Type);
- mod_type_add(submodule, BPy_BMDeformVert_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMLoopUV_Type);
+ MODULE_TYPE_ADD(submodule, BPy_BMDeformVert_Type);
-#undef mod_type_add
+#undef MODULE_TYPE_ADD
return submodule;
}
Modified: trunk/blender/source/blender/render/intern/source/sunsky.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/sunsky.c 2012-03-31 03:36:15 UTC (rev 45301)
+++ trunk/blender/source/blender/render/intern/source/sunsky.c 2012-03-31 04:04:58 UTC (rev 45302)
@@ -41,30 +41,36 @@
* compute v1 = v2 op v3
* v1, v2 and v3 are vectors contains 3 float
* */
-#define vec3opv(v1, v2, op, v3) \
- v1[0] = (v2[0] op v3[0]); \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list