Merge branch 'master' into testing

2021-03-29 10:59:10 +01:00
parent 8de5cfcb18 9608655947
commit c722b6f38f
16 changed files with 781 additions and 612 deletions
@@ -614,19 +614,10 @@ data PlacementSpot = PS
    , _psRot :: Float
    , _psType :: PSType
    }
-data Room = Room
-    { _rmPolys  :: [Poly]
-    , _rmLinks  :: [(Point2,Float)]
-    , _rmPath :: [(Point2, Point2)]
-    , _rmPS :: [PlacementSpot]
-    , _rmBound :: Poly
-    }

 data SubNode a = SN a | InLink | OutLink

-data RoomLink = RL {_rlPos :: Point2, _rlRot :: Float}

-makeLenses ''RoomLink
 makeLenses ''World
 makeLenses ''Cloud
 makeLenses ''Creature
@@ -653,7 +644,6 @@ makeLenses ''PressPlate
 makeLenses ''Button
 makeLenses ''PSType
 makeLenses ''PlacementSpot
-makeLenses ''Room

 numColor :: Int -> Color
 numColor 0  = (1,0,0,1)