[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45269] trunk/blender/source/blender/ editors/render: style cleanup: render
Campbell Barton
ideasman42 at gmail.com
Fri Mar 30 00:42:38 CEST 2012
Revision: 45269
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45269
Author: campbellbarton
Date: 2012-03-29 22:42:32 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
style cleanup: render
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/render/render_view.c
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2012-03-29 22:35:12 UTC (rev 45268)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2012-03-29 22:42:32 UTC (rev 45269)
@@ -76,7 +76,7 @@
/* called inside thread! */
void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volatile rcti *renrect)
{
- float *rectf= NULL;
+ float *rectf = NULL;
int ymin, ymax, xmin, xmax;
int rymin, rxmin, predivide, profile_from;
unsigned char *rectc;
@@ -84,72 +84,72 @@
/* if renrect argument, we only refresh scanlines */
if (renrect) {
/* if ymax==recty, rendering of layer is ready, we should not draw, other things happen... */
- if (rr->renlay==NULL || renrect->ymax>=rr->recty)
+ if (rr->renlay == NULL || renrect->ymax >= rr->recty)
return;
/* xmin here is first subrect x coord, xmax defines subrect width */
xmin = renrect->xmin + rr->crop;
xmax = renrect->xmax - xmin + rr->crop;
- if (xmax<2)
+ if (xmax < 2)
return;
- ymin= renrect->ymin + rr->crop;
- ymax= renrect->ymax - ymin + rr->crop;
- if (ymax<2)
+ ymin = renrect->ymin + rr->crop;
+ ymax = renrect->ymax - ymin + rr->crop;
+ if (ymax < 2)
return;
renrect->ymin = renrect->ymax;
}
else {
xmin = ymin = rr->crop;
- xmax = rr->rectx - 2*rr->crop;
- ymax = rr->recty - 2*rr->crop;
+ xmax = rr->rectx - 2 * rr->crop;
+ ymax = rr->recty - 2 * rr->crop;
}
/* xmin ymin is in tile coords. transform to ibuf */
- rxmin= rr->tilerect.xmin + xmin;
+ rxmin = rr->tilerect.xmin + xmin;
if (rxmin >= ibuf->x) return;
- rymin= rr->tilerect.ymin + ymin;
+ rymin = rr->tilerect.ymin + ymin;
if (rymin >= ibuf->y) return;
if (rxmin + xmax > ibuf->x)
- xmax= ibuf->x - rxmin;
+ xmax = ibuf->x - rxmin;
if (rymin + ymax > ibuf->y)
- ymax= ibuf->y - rymin;
+ ymax = ibuf->y - rymin;
if (xmax < 1 || ymax < 1) return;
/* find current float rect for display, first case is after composite... still weak */
if (rr->rectf)
- rectf= rr->rectf;
+ rectf = rr->rectf;
else {
if (rr->rect32)
return;
else {
- if (rr->renlay==NULL || rr->renlay->rectf==NULL) return;
- rectf= rr->renlay->rectf;
+ if (rr->renlay == NULL || rr->renlay->rectf == NULL) return;
+ rectf = rr->renlay->rectf;
}
}
- if (rectf==NULL) return;
+ if (rectf == NULL) return;
- if (ibuf->rect==NULL)
+ if (ibuf->rect == NULL)
imb_addrectImBuf(ibuf);
- rectf+= 4*(rr->rectx*ymin + xmin);
- rectc= (unsigned char*)(ibuf->rect + ibuf->x*rymin + rxmin);
+ rectf += 4 * (rr->rectx * ymin + xmin);
+ rectc = (unsigned char *)(ibuf->rect + ibuf->x * rymin + rxmin);
if (scene && (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)) {
- profile_from= IB_PROFILE_LINEAR_RGB;
- predivide= (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
+ profile_from = IB_PROFILE_LINEAR_RGB;
+ predivide = (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
}
else {
- profile_from= IB_PROFILE_SRGB;
- predivide= 0;
+ profile_from = IB_PROFILE_SRGB;
+ predivide = 0;
}
IMB_buffer_byte_from_float(rectc, rectf,
- 4, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
- xmax, ymax, ibuf->x, rr->rectx);
+ 4, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
+ xmax, ymax, ibuf->x, rr->rectx);
}
/* ****************************** render invoking ***************** */
@@ -162,14 +162,14 @@
/* single layer re-render */
if (RNA_struct_property_is_set(op->ptr, "scene")) {
Scene *scn;
- char scene_name[MAX_ID_NAME-2];
+ char scene_name[MAX_ID_NAME - 2];
RNA_string_get(op->ptr, "scene", scene_name);
scn = (Scene *)BLI_findstring(&mainp->scene, scene_name, offsetof(ID, name) + 2);
if (scn) {
/* camera switch wont have updated */
- scn->r.cfra= (*scene)->r.cfra;
+ scn->r.cfra = (*scene)->r.cfra;
scene_camera_switch_update(scn);
*scene = scn;
@@ -191,16 +191,16 @@
/* executes blocking render */
static int screen_render_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
- SceneRenderLayer *srl= NULL;
+ Scene *scene = CTX_data_scene(C);
+ SceneRenderLayer *srl = NULL;
Render *re;
Image *ima;
- View3D *v3d= CTX_wm_view3d(C);
- Main *mainp= CTX_data_main(C);
+ View3D *v3d = CTX_wm_view3d(C);
+ Main *mainp = CTX_data_main(C);
unsigned int lay;
- const short is_animation= RNA_boolean_get(op->ptr, "animation");
- const short is_write_still= RNA_boolean_get(op->ptr, "write_still");
- struct Object *camera_override= v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
+ const short is_animation = RNA_boolean_get(op->ptr, "animation");
+ const short is_write_still = RNA_boolean_get(op->ptr, "write_still");
+ struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
/* custom scene and single layer re-render */
screen_render_scene_layer_set(op, mainp, &scene, &srl);
@@ -210,20 +210,20 @@
return OPERATOR_CANCELLED;
}
- re= RE_NewRender(scene->id.name);
- lay= (v3d)? v3d->lay: scene->lay;
+ re = RE_NewRender(scene->id.name);
+ lay = (v3d) ? v3d->lay : scene->lay;
- G.afbreek= 0;
- RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
+ G.afbreek = 0;
+ RE_test_break_cb(re, NULL, (int (*)(void *))blender_test_break);
- ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
+ ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
BKE_image_backup_render(scene, ima);
/* cleanup sequencer caches before starting user triggered render.
- * otherwise, invalidated cache entries can make their way into
- * the output rendering. We can't put that into RE_BlenderFrame,
- * since sequence rendering can call that recursively... (peter) */
+ * otherwise, invalidated cache entries can make their way into
+ * the output rendering. We can't put that into RE_BlenderFrame,
+ * since sequence rendering can call that recursively... (peter) */
seq_stripelem_cache_cleanup();
RE_SetReports(re, op->reports);
@@ -238,7 +238,7 @@
// no redraw needed, we leave state as we entered it
ED_update_for_newframe(mainp, scene, CTX_wm_screen(C), 1);
- WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
return OPERATOR_FINISHED;
}
@@ -262,7 +262,7 @@
static void render_freejob(void *rjv)
{
- RenderJob *rj= rjv;
+ RenderJob *rj = rjv;
MEM_freeN(rj);
}
@@ -270,53 +270,53 @@
/* str is IMA_MAX_RENDER_TEXT in size */
static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
{
- char info_time_str[32]; // used to be extern to header_info.c
+ char info_time_str[32]; // used to be extern to header_info.c
uintptr_t mem_in_use, mmap_in_use, peak_memory;
float megs_used_memory, mmap_used_memory, megs_peak_memory;
- char *spos= str;
+ char *spos = str;
- mem_in_use= MEM_get_memory_in_use();
- mmap_in_use= MEM_get_mapped_memory_in_use();
+ mem_in_use = MEM_get_memory_in_use();
+ mmap_in_use = MEM_get_mapped_memory_in_use();
peak_memory = MEM_get_peak_memory();
- megs_used_memory= (mem_in_use-mmap_in_use)/(1024.0*1024.0);
- mmap_used_memory= (mmap_in_use)/(1024.0*1024.0);
- megs_peak_memory = (peak_memory)/(1024.0*1024.0);
+ megs_used_memory = (mem_in_use - mmap_in_use) / (1024.0 * 1024.0);
+ mmap_used_memory = (mmap_in_use) / (1024.0 * 1024.0);
+ megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
if (scene->lay & 0xFF000000)
- spos+= sprintf(spos, "Localview | ");
+ spos += sprintf(spos, "Localview | ");
else if (scene->r.scemode & R_SINGLE_LAYER)
- spos+= sprintf(spos, "Single Layer | ");
+ spos += sprintf(spos, "Single Layer | ");
if (rs->statstr) {
- spos+= sprintf(spos, "%s ", rs->statstr);
+ spos += sprintf(spos, "%s ", rs->statstr);
}
else {
- spos+= sprintf(spos, "Fra:%d ", (scene->r.cfra));
- if (rs->totvert) spos+= sprintf(spos, "Ve:%d ", rs->totvert);
- if (rs->totface) spos+= sprintf(spos, "Fa:%d ", rs->totface);
- if (rs->tothalo) spos+= sprintf(spos, "Ha:%d ", rs->tothalo);
- if (rs->totstrand) spos+= sprintf(spos, "St:%d ", rs->totstrand);
- if (rs->totlamp) spos+= sprintf(spos, "La:%d ", rs->totlamp);
- spos+= sprintf(spos, "Mem:%.2fM (%.2fM, peak %.2fM) ", megs_used_memory, mmap_used_memory, megs_peak_memory);
+ spos += sprintf(spos, "Fra:%d ", (scene->r.cfra));
+ if (rs->totvert) spos += sprintf(spos, "Ve:%d ", rs->totvert);
+ if (rs->totface) spos += sprintf(spos, "Fa:%d ", rs->totface);
+ if (rs->tothalo) spos += sprintf(spos, "Ha:%d ", rs->tothalo);
+ if (rs->totstrand) spos += sprintf(spos, "St:%d ", rs->totstrand);
+ if (rs->totlamp) spos += sprintf(spos, "La:%d ", rs->totlamp);
+ spos += sprintf(spos, "Mem:%.2fM (%.2fM, peak %.2fM) ", megs_used_memory, mmap_used_memory, megs_peak_memory);
if (rs->curfield)
- spos+= sprintf(spos, "Field %d ", rs->curfield);
+ spos += sprintf(spos, "Field %d ", rs->curfield);
if (rs->curblur)
- spos+= sprintf(spos, "Blur %d ", rs->curblur);
+ spos += sprintf(spos, "Blur %d ", rs->curblur);
}
BLI_timestr(rs->lastframetime, info_time_str);
- spos+= sprintf(spos, "Time:%s ", info_time_str);
+ spos += sprintf(spos, "Time:%s ", info_time_str);
if (rs->curfsa)
- spos+= sprintf(spos, "| Full Sample %d ", rs->curfsa);
+ spos += sprintf(spos, "| Full Sample %d ", rs->curfsa);
if (rs->infostr && rs->infostr[0])
- spos+= sprintf(spos, "| %s ", rs->infostr);
+ spos += sprintf(spos, "| %s ", rs->infostr);
/* very weak... but 512 characters is quite safe */
- if (spos >= str+IMA_MAX_RENDER_TEXT)
+ if (spos >= str + IMA_MAX_RENDER_TEXT)
if (G.f & G_DEBUG)
printf("WARNING! renderwin text beyond limit \n");
@@ -324,15 +324,15 @@
static void image_renderinfo_cb(void *rjv, RenderStats *rs)
{
- RenderJob *rj= rjv;
+ RenderJob *rj = rjv;
RenderResult *rr;
- rr= RE_AcquireResultRead(rj->re);
+ rr = RE_AcquireResultRead(rj->re);
if (rr) {
/* malloc OK here, stats_draw is not in tile threads */
- if (rr->text==NULL)
- rr->text= MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext");
+ if (rr->text == NULL)
+ rr->text = MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext");
make_renderinfo_string(rs, rj->scene, rr->text);
}
@@ -340,26 +340,26 @@
RE_ReleaseResult(rj->re);
/* make jobs timer to send notifier */
- *(rj->do_update)= 1;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list