diff options
author | Thomas Dinges <blender@dingto.org> | 2014-01-24 15:57:19 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-01-24 15:59:15 +0400 |
commit | 544b7e6be42cda0f07fb83590a089a516bd6cfec (patch) | |
tree | 8a3fe1ca417c9ed04231cc67ea034d326789c38e /intern/cycles/app | |
parent | 456dc16e4a191c4cf101e62a22bf91046ed07e06 (diff) |
Cycles Standalone: Add a help message, which appears when pressing the "h" key.
This is very basic for now, but can be extended with more info (available devices for example) later.
Thanks to Bastien and Sergey for some help with the glRect coordinates stuff.
Diffstat (limited to 'intern/cycles/app')
-rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 6b201017c46..0993b0d4f55 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -45,7 +45,7 @@ struct Options { int width, height; SceneParams scene_params; SessionParams session_params; - bool quiet; + bool quiet, show_help; } options; static void session_print(const string& str) @@ -167,6 +167,9 @@ static void display_info(Progress& progress) latency, sample, total_time, sample_time, status.c_str()); view_display_info(str.c_str()); + + if(options.show_help) + view_display_help(); } static void display() @@ -189,6 +192,8 @@ static void keyboard(unsigned char key) { if(key == 'r') options.session->reset(session_buffer_params(), options.session_params.samples); + else if(key == 'h') + options.show_help = !(options.show_help); else if(key == 27) // escape options.session->progress.set_cancel("Canceled"); } |