Revision: 57712
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57712
Author: blendix
Date: 2013-06-24 22:41:24 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
Render stats text: show elapsed time for blender internal, hide useless "Single
Layer"
at the start, more clearly indicate what the render time of the last frame was,
some
other tweaks for consistency.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp 2013-06-24
21:11:13 UTC (rev 57711)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp 2013-06-24
22:41:24 UTC (rev 57712)
@@ -616,16 +616,22 @@
get_status(status, substatus);
get_progress(progress, total_time);
- timestatus = string_printf("Mem: %.2fM, Peak: %.2fM | ", mem_used,
mem_peak);
+ timestatus = string_printf("Mem:%.2fM, Peak:%.2fM", mem_used, mem_peak);
- timestatus += b_scene.name();
- if(b_rlay_name != "")
- timestatus += ", " + b_rlay_name;
- timestatus += " | ";
+ if(background) {
+ timestatus += " | " + b_scene.name();
+ if(b_rlay_name != "")
+ timestatus += ", " + b_rlay_name;
+ }
+ else {
+ timestatus += " | ";
- BLI_timestr(total_time, time_str, sizeof(time_str));
- timestatus += "Elapsed: " + string(time_str) + " | ";
+ BLI_timestr(total_time, time_str, sizeof(time_str));
+ timestatus += "Time:" + string(time_str);
+ }
+ if(status.size() > 0)
+ status = " | " + status;
if(substatus.size() > 0)
status += " | " + substatus;
Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp 2013-06-24 21:11:13 UTC
(rev 57711)
+++ trunk/blender/intern/cycles/render/session.cpp 2013-06-24 22:41:24 UTC
(rev 57712)
@@ -791,12 +791,16 @@
else
substatus = string_printf("Path Tracing Sample %d/%d",
sample+1, tile_manager.num_samples);
- if(show_pause)
+ if(show_pause) {
status = "Paused";
- else if(show_done)
+ }
+ else if(show_done) {
status = "Done";
- else
- status = "Rendering";
+ }
+ else {
+ status = substatus;
+ substatus = "";
+ }
progress.set_status(status, substatus);
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c
2013-06-24 21:11:13 UTC (rev 57711)
+++ trunk/blender/source/blender/editors/render/render_internal.c
2013-06-24 22:41:24 UTC (rev 57712)
@@ -38,6 +38,8 @@
#include "BLI_threads.h"
#include "BLI_utildefines.h"
+#include "PIL_time.h"
+
#include "BLF_translation.h"
#include "DNA_object_types.h"
@@ -296,13 +298,38 @@
mmap_used_memory = (mmap_in_use) / (1024.0 * 1024.0);
megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
- spos += sprintf(spos, "%s | ", (scene->lay & 0xFF000000) ?
IFACE_("Localview") : IFACE_("Single Layer"));
+ /* local view */
+ if(rs->localview)
+ spos += sprintf(spos, "%s | ", IFACE_("Local View"));
+
+ /* frame number */
spos += sprintf(spos, IFACE_("Frame:%d "), (scene->r.cfra));
+ /* previous and elapsed time */
+ BLI_timestr(rs->lastframetime, info_time_str, sizeof(info_time_str));
+
+ if (rs->infostr && rs->infostr[0]) {
+ if (rs->lastframetime != 0.0)
+ spos += sprintf(spos, IFACE_("| Last:%s "),
info_time_str);
+ else
+ spos += sprintf(spos, "| ");
+
+ BLI_timestr(PIL_check_seconds_timer() - rs->starttime,
info_time_str, sizeof(info_time_str));
+ }
+ else
+ spos += sprintf(spos, "| ");
+
+ spos += sprintf(spos, IFACE_("Time:%s "), info_time_str);
+
+ /* statistics */
if (rs->statstr) {
- spos += sprintf(spos, "| %s ", rs->statstr);
+ if(rs->statstr[0])
+ spos += sprintf(spos, "| %s ", rs->statstr);
}
else {
+ if (rs->totvert || rs->totface || rs->tothalo || rs->totstrand
|| rs->totlamp)
+ spos += sprintf(spos, "| ");
+
if (rs->totvert) spos += sprintf(spos, IFACE_("Ve:%d "),
rs->totvert);
if (rs->totface) spos += sprintf(spos, IFACE_("Fa:%d "),
rs->totface);
if (rs->tothalo) spos += sprintf(spos, IFACE_("Ha:%d "),
rs->tothalo);
@@ -310,10 +337,10 @@
if (rs->totlamp) spos += sprintf(spos, IFACE_("La:%d "),
rs->totlamp);
if (rs->mem_peak == 0.0f)
- spos += sprintf(spos, IFACE_("Mem:%.2fM (%.2fM, Peak
%.2fM) "),
+ spos += sprintf(spos, IFACE_("| Mem:%.2fM (%.2fM, Peak
%.2fM) "),
megs_used_memory, mmap_used_memory,
megs_peak_memory);
else
- spos += sprintf(spos, IFACE_("Mem:%.2fM, Peak: %.2fM
"), rs->mem_used, rs->mem_peak);
+ spos += sprintf(spos, IFACE_("| Mem:%.2fM, Peak: %.2fM
"), rs->mem_used, rs->mem_peak);
if (rs->curfield)
spos += sprintf(spos, IFACE_("Field %d "),
rs->curfield);
@@ -321,12 +348,11 @@
spos += sprintf(spos, IFACE_("Blur %d "), rs->curblur);
}
- BLI_timestr(rs->lastframetime, info_time_str, sizeof(info_time_str));
- spos += sprintf(spos, IFACE_("Time:%s "), info_time_str);
-
+ /* full sample */
if (rs->curfsa)
spos += sprintf(spos, IFACE_("| Full Sample %d "), rs->curfsa);
+ /* extra info */
if (rs->infostr && rs->infostr[0])
spos += sprintf(spos, "| %s ", rs->infostr);
Modified: trunk/blender/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_pipeline.h
2013-06-24 21:11:13 UTC (rev 57711)
+++ trunk/blender/source/blender/render/extern/include/RE_pipeline.h
2013-06-24 22:41:24 UTC (rev 57712)
@@ -145,6 +145,7 @@
int cfra;
int totface, totvert, totstrand, tothalo, totlamp, totpart;
short curfield, curblur, curpart, partsdone, convertdone, curfsa;
+ bool localview;
double starttime, lastframetime;
const char *infostr, *statstr;
char scene_name[MAX_ID_NAME - 2];
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2013-06-24 21:11:13 UTC (rev 57711)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2013-06-24 22:41:24 UTC (rev 57712)
@@ -2379,6 +2379,7 @@
re->scene_color_manage =
BKE_scene_check_color_management_enabled(scene);
re->camera_override = camera_override;
re->lay = lay;
+ re->i.localview = (lay & 0xFF000000) != 0;
/* not too nice, but it survives anim-border render */
if (anim) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
