From 53d376eaeef991850d35318b147f75c8f103319d Mon Sep 17 00:00:00 2001 From: Arne Dußin Date: Sun, 27 Dec 2020 21:54:31 +0100 Subject: Change to polygongraph instead of polygon in roomtool The polygon room tool used a convoluted process for determining what the user actually wants to draw. I have changed to the polygon graph instead, which makes the checks easier and restricts the user a bit less. In the process however I found a serious problem with my handling float, so everything needed to change to margin compares (which I of course should have done in the beginning. Guys, take the warning seriously and don't ignore it for ten years like I did. It will come back to haunt you.. apparently) instead of direct equality. --- src/map/polygon_room.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/map/polygon_room.rs') diff --git a/src/map/polygon_room.rs b/src/map/polygon_room.rs index fd4122e..ead4e76 100644 --- a/src/map/polygon_room.rs +++ b/src/map/polygon_room.rs @@ -6,6 +6,7 @@ use crate::colours::DEFAULT_COLOURS; use crate::math::{self, Polygon, Rect, Triangle}; use crate::transform::Transform; use crate::transformable::NonRigidTransformable; +use crate::FLOAT_MARGIN; use nalgebra::{Matrix3, Point2}; use raylib::drawing::{RaylibDraw, RaylibDrawHandle}; @@ -25,7 +26,7 @@ impl PolygonRoom { pub fn from_data(data: PolygonRoomData) -> Self { Self { data: data.clone(), - triangulated: math::triangulate(data), + triangulated: math::triangulate(data, FLOAT_MARGIN), selected: false, } } @@ -33,7 +34,7 @@ impl PolygonRoom { // When the internal polygon changes, it must be retriangulated to be drawn on the screen // properly, so this function must be called any time that happens. fn retriangulate(&mut self) { - self.triangulated = math::triangulate(self.data.clone()); + self.triangulated = math::triangulate(self.data.clone(), FLOAT_MARGIN); } } -- cgit v1.2.3-70-g09d2