[Bf-blender-cvs] [b10bc3a] master: Cycles: Number keys 0-3 can be used in interactive mode now to set max bounces.

[Thomas Dinges]

Commit: b10bc3a6ec4e5b73cec4ac92fb005f1bc7fee4e2
Author: Thomas Dinges
Date:   Tue May 19 12:47:38 2015 +0200
Branches: master
https://developer.blender.org/rBb10bc3a6ec4e5b73cec4ac92fb005f1bc7fee4e2

Cycles: Number keys 0-3 can be used in interactive mode now to set max bounces.

===================================================================

M	intern/cycles/app/cycles_standalone.cpp
M	intern/cycles/util/util_view.cpp

===================================================================

diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 1998691..b0d49d6 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -21,6 +21,7 @@
 #include "device.h"
 #include "scene.h"
 #include "session.h"
+#include "integrator.h"
 
 #include "util_args.h"
 #include "util_foreach.h"
@@ -272,6 +273,7 @@ static void keyboard(unsigned char key)
 	else if(key == 'i')
 		options.interactive = !(options.interactive);
 
+	/* Navigation */
 	else if(options.interactive && (key == 'w' || key == 'a' || key == 's' || key == 'd')) {
 		Transform matrix = options.session->scene->camera->matrix;
 		float3 translate;
@@ -294,6 +296,25 @@ static void keyboard(unsigned char key)
 
 		options.session->reset(session_buffer_params(), options.session_params.samples);
 	}
+
+	/* Set Max Bounces */
+	else if(options.interactive && (key == '0' || key == '1' || key == '2' || key == '3')) {
+		int bounce;
+		switch(key) {
+			case '0': bounce = 0; break;
+			case '1': bounce = 1; break;
+			case '2': bounce = 2; break;
+			case '3': bounce = 3; break;
+			default: bounce = 0; break;
+		}
+
+		options.session->scene->integrator->max_bounce = bounce;
+
+		/* Update and Reset */
+		options.session->scene->integrator->need_update = true;
+
+		options.session->reset(session_buffer_params(), options.session_params.samples);
+	}
 }
 #endif
 
diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp
index 0c11316..9b5cd22 100644
--- a/intern/cycles/util/util_view.cpp
+++ b/intern/cycles/util/util_view.cpp
@@ -110,6 +110,7 @@ void view_display_help()
 	view_display_text(x1+20, y2-230, "Left mouse:  Move camera");
 	view_display_text(x1+20, y2-250, "Right mouse:  Rotate camera");
 	view_display_text(x1+20, y2-270, "W/A/S/D:  Move camera");
+	view_display_text(x1+20, y2-290, "0/1/2/3:  Set max bounces");
 
 	glColor3f(1.0f, 1.0f, 1.0f);
 }