aboutsummaryrefslogtreecommitdiff
path: root/src/tool
diff options
context:
space:
mode:
authorArne Dußin2020-11-21 20:55:47 +0100
committerArne Dußin2020-11-21 20:55:47 +0100
commitabf55d8d46fc7d5cfccc9f778da6fca10b33d0cd (patch)
treee2f849338a1ce9dfff44082fa7d6b8510385f6f9 /src/tool
parent58ca374fab6dd90c4d7415bdcc98add002274894 (diff)
downloadgraf_karto-abf55d8d46fc7d5cfccc9f778da6fca10b33d0cd.tar.gz
graf_karto-abf55d8d46fc7d5cfccc9f778da6fca10b33d0cd.zip
Move containment of points/ lines into trait
Diffstat (limited to 'src/tool')
-rw-r--r--src/tool/deletion_tool.rs6
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));
}
}