From b06e0075bf4dfd51f8ad5df801f9c43fbd73df1f Mon Sep 17 00:00:00 2001 From: Arne Dußin Date: Mon, 9 Nov 2020 21:15:35 +0100 Subject: Add configuration options --- src/editor.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/editor.rs') diff --git a/src/editor.rs b/src/editor.rs index 01bd268..0999448 100644 --- a/src/editor.rs +++ b/src/editor.rs @@ -1,3 +1,4 @@ +use crate::config::Config; use crate::map_data::MapData; use crate::tool::*; use crate::transform::Transform; @@ -12,16 +13,16 @@ pub struct Editor { } impl Editor { - pub fn new(rl: &mut RaylibHandle, rlt: &RaylibThread) -> Self { + pub fn new(rl: &mut RaylibHandle, rlt: &RaylibThread, config: Config) -> Self { let mut tools: Vec> = Vec::with_capacity(ToolType::NumTools as usize); assert_eq!(ToolType::RoomTool as u8, 0); - tools.push(Box::new(RoomTool::new())); + tools.push(Box::new(RoomTool::new(config.room_keybindings))); assert_eq!(ToolType::WallTool as u8, 1); - tools.push(Box::new(WallTool::new())); + tools.push(Box::new(WallTool::new(config.wall_keybindings))); assert_eq!(ToolType::IconTool as u8, 2); - tools.push(Box::new(IconTool::new(rl, rlt))); + tools.push(Box::new(IconTool::new(rl, rlt, config.icon_keybindings))); assert_eq!(ToolType::DeletionTool as u8, 3); - tools.push(Box::new(DeletionTool::new())); + tools.push(Box::new(DeletionTool::new(config.deletion_keybindings))); assert_eq!(ToolType::NumTools as usize, tools.len()); -- cgit v1.2.3-70-g09d2