Merge branch 'master' into snapping

1 files changed, 12 insertions, 2 deletions

diff --git a/src/map/polygon_room.rs b/src/map/polygon_room.rs
index fd4122e..2a29436 100644
--- a/src/map/polygon_room.rs
+++ b/src/map/polygon_room.rs
@@ -6,8 +6,10 @@ 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};
+use std::ops::Deref;
 
 /// Data type for the Polygon room.
 pub type PolygonRoomData = Polygon<f64>;
@@ -25,7 +27,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 +35,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);
     }
 }
 
@@ -85,3 +87,11 @@ impl NonRigidTransformable for PolygonRoom {
         self.retriangulate();
     }
 }
+
+impl Deref for PolygonRoom {
+    type Target = PolygonRoomData;
+
+    fn deref(&self) -> &Self::Target {
+        &self.data
+    }
+}