Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-24 06:51:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-24 06:51:46 +0400
commit2f348d8b5d7d897ad44d192a2fd5f2b99b906c76 (patch)
tree1b2612031fd1cb0e521c2e0e444e7b0bd2b77646 /source/blender/render
parentd6fd5266d0514e6d31fd0e11aab5322846d78589 (diff)
style cleanup: mainly for mesh code, also some WM function use.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/external_engine.c8
-rw-r--r--source/blender/render/intern/source/imagetexture.c76
-rw-r--r--source/blender/render/intern/source/initrender.c12
-rw-r--r--source/blender/render/intern/source/pipeline.c40
-rw-r--r--source/blender/render/intern/source/render_result.c10
-rw-r--r--source/blender/render/intern/source/rendercore.c14
-rw-r--r--source/blender/render/intern/source/shadbuf.c48
-rw-r--r--source/blender/render/intern/source/zbuf.c12
8 files changed, 110 insertions, 110 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 3aa69171aa5..6e2d33cdf10 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -166,10 +166,10 @@ RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w,
h= re->result->recty - y;
/* allocate a render result */
- disprect.xmin= x;
- disprect.xmax= x+w;
- disprect.ymin= y;
- disprect.ymax= y+h;
+ disprect.xmin = x;
+ disprect.xmax = x+w;
+ disprect.ymin = y;
+ disprect.ymax = y+h;
result= render_result_new(re, &disprect, 0, RR_USE_MEM);
BLI_addtail(&engine->fullresult, result);
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index 0d509e64eaa..bbca11e09fd 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -306,18 +306,18 @@ static void clipx_rctf_swap(rctf *stack, short *count, float x1, float x2)
rf->xmax+= (x2-x1);
}
else {
- if(rf->xmax>x2) rf->xmax= x2;
+ if(rf->xmax>x2) rf->xmax = x2;
newrct= stack+ *count;
(*count)++;
- newrct->xmax= x2;
- newrct->xmin= rf->xmin+(x2-x1);
- newrct->ymin= rf->ymin;
- newrct->ymax= rf->ymax;
+ newrct->xmax = x2;
+ newrct->xmin = rf->xmin+(x2-x1);
+ newrct->ymin = rf->ymin;
+ newrct->ymax = rf->ymax;
- if(newrct->xmin==newrct->xmax) (*count)--;
+ if(newrct->xmin ==newrct->xmax) (*count)--;
- rf->xmin= x1;
+ rf->xmin = x1;
}
}
else if(rf->xmax>x2) {
@@ -326,18 +326,18 @@ static void clipx_rctf_swap(rctf *stack, short *count, float x1, float x2)
rf->xmax-= (x2-x1);
}
else {
- if(rf->xmin<x1) rf->xmin= x1;
+ if(rf->xmin<x1) rf->xmin = x1;
newrct= stack+ *count;
(*count)++;
- newrct->xmin= x1;
- newrct->xmax= rf->xmax-(x2-x1);
- newrct->ymin= rf->ymin;
- newrct->ymax= rf->ymax;
+ newrct->xmin = x1;
+ newrct->xmax = rf->xmax-(x2-x1);
+ newrct->ymin = rf->ymin;
+ newrct->ymax = rf->ymax;
- if(newrct->xmin==newrct->xmax) (*count)--;
+ if(newrct->xmin ==newrct->xmax) (*count)--;
- rf->xmax= x2;
+ rf->xmax = x2;
}
}
rf++;
@@ -359,18 +359,18 @@ static void clipy_rctf_swap(rctf *stack, short *count, float y1, float y2)
rf->ymax+= (y2-y1);
}
else {
- if(rf->ymax>y2) rf->ymax= y2;
+ if(rf->ymax>y2) rf->ymax = y2;
newrct= stack+ *count;
(*count)++;
- newrct->ymax= y2;
- newrct->ymin= rf->ymin+(y2-y1);
- newrct->xmin= rf->xmin;
- newrct->xmax= rf->xmax;
+ newrct->ymax = y2;
+ newrct->ymin = rf->ymin+(y2-y1);
+ newrct->xmin = rf->xmin;
+ newrct->xmax = rf->xmax;
if(newrct->ymin==newrct->ymax) (*count)--;
- rf->ymin= y1;
+ rf->ymin = y1;
}
}
else if(rf->ymax>y2) {
@@ -379,18 +379,18 @@ static void clipy_rctf_swap(rctf *stack, short *count, float y1, float y2)
rf->ymax-= (y2-y1);
}
else {
- if(rf->ymin<y1) rf->ymin= y1;
+ if(rf->ymin<y1) rf->ymin = y1;
newrct= stack+ *count;
(*count)++;
- newrct->ymin= y1;
- newrct->ymax= rf->ymax-(y2-y1);
- newrct->xmin= rf->xmin;
- newrct->xmax= rf->xmax;
+ newrct->ymin = y1;
+ newrct->ymax = rf->ymax-(y2-y1);
+ newrct->xmin = rf->xmin;
+ newrct->xmax = rf->xmax;
if(newrct->ymin==newrct->ymax) (*count)--;
- rf->ymax= y2;
+ rf->ymax = y2;
}
}
rf++;
@@ -413,10 +413,10 @@ static float clipx_rctf(rctf *rf, float x1, float x2)
size= rf->xmax - rf->xmin;
if(rf->xmin<x1) {
- rf->xmin= x1;
+ rf->xmin = x1;
}
if(rf->xmax>x2) {
- rf->xmax= x2;
+ rf->xmax = x2;
}
if(rf->xmin > rf->xmax) {
rf->xmin = rf->xmax;
@@ -435,10 +435,10 @@ static float clipy_rctf(rctf *rf, float y1, float y2)
size= rf->ymax - rf->ymin;
if(rf->ymin<y1) {
- rf->ymin= y1;
+ rf->ymin = y1;
}
if(rf->ymax>y2) {
- rf->ymax= y2;
+ rf->ymax = y2;
}
if(rf->ymin > rf->ymax) {
@@ -552,10 +552,10 @@ static void boxsample(ImBuf *ibuf, float minx, float miny, float maxx, float max
short count=1;
rf= stack;
- rf->xmin= minx*(ibuf->x);
- rf->xmax= maxx*(ibuf->x);
- rf->ymin= miny*(ibuf->y);
- rf->ymax= maxy*(ibuf->y);
+ rf->xmin = minx*(ibuf->x);
+ rf->xmax = maxx*(ibuf->x);
+ rf->ymin = miny*(ibuf->y);
+ rf->ymax = maxy*(ibuf->y);
texr.talpha= texres->talpha; /* is read by boxsample_clip */
@@ -979,10 +979,10 @@ static void alpha_clip_aniso(ImBuf *ibuf, float minx, float miny, float maxx, fl
// if this is actually correct for the all the filtering algorithms ..
if(!(extflag == TXC_REPT || extflag == TXC_EXTD)) {
- rf.xmin= minx*(ibuf->x);
- rf.xmax= maxx*(ibuf->x);
- rf.ymin= miny*(ibuf->y);
- rf.ymax= maxy*(ibuf->y);
+ rf.xmin = minx*(ibuf->x);
+ rf.xmax = maxx*(ibuf->x);
+ rf.ymin = miny*(ibuf->y);
+ rf.ymax = maxy*(ibuf->y);
alphaclip = clipx_rctf(&rf, 0.0, (float)(ibuf->x));
alphaclip*= clipy_rctf(&rf, 0.0, (float)(ibuf->y));
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index b7254cd1221..9b68d28e0cf 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -594,23 +594,23 @@ void initparts(Render *re)
xd= (nr % xparts);
yd= (nr-xd)/xparts;
- disprect.xmin= xminb+ xd*partx;
- disprect.ymin= yminb+ yd*party;
+ disprect.xmin = xminb+ xd*partx;
+ disprect.ymin = yminb+ yd*party;
/* ensure we cover the entire picture, so last parts go to end */
if(xd<xparts-1) {
- disprect.xmax= disprect.xmin + partx;
+ disprect.xmax = disprect.xmin + partx;
if(disprect.xmax > xmaxb)
disprect.xmax = xmaxb;
}
- else disprect.xmax= xmaxb;
+ else disprect.xmax = xmaxb;
if(yd<yparts-1) {
- disprect.ymax= disprect.ymin + party;
+ disprect.ymax = disprect.ymin + party;
if(disprect.ymax > ymaxb)
disprect.ymax = ymaxb;
}
- else disprect.ymax= ymaxb;
+ else disprect.ymax = ymaxb;
rectx= disprect.xmax - disprect.xmin;
recty= disprect.ymax - disprect.ymin;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index da4950fae24..b2092f94af8 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -430,9 +430,9 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *
re->recty= disprect->ymax-disprect->ymin;
}
else {
- re->disprect.xmin= re->disprect.ymin= 0;
- re->disprect.xmax= winx;
- re->disprect.ymax= winy;
+ re->disprect.xmin = re->disprect.ymin = 0;
+ re->disprect.xmax = winx;
+ re->disprect.ymax = winy;
re->rectx= winx;
re->recty= winy;
}
@@ -1209,9 +1209,9 @@ static void do_render_fields_blur_3d(Render *re)
/* this copying sequence could become function? */
/* weak is: it chances disprect from border */
- re->disprect.xmin= re->disprect.ymin= 0;
- re->disprect.xmax= re->winx;
- re->disprect.ymax= re->winy;
+ re->disprect.xmin = re->disprect.ymin = 0;
+ re->disprect.xmax = re->winx;
+ re->disprect.ymax = re->winy;
re->rectx= re->winx;
re->recty= re->winy;
@@ -1928,16 +1928,16 @@ static int render_initialize_from_main(Render *re, Main *bmain, Scene *scene, Sc
/* we always render smaller part, inserting it in larger image is compositor bizz, it uses disprect for it */
if(scene->r.mode & R_BORDER) {
- disprect.xmin= scene->r.border.xmin*winx;
- disprect.xmax= scene->r.border.xmax*winx;
+ disprect.xmin = scene->r.border.xmin*winx;
+ disprect.xmax = scene->r.border.xmax*winx;
- disprect.ymin= scene->r.border.ymin*winy;
- disprect.ymax= scene->r.border.ymax*winy;
+ disprect.ymin = scene->r.border.ymin*winy;
+ disprect.ymax = scene->r.border.ymax*winy;
}
else {
- disprect.xmin= disprect.ymin= 0;
- disprect.xmax= winx;
- disprect.ymax= winy;
+ disprect.xmin = disprect.ymin = 0;
+ disprect.xmax = winx;
+ disprect.ymax = winy;
}
re->main= bmain;
@@ -2282,16 +2282,16 @@ int RE_ReadRenderResult(Scene *scene, Scene *scenode)
/* only in movie case we render smaller part */
if(scene->r.mode & R_BORDER) {
- disprect.xmin= scene->r.border.xmin*winx;
- disprect.xmax= scene->r.border.xmax*winx;
+ disprect.xmin = scene->r.border.xmin*winx;
+ disprect.xmax = scene->r.border.xmax*winx;
- disprect.ymin= scene->r.border.ymin*winy;
- disprect.ymax= scene->r.border.ymax*winy;
+ disprect.ymin = scene->r.border.ymin*winy;
+ disprect.ymax = scene->r.border.ymax*winy;
}
else {
- disprect.xmin= disprect.ymin= 0;
- disprect.xmax= winx;
- disprect.ymax= winy;
+ disprect.xmin = disprect.ymin = 0;
+ disprect.xmax = winx;
+ disprect.ymax = winy;
}
if(scenode)
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index f9ceaa63fc1..2cf5346fdd7 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -430,15 +430,15 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
rr= MEM_callocN(sizeof(RenderResult), "new render result");
rr->rectx= rectx;
rr->recty= recty;
- rr->renrect.xmin= 0; rr->renrect.xmax= rectx-2*crop;
+ rr->renrect.xmin = 0; rr->renrect.xmax = rectx-2*crop;
/* crop is one or two extra pixels rendered for filtering, is used for merging and display too */
rr->crop= crop;
/* tilerect is relative coordinates within render disprect. do not subtract crop yet */
- rr->tilerect.xmin= partrct->xmin - re->disprect.xmin;
- rr->tilerect.xmax= partrct->xmax - re->disprect.xmax;
- rr->tilerect.ymin= partrct->ymin - re->disprect.ymin;
- rr->tilerect.ymax= partrct->ymax - re->disprect.ymax;
+ rr->tilerect.xmin = partrct->xmin - re->disprect.xmin;
+ rr->tilerect.xmax = partrct->xmax - re->disprect.xmax;
+ rr->tilerect.ymin = partrct->ymin - re->disprect.ymin;
+ rr->tilerect.ymax = partrct->ymax - re->disprect.ymax;
if(savebuffers) {
rr->exrhandle= IMB_exr_get_handle();
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 28988af64c4..da598cb4733 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -832,8 +832,8 @@ static void shadeDA_tile(RenderPart *pa, RenderLayer *rl)
}
/* scanline updates have to be 2 lines behind */
- rr->renrect.ymin= 0;
- rr->renrect.ymax= -2*crop;
+ rr->renrect.ymin = 0;
+ rr->renrect.ymax = -2*crop;
rr->renlay= rl;
for(y=pa->disprect.ymin+crop; y<pa->disprect.ymax-crop; y++, rr->renrect.ymax++) {
@@ -1293,7 +1293,7 @@ void zbufshadeDA_tile(RenderPart *pa)
MEM_freeN(pa->rectz); pa->rectz= NULL;
/* display active layer */
- rr->renrect.ymin=rr->renrect.ymax= 0;
+ rr->renrect.ymin=rr->renrect.ymax = 0;
rr->renlay= render_get_active_layer(&R, rr);
}
@@ -1339,7 +1339,7 @@ void zbufshade_tile(RenderPart *pa)
}
/* initialize scanline updates for main thread */
- rr->renrect.ymin= 0;
+ rr->renrect.ymin = 0;
rr->renlay= rl;
if(rl->layflag & SCE_LAY_SOLID) {
@@ -1448,7 +1448,7 @@ void zbufshade_tile(RenderPart *pa)
}
/* display active layer */
- rr->renrect.ymin=rr->renrect.ymax= 0;
+ rr->renrect.ymin=rr->renrect.ymax = 0;
rr->renlay= render_get_active_layer(&R, rr);
MEM_freeN(pa->recto); pa->recto= NULL;
@@ -1674,7 +1674,7 @@ void zbufshade_sss_tile(RenderPart *pa)
if(display) {
/* initialize scanline updates for main thread */
- rr->renrect.ymin= 0;
+ rr->renrect.ymin = 0;
rr->renlay= rl;
}
@@ -1784,7 +1784,7 @@ void zbufshade_sss_tile(RenderPart *pa)
if(display) {
/* display active layer */
- rr->renrect.ymin=rr->renrect.ymax= 0;
+ rr->renrect.ymin=rr->renrect.ymax = 0;
rr->renlay= render_get_active_layer(&R, rr);
}
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index 3ef62f7b383..49e331cc44c 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -1462,10 +1462,10 @@ typedef struct BSPFace {
/* boxes are in lamp projection */
static void init_box(Boxf *box)
{
- box->xmin= 1000000.0f;
- box->xmax= 0;
- box->ymin= 1000000.0f;
- box->ymax= 0;
+ box->xmin = 1000000.0f;
+ box->xmax = 0;
+ box->ymin = 1000000.0f;
+ box->ymax = 0;
box->zmin= 0x7FFFFFFF;
box->zmax= - 0x7FFFFFFF;
}
@@ -1473,10 +1473,10 @@ static void init_box(Boxf *box)
/* use v1 to calculate boundbox */
static void bound_boxf(Boxf *box, const float v1[3])
{
- if(v1[0] < box->xmin) box->xmin= v1[0];
- if(v1[0] > box->xmax) box->xmax= v1[0];
- if(v1[1] < box->ymin) box->ymin= v1[1];
- if(v1[1] > box->ymax) box->ymax= v1[1];
+ if(v1[0] < box->xmin) box->xmin = v1[0];
+ if(v1[0] > box->xmax) box->xmax = v1[0];
+ if(v1[1] < box->ymin) box->ymin = v1[1];
+ if(v1[1] > box->ymax) box->ymax = v1[1];
if(v1[2] < box->zmin) box->zmin= v1[2];
if(v1[2] > box->zmax) box->zmax= v1[2];
}
@@ -1484,10 +1484,10 @@ static void bound_boxf(Boxf *box, const float v1[3])
/* use v1 to calculate boundbox */
static void bound_rectf(rctf *box, const float v1[2])
{
- if(v1[0] < box->xmin) box->xmin= v1[0];
- if(v1[0] > box->xmax) box->xmax= v1[0];
- if(v1[1] < box->ymin) box->ymin= v1[1];
- if(v1[1] > box->ymax) box->ymax= v1[1];
+ if(v1[0] < box->xmin) box->xmin = v1[0];
+ if(v1[0] > box->xmax) box->xmax = v1[0];
+ if(v1[1] < box->ymin) box->ymin = v1[1];
+ if(v1[1] > box->ymax) box->ymax = v1[1];
}
@@ -1517,12 +1517,12 @@ static void isb_bsp_split_init(ISBBranch *root, MemArena *mem, int level)
left->box= root->box;
right->box= root->box;
if(i==0) {
- left->box.xmax= root->divider[0];
- right->box.xmin= root->divider[0];
+ left->box.xmax = root->divider[0];
+ right->box.xmin = root->divider[0];
}
else {
- left->box.ymax= root->divider[1];
- right->box.ymin= root->divider[1];
+ left->box.ymax = root->divider[1];
+ right->box.ymin = root->divider[1];
}
isb_bsp_split_init(left, mem, level-1);
isb_bsp_split_init(right, mem, level-1);
@@ -1591,12 +1591,12 @@ static void isb_bsp_split(ISBBranch *root, MemArena *mem)
left->box= root->box;
right->box= root->box;
if(i==0) {
- left->box.xmax= root->divider[0];
- right->box.xmin= root->divider[0];
+ left->box.xmax = root->divider[0];
+ right->box.xmin = root->divider[0];
}
else {
- left->box.ymax= root->divider[1];
- right->box.ymin= root->divider[1];
+ left->box.ymax = root->divider[1];
+ right->box.ymin = root->divider[1];
}
}
@@ -2224,8 +2224,8 @@ static void isb_make_buffer(RenderPart *pa, LampRen *lar)
/* setup bsp root */
memset(&root, 0, sizeof(ISBBranch));
- root.box.xmin= (float)shb->size;
- root.box.ymin= (float)shb->size;
+ root.box.xmin = (float)shb->size;
+ root.box.ymin = (float)shb->size;
/* create the sample buffers */
for(sindex=0, y=0; y<pa->recty; y++) {
@@ -2428,8 +2428,8 @@ static void isb_make_buffer_transp(RenderPart *pa, APixstr *apixbuf, LampRen *la
/* setup bsp root */
memset(&root, 0, sizeof(ISBBranch));
- root.box.xmin= (float)shb->size;
- root.box.ymin= (float)shb->size;
+ root.box.xmin = (float)shb->size;
+ root.box.ymin = (float)shb->size;
/* create the sample buffers */
for(ap= apixbuf, sindex=0, y=0; y<pa->recty; y++) {
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index d5ed5c7a824..46520001d2d 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -3449,10 +3449,10 @@ void zbuffer_abuf_shadow(Render *re, LampRen *lar, float winmat[][4], APixstr *A
memset(&pa, 0, sizeof(RenderPart));
pa.rectx= size;
pa.recty= size;
- pa.disprect.xmin= 0;
- pa.disprect.ymin= 0;
- pa.disprect.xmax= size;
- pa.disprect.ymax= size;
+ pa.disprect.xmin = 0;
+ pa.disprect.ymin = 0;
+ pa.disprect.xmax = size;
+ pa.disprect.ymax = size;
zbuffer_abuf(re, &pa, APixbuf, apsmbase, lay, 0, winmat, size, size, samples, jit, 1.0f, 1);
if(APixbufstrand)
@@ -4034,8 +4034,8 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas
}
/* init scanline updates */
- rr->renrect.ymin= 0;
- rr->renrect.ymax= -pa->crop;
+ rr->renrect.ymin = 0;
+ rr->renrect.ymax = -pa->crop;
rr->renlay= rl;
/* render the tile */