diff options
| author | Max Pernklau | 2020-11-29 21:28:39 +0100 |
|---|---|---|
| committer | GitHub | 2020-11-29 21:28:39 +0100 |
| commit | 4f2eab931bed0ec86c6136e365ad3a1b3b8c4e87 (patch) | |
| tree | 010339f867d90c2c6293ddd16c4151ec220c7b8e /src/tool/deletion_tool.rs | |
| parent | 4d3ee44eb4892bd454a1289f7fed308f82ec6a3b (diff) | |
| parent | 90db142588e1b78250dc9b266bae359cf9e22721 (diff) | |
| download | graf_karto-4f2eab931bed0ec86c6136e365ad3a1b3b8c4e87.tar.gz graf_karto-4f2eab931bed0ec86c6136e365ad3a1b3b8c4e87.zip | |
Merge branch 'master' into wall-join
Diffstat (limited to 'src/tool/deletion_tool.rs')
| -rw-r--r-- | src/tool/deletion_tool.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tool/deletion_tool.rs b/src/tool/deletion_tool.rs index 17dd949..74a8f92 100644 --- a/src/tool/deletion_tool.rs +++ b/src/tool/deletion_tool.rs @@ -10,7 +10,7 @@ use raylib::RaylibHandle; pub struct DeletionTool { keybindings: DeletionToolKeybindings, - deletion_rect: Option<(Vec2<f32>, Vec2<f32>)>, + deletion_rect: Option<(Vec2<f64>, Vec2<f64>)>, } impl DeletionTool { @@ -22,7 +22,7 @@ impl DeletionTool { } /// Delete all map-data that is contained inside the provided rectangular space. - pub fn delete_rect(map_data: &mut MapData, rect: Rect<f32>) { + pub fn delete_rect(map_data: &mut MapData, rect: Rect<f64>) { map_data .rooms_mut() .retain(|&room| !rect.contains_rect(&room)); @@ -50,7 +50,7 @@ impl Tool for DeletionTool { transform: &Transform, mouse_blocked: bool, ) { - let mouse_pos_m = transform.point_px_to_m(rl.get_mouse_position().into()); + let mouse_pos_m = transform.point_px_to_m(&rl.get_mouse_position().into()); if let Some((_, ref mut pos2)) = &mut self.deletion_rect { *pos2 = mouse_pos_m; } @@ -72,7 +72,7 @@ impl Tool for DeletionTool { fn draw(&self, _map_data: &MapData, rld: &mut RaylibDrawHandle, transform: &Transform) { if let Some((pos1, pos2)) = self.deletion_rect { - let rect_px = transform.rect_m_to_px(Rect::bounding_rect(pos1, pos2)); + let rect_px = transform.rect_m_to_px(&Rect::bounding_rect(pos1, pos2)); rld.draw_rectangle_rec( rect_px, Color { |