griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Little feat request: the rendertime disappeared from header after a

Browse Source 
rendering; now it's a permanent part of it.
This commit is contained in:
Ton Roosendaal
2004-06-22 12:02:19 +00:00
parent f89f32d420
commit f2be1db99d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/src/header_info.c
View File

@@ -1679,6 +1679,8 @@ static uiBlock *info_helpmenu(void *arg_unused)
}
/************************** END MAIN MENU *****************************/
/* ugly global yes, for renderwin.c to write to */
char info_time_str[32]="";
static void info_text(int x, int y)
{
@@ -1691,15 +1693,14 @@ static void info_text(int x, int y)
char *headerstr;
int hsize;
if(G.obedit) {
sprintf(infostr,"Ve:%d-%d | Fa:%d-%d | Mem:%.2fM ",
G.totvertsel, G.totvert, G.totfacesel, G.totface,
(mem_in_use>>10)/1024.0);
}
else {
sprintf(infostr,"Ve:%d | Fa:%d | Ob:%d-%d | La:%d | Mem:%.2fM | ",
G.totvert, G.totface, G.totobj, G.totobjsel, G.totlamp, (mem_in_use>>10)/1024.0);
sprintf(infostr,"Ve:%d | Fa:%d | Ob:%d-%d | La:%d | Mem:%.2fM | Time:%s | ",
G.totvert, G.totface, G.totobj, G.totobjsel, G.totlamp, (mem_in_use>>10)/1024.0, info_time_str);
}
ob= OBACT;
if(ob) {

9
source/blender/src/renderwin.c
View File

@@ -669,12 +669,13 @@ static void renderview_progress_display_cb(int y1, int y2, int w, int h, unsigne
static void printrenderinfo_cb(double time, int sample)
{
extern int mem_in_use;
extern char info_time_str[32]; // header_info.c
float megs_used_memory= mem_in_use/(1024.0*1024.0);
char str[300], tstr[32], *spos= str;
char str[300], *spos= str;
timestr(time, tstr);
timestr(time, info_time_str);
spos+= sprintf(spos, "RENDER Fra:%d Ve:%d Fa:%d La:%d", (G.scene->r.cfra), R.totvert, R.totvlak, R.totlamp);
spos+= sprintf(spos, "Mem:%.2fM Time:%s ", megs_used_memory, tstr);
spos+= sprintf(spos, "Mem:%.2fM Time:%s ", megs_used_memory, info_time_str);
if (R.r.mode & R_FIELDS) {
spos+= sprintf(spos, "Field %c ", (R.flag&R_SEC_FIELD)?'B':'A');
@@ -848,7 +849,7 @@ static void do_render(View3D *ogl_render_view3d, int anim, int force_dispwin)
G.afbreek= 0;
end_test_break_callback();
/* in dispiew it will destroy the image otherwise
window_make_active() raises window at osx and sends redraws */
if(R.displaymode==R_DISPLAYWIN) mainwindow_make_active();