Page MenuHome
Differential D2214 Diff 7897 intern/cycles/app/cycles_standalone.cpp

Changeset View

Standalone View

View Options

intern/cycles/app/cycles_standalone.cpp

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Lines for(int i = len; i < maxlen; i++)
printf(" "); printf(" ");
/* flush because we don't write an end of line */ /* flush because we don't write an end of line */
fflush(stdout); fflush(stdout);
} }
static void session_print_status() static void session_print_status()
{ {
int sample, tile;
double total_time, sample_time, render_time;
string status, substatus; string status, substatus;
/* get status */ /* get status */
sample = options.session->progress.get_sample(); float progress = options.session->progress.get_progress();
options.session->progress.get_tile(tile, total_time, sample_time, render_time);
options.session->progress.get_status(status, substatus); options.session->progress.get_status(status, substatus);
if(substatus != "") if(substatus != "")
status += ": " + substatus; status += ": " + substatus;
/* print status */ /* print status */
status = string_printf("Sample %d %s", sample, status.c_str()); status = string_printf("Progress %05.2f %s", (double) progress*100, status.c_str());
brechtUnsubmitted
Not Done
Inline Actions

Might as well remove uncommented code here and in other places.

brecht: Might as well remove uncommented code here and in other places.
session_print(status); session_print(status);
} }
static BufferParams& session_buffer_params() static BufferParams& session_buffer_params()
{ {
static BufferParams buffer_params; static BufferParams buffer_params;
buffer_params.width = options.width; buffer_params.width = options.width;
buffer_params.height = options.height; buffer_params.height = options.height;
▲ Show 20 Lines • Show All 65 Lines • ▼ Show 20 Linesstatic void display_info(Progress& progress)
static double latency = 0.0; static double latency = 0.0;
static double last = 0; static double last = 0;
double elapsed = time_dt(); double elapsed = time_dt();
string str, interactive; string str, interactive;
latency = (elapsed - last); latency = (elapsed - last);
last = elapsed; last = elapsed;
int sample, tile; double total_time, sample_time;
double total_time, sample_time, render_time;
string status, substatus; string status, substatus;
sample = progress.get_sample(); progress.get_time(total_time, sample_time);
progress.get_tile(tile, total_time, sample_time, render_time);
progress.get_status(status, substatus); progress.get_status(status, substatus);
float progress_val = progress.get_progress();
if(substatus != "") if(substatus != "")
status += ": " + substatus; status += ": " + substatus;
interactive = options.interactive? "On":"Off"; interactive = options.interactive? "On":"Off";
str = string_printf( str = string_printf(
"%s" "%s"
" Time: %.2f" " Time: %.2f"
" Latency: %.4f" " Latency: %.4f"
" Sample: %d" " Progress: %05.2f"
" Average: %.4f" " Average: %.4f"
" Interactive: %s", " Interactive: %s",
status.c_str(), total_time, latency, sample, sample_time, interactive.c_str()); status.c_str(), total_time, latency, (double) progress_val*100, sample_time, interactive.c_str());
view_display_info(str.c_str()); view_display_info(str.c_str());
if(options.show_help) if(options.show_help)
view_display_help(); view_display_help();
} }
static void display() static void display()
▲ Show 20 Lines • Show All 310 Lines • Show Last 20 Lines