diff options
| author | Arne Dußin | 2020-11-23 23:38:52 +0100 |
|---|---|---|
| committer | Arne Dußin | 2020-11-23 23:38:52 +0100 |
| commit | e62275d90d3ebf379e8ab268cb77d8eaf6d1cf07 (patch) | |
| tree | 5f8aee175d048e40b8b496157816177e0597e0f9 /src/tool/deletion_tool.rs | |
| parent | bff1955c38480f2dffd0a10c16ef46dc11320752 (diff) | |
| parent | 3b0c99351da92410bbfaba233e40376b767cb64e (diff) | |
| download | graf_karto-e62275d90d3ebf379e8ab268cb77d8eaf6d1cf07.tar.gz graf_karto-e62275d90d3ebf379e8ab268cb77d8eaf6d1cf07.zip | |
Merge branch 'triangulation' into polygon-rooms
Diffstat (limited to 'src/tool/deletion_tool.rs')
| -rw-r--r-- | src/tool/deletion_tool.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tool/deletion_tool.rs b/src/tool/deletion_tool.rs index c313574..5031f5d 100644 --- a/src/tool/deletion_tool.rs +++ b/src/tool/deletion_tool.rs @@ -2,7 +2,7 @@ use super::Tool; use crate::button::Button; use crate::config::{DeletionToolKeybindings, ToolKeybindings}; use crate::map_data::MapData; -use crate::math::{Rect, Vec2}; +use crate::math::{Rect, Surface, Vec2}; use crate::transform::Transform; use raylib::core::drawing::{RaylibDraw, RaylibDrawHandle}; use raylib::ffi::Color; @@ -28,10 +28,10 @@ impl DeletionTool { .retain(|&room| !rect.contains_rect(room)); map_data .walls_mut() - .retain(|&(pos1, pos2)| !rect.contains(pos1) || !rect.contains(pos2)); + .retain(|&(pos1, pos2)| !rect.contains_point(&pos1) || !rect.contains_point(&pos2)); map_data .icons_mut() - .retain(|icon| !rect.contains(icon.position)); + .retain(|icon| !rect.contains_point(&icon.position)); } } |
