Implemented capture controls (F12)

Author: norru

Diff for: src/app/capture.rs

@@ -1,3 +1,6 @@
+use app::constants::*;
+use chrono::DateTime;
+use chrono::Utc;
 use gl;
 use glutin;
 use glutin::GlContext;
@@ -23,10 +26,11 @@ impl Capture {
 		//use gl;
 		gl::ReadPixels::load_with(|s| window.get_proc_address(s) as *const _);
 		let (w, h) = window.get_inner_size().unwrap();
+		let now: DateTime<Utc> = Utc::now();
 		Capture {
 			seq: 0,
-			capture_path: PathBuf::from("capture"),
-			capture_prefix: String::from("capture_"),
+			capture_path: PathBuf::from(CAPTURE_FOLDER).join(now.format(CAPTURE_FOLDER_TIMESTAMP_PATTERN).to_string()),
+			capture_prefix: String::from(CAPTURE_FILENAME_PREFIX),
 			enabled: false,
 			batch_size: 600,
 			w,
@@ -88,16 +92,24 @@ impl Capture {
 		self.images.clear()
 	}
 
+	// Remote control, detects state changes
+	pub fn enable(&mut self, enabled: bool) {
+		if enabled != self.enabled {
+			self.toggle()
+		}
+	}
+
+	// Starts/restarts recording
+	pub fn start(&mut self) { self.enabled = true }
+
+	// Stops recording and flushes
 	pub fn stop(&mut self) {
 		if self.enabled {
 			self.flush();
 		}
 		self.enabled = false;
 	}
 
-	// Starts/restarts recording
-	pub fn start(&mut self) { self.enabled = true }
-
 	pub fn enabled(&self) -> bool { self.enabled }
 
 	pub fn toggle(&mut self) {

Diff for: src/app/constants.rs

@@ -93,6 +93,10 @@ pub const CONFIG_DIR_RESOURCES: &'static str = "resources";
 pub const DUMP_FILE_PATTERN_CSV: &'static str = "%Y%m%d_%H%M%S.csv";
 pub const DUMP_FILE_PATTERN_JSON: &'static str = "%Y%m%d_%H%M%S.json";
 
+pub const CAPTURE_FOLDER_TIMESTAMP_PATTERN: &'static str = "%Y%m%d_%H%M%S";
+pub const CAPTURE_FOLDER: &'static str = "capture";
+pub const CAPTURE_FILENAME_PREFIX: &'static str = "capture_";
+
 pub const AMBIENT_LIGHTS: &'static [[f32; 4]] = &[
 	[1.0, 1.0, 1.0, 1.0],
 	[3.1, 3.1, 3.1, 1.0],

Diff for: src/app/controller.rs

@@ -51,6 +51,7 @@ impl InputController for DefaultController {
 			GamepadL3 -> ToggleGui,
 			N0 -> CamReset,
 			Home -> CamReset,
+			GamepadSelect -> ToggleCapture,
 			GamepadStart -> TogglePause,
 			KpHome -> CamReset,
 			GamepadDPadUp -> ZoomIn,
@@ -63,6 +64,7 @@ impl InputController for DefaultController {
 			F7 -> SaveWorldToFile,
 			F8 -> RestartFromCheckpoint,
 			F10 -> ToggleDebug,
+			F12 -> ToggleCapture,
 			GamepadStart -> ToggleDebug,
 			Z -> DeselectAll,
 			L -> NextLight,

Diff for: src/app/events.rs

@@ -44,6 +44,7 @@ pub enum Event {
 
 	TogglePause,
 	ToggleGui,
+	ToggleCapture,
 
 	AppQuit,
 

Diff for: src/app/main.rs

@@ -132,13 +132,6 @@ pub fn main_loop(
 						},
 						..
 					} => renderer.rebuild().unwrap(),
-					WindowEvent::KeyboardInput {
-						input: KeyboardInput {
-							virtual_keycode: Some(VirtualKeyCode::F12),
-							..
-						},
-						..
-					} => capture.toggle(),	
 					e => {
 						mapper.translate(&e).map(|i| app.on_input_event(&i));
 					}
@@ -147,6 +140,8 @@ pub fn main_loop(
 			}
 		});
 
+		capture.enable(app.is_capturing());
+
 		if !app.is_running() {
 			capture.stop();
 			app.save_world_to_file();

Diff for: src/app/mod.rs

@@ -273,6 +273,7 @@ pub struct App {
 	frame_smooth: math::MovingAverage<Seconds>,
 	is_running: bool,
 	is_paused: bool,
+	is_capturing: bool,
 	// interactions: Vec<Event>,
 	//
 	camera: math::Inertial<f32>,
@@ -379,6 +380,7 @@ impl App {
 			frame_smooth: math::MovingAverage::new(FRAME_SMOOTH_COUNT),
 			is_running: true,
 			is_paused: false,
+			is_capturing: false,
 			// savegame
 			saved_state_dir: config_home.join(CONFIG_DIR_SAVED_STATE),
 			config_home,
@@ -451,6 +453,7 @@ impl App {
 			Event::AppQuit => self.quit(),
 			Event::TogglePause => self.is_paused = !self.is_paused,
 			Event::ToggleGui => self.has_ui_overlay = !self.has_ui_overlay,
+			Event::ToggleCapture => self.is_capturing = !self.is_capturing,
 			Event::SaveGenePoolToFile => self.save_gene_pool_to_file(),
 			Event::SaveWorldToFile => self.save_world_to_file(),
 			Event::BeginDrag(_, _) => {
@@ -538,6 +541,8 @@ impl App {
 	}
 
 	pub fn is_running(&self) -> bool { self.is_running }
+	
+	pub fn is_capturing(&self) -> bool { self.is_capturing }
 
 	pub fn on_input_event(&mut self, e: &input::Event) { self.input_state.event(e); }