diff options
-rw-r--r-- | source/blender/render/intern/source/RE_callbacks.c | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/initrender.c | 5 | ||||
-rw-r--r-- | source/blender/render/intern/source/ray.c | 14 | ||||
-rw-r--r-- | source/blender/render/intern/source/rendercore.c | 8 | ||||
-rw-r--r-- | source/blender/render/intern/source/vanillaRenderPipe.c | 5 | ||||
-rw-r--r-- | source/blender/src/renderwin.c | 7 | ||||
-rw-r--r-- | source/blender/src/usiblender.c | 2 |
7 files changed, 29 insertions, 18 deletions
diff --git a/source/blender/render/intern/source/RE_callbacks.c b/source/blender/render/intern/source/RE_callbacks.c index c0223cf4cec..c6b74867c73 100644 --- a/source/blender/render/intern/source/RE_callbacks.c +++ b/source/blender/render/intern/source/RE_callbacks.c @@ -32,6 +32,7 @@ */ #include <stdlib.h> /* for NULL??? */ +#include <stdio.h> #include "render.h" #include "render_intern.h" #include "RE_callbacks.h" @@ -104,6 +105,11 @@ void RE_local_timecursor(int i) { void RE_local_render_display(int i, int j, int k, int l, unsigned int* m) { if (RE_local_renderdisplay_function) RE_local_renderdisplay_function(i, j, k, l, m); + else { + if(j-i >= l-1) printf("\n");// full picture + else printf("\rRender %d%% ", (100*i)/l); + fflush(stdout); + } } void RE_local_init_render_display(void) { if (RE_local_initrenderdisplay_function) RE_local_initrenderdisplay_function(); diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index e282cee18c2..1b61a28af20 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -860,7 +860,10 @@ void oldRenderLoop(void) /* here the PART and FIELD loops */ R.rectot= (unsigned int *)MEM_callocN(sizeof(int)*R.rectx*R.recty, "rectot"); R.rectz = (unsigned int *)MEM_mallocN(sizeof(int)*R.rectx*R.recty, "rectz"); - if(R.r.mode & R_MBLUR) RE_local_printrenderinfo(0.0, R.osa - blur); + if(R.r.mode & R_MBLUR) { + RE_local_printrenderinfo(0.0, R.osa - blur); + if(G.background && blur<R.osa) printf("\n"); // newline for percentage print + } else RE_local_printrenderinfo(0.0, -1); /* choose render pipeline type, and whether or not to use the */ diff --git a/source/blender/render/intern/source/ray.c b/source/blender/render/intern/source/ray.c index 21e053532e2..495d8b52c12 100644 --- a/source/blender/render/intern/source/ray.c +++ b/source/blender/render/intern/source/ray.c @@ -441,12 +441,12 @@ void freeoctree(void) a++; } - -// printf("branches %d nodes %d\n", branchcount, nodecount); - printf("raycount %d \n", raycount); - printf("ray coherent %d \n", coherent_ray); -// printf("accepted %d rejected %d\n", accepted, rejected); - + if(G.f & G_DEBUG) { + printf("branches %d nodes %d\n", branchcount, nodecount); + printf("raycount %d \n", raycount); + printf("ray coherent %d \n", coherent_ray); + // printf("accepted %d rejected %d\n", accepted, rejected); + } branchcount= 0; nodecount= 0; } @@ -1447,6 +1447,7 @@ static void reflection(float *ref, float *n, float *view, float *orn) } } +#if 0 static void color_combine(float *result, float fac1, float fac2, float *col1, float *col2) { float col1t[3], col2t[3]; @@ -1465,6 +1466,7 @@ static void color_combine(float *result, float fac1, float fac2, float *col1, fl result[2]= (fac1*col1t[2] + fac2*col2t[2]); result[2]*= result[2]; } +#endif /* the main recursive tracer itself */ static void traceray(short depth, float *start, float *vec, float *col, VlakRen *vlr, int mask) diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 7b98328f99c..2a202815bbe 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -2867,7 +2867,7 @@ void zbufshadeDA(void) /* Delta Accum Pixel Struct */ Zjitx= -xd; Zjity= -yd; - RE_local_printrenderinfo(0.0, v); + if((R.r.mode & R_MBLUR)==0) RE_local_printrenderinfo(0.0, v); /* RECTDELTA */ fillrect(R.rectot,R.rectx,R.recty,0); @@ -2907,7 +2907,7 @@ void zbufshadeDA(void) /* Delta Accum Pixel Struct */ Zjitx= -xd; Zjity= -yd; RE_setwindowclip(0, 0); - RE_local_printrenderinfo(0.0, v); + if((R.r.mode & R_MBLUR)==0) RE_local_printrenderinfo(0.0, v); zbufferall(); } @@ -3018,7 +3018,7 @@ void zbufshadeDA(void) /* Delta Accum Pixel Struct */ rowbuf2= rowbuf1; rowbuf1= rb3; - if( y>0 && G.background==0) { + if( y>0) { if((y & 1)==0) { RE_local_render_display(y-2, y-1, R.rectx, R.recty, R.rectot); } @@ -3118,7 +3118,7 @@ void zbufshade(void) } scanlinesky( (char *)(rp-R.rectx), y); - if((y & 1) && G.background!=1) { + if(y & 1) { RE_local_render_display(y-1, y, R.rectx, R.recty, R.rectot); } diff --git a/source/blender/render/intern/source/vanillaRenderPipe.c b/source/blender/render/intern/source/vanillaRenderPipe.c index f585327bf60..d39f1fbac01 100644 --- a/source/blender/render/intern/source/vanillaRenderPipe.c +++ b/source/blender/render/intern/source/vanillaRenderPipe.c @@ -229,10 +229,7 @@ void zBufShadeAdvanced() renderZBufLine(y); transferColourBufferToOutput(y); - if((y & 1) && G.background!=1) RE_local_render_display(y-1, y, - imageWidth, - imageHeight, - R.rectot); + if(y & 1) RE_local_render_display(y-1, y, imageWidth, imageHeight, R.rectot); if(RE_local_test_break()) keepLooping = 0; y++; diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 3ae049e0792..1d2db07f05a 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -666,7 +666,7 @@ static void renderview_progress_display_cb(int y1, int y2, int w, int h, unsigne /* callback for print info in top header in interface */ -static void printrenderinfo_cb(double time, int sample) +static void printrenderinfo_cb(double time, int sample, int blur) { extern int mem_in_use; float megs_used_memory= mem_in_use/(1024.0*1024.0); @@ -679,8 +679,11 @@ static void printrenderinfo_cb(double time, int sample) if (R.r.mode & R_FIELDS) { spos+= sprintf(spos, "Field %c ", (R.flag&R_SEC_FIELD)?'B':'A'); } + if (blur!=-1) { + spos+= sprintf(spos, "Blur: %d ", blur); + } if (sample!=-1) { - spos+= sprintf(spos, "Sample: %d ", sample); + spos+= sprintf(spos, "Sample: %d ", sample); } screen_draw_info_text(G.curscreen, str); diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 8a1d046ca3f..a0609b9a039 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -549,7 +549,7 @@ void exit_usiblender(void) free_txt_data(); sound_exit_audio(); - MEM_freeN(G.listener); + if(G.listener) MEM_freeN(G.listener); #ifdef WITH_QUICKTIME quicktime_exit(); |