1 files changed, 18 insertions, 11 deletions
diff --git a/src/map/wall.rs b/src/map/wall.rs
index 22393bb..d18096b 100644
--- a/src/map/wall.rs
+++ b/src/map/wall.rs
@@ -1,10 +1,11 @@
 use super::Mappable;
 use crate::colours::DEFAULT_COLOURS;
 use crate::math::{LineSegment, Rect, Vec2};
-use crate::scaleable::Scaleable;
 use crate::transform::Transform;
+use crate::transformable::NonRigidTransformable;
 use raylib::drawing::{RaylibDraw, RaylibDrawHandle};
 use std::ops::{Deref, DerefMut};
+use nalgebra::{Matrix3, Point2};
 
 pub type WallData = LineSegment<f64>;
 
@@ -81,18 +82,24 @@ impl Mappable for Wall {
     fn bounding_rect(&self) -> Rect<f64> {
         Rect::bounding_rect(self.data.start, self.data.end)
     }
-}
 
-impl Scaleable for Wall {
-    fn scale(&mut self, by: &Vec2<f64>) {
-        if by.x <= 0. || by.y <= 0. {
-            panic!("Cannot set dimensions with negative size");
-        }
+    fn as_non_rigid(&self) -> Option<&dyn NonRigidTransformable> {
+        Some(self as &dyn NonRigidTransformable)
+    }
+
+    fn as_non_rigid_mut(&mut self) -> Option<&mut dyn NonRigidTransformable> {
+        Some(self as &mut dyn NonRigidTransformable)
+    }
+}
 
-        self.data.start.x *= by.x;
-        self.data.start.y *= by.y;
-        self.data.end.x *= by.x;
-        self.data.end.y *= by.y;
+impl NonRigidTransformable for Wall {
+    fn apply_matrix(&mut self, matrix: &Matrix3<f64>) {
+        self.data.start = matrix
+            .transform_point(&self.data.start.into())
+            .into();
+        self.data.end = matrix
+            .transform_point(&self.data.end.into())
+            .into();
     }
 }