From da19f0174b99db02e50d2f1db8aae6245d7981ca Mon Sep 17 00:00:00 2001 From: Arne Dußin Date: Wed, 25 Nov 2020 22:16:46 +0100 Subject: Fix clippy lints and add polygon tool button icon --- assets/button/tool_buttons.png | Bin 24125 -> 24760 bytes assets/button/tool_buttons.xcf | Bin 53024 -> 87131 bytes src/math/polygon/mod.rs | 2 +- src/tool/polygon_room_tool.rs | 5 ++--- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/button/tool_buttons.png b/assets/button/tool_buttons.png index 2a6a214..1a9d74b 100644 Binary files a/assets/button/tool_buttons.png and b/assets/button/tool_buttons.png differ diff --git a/assets/button/tool_buttons.xcf b/assets/button/tool_buttons.xcf index 9cd012b..e01bf92 100644 Binary files a/assets/button/tool_buttons.xcf and b/assets/button/tool_buttons.xcf differ diff --git a/src/math/polygon/mod.rs b/src/math/polygon/mod.rs index e1f15c5..ed48751 100644 --- a/src/math/polygon/mod.rs +++ b/src/math/polygon/mod.rs @@ -367,7 +367,7 @@ impl< * after another until finally connecting the last point to the first point in radians. Negative, * when the points in sum are right-turning, positive, when they are left-turning. */ -fn combined_angle(points: &Vec>) -> T { +fn combined_angle(points: &[Vec2]) -> T { let mut combined_angle = T::zero(); for i in 0..points.len() { let prev = (i + points.len() - 1) % points.len(); diff --git a/src/tool/polygon_room_tool.rs b/src/tool/polygon_room_tool.rs index 58f326f..42874e8 100644 --- a/src/tool/polygon_room_tool.rs +++ b/src/tool/polygon_room_tool.rs @@ -33,9 +33,8 @@ impl UnfinishedPolygon { // TODO: Is this possible without changing the mutability of self and without reallocation? let mut corners = self.corners.clone(); corners.push(self.working_corner); - let res = Polygon::check_validity(&corners); - res + Polygon::check_validity(&corners) } pub fn try_into_completed(&mut self) -> Option> { @@ -65,7 +64,7 @@ impl UnfinishedPolygon { } pub fn try_push_working(&mut self) -> Result<(), PolygonError> { - assert!(self.corners.len() >= 1); + assert!(!self.corners.is_empty()); if self.corners.len() == 1 { return if self.corners[0] != self.working_corner { -- cgit v1.2.3-70-g09d2