Move to using RoomLink datatype

2021-11-23 20:45:39 +00:00
parent a66ea1d922
commit 1f2d767d5e
18 changed files with 160 additions and 122 deletions
@@ -2,6 +2,7 @@
 module Dodge.Room.RoadBlock
    where
 import Dodge.Data
+import Dodge.RoomLink
 import Geometry
 import Dodge.Default.Room
 import Dodge.LevelGen.Data
@@ -31,8 +32,8 @@ litCorridor90 = do
        poly2 = rectNSWE (h-60) (h-100) (-60) 5
    pure $ defaultRoom
        { _rmPolys = [poly,poly2]
-        , _rmOutLinks = [ (V2 40 (h - 80), -pi/2)]
-        , _rmInLinks = [ (V2 20       0 , pi   ) ]
+        , _rmOutLinks = [uncurry outLink (V2 40 (h - 80), -pi/2)]
+        , _rmInLinks = [uncurry inLink (V2 20       0 , pi   ) ]
        , _rmPath  = concatMap doublePair 
            [( V2  20   0     , V2 20 (h-40) )
            ,( V2   0  (h-40) , V2 20 (h-40) )
@@ -94,8 +95,8 @@ lasTunnel :: Room
 lasTunnel = defaultRoom
    { _rmPolys  = polys
    , _rmBound  = polys
-    , _rmOutLinks  = [(V2 20 190,1.5* pi)]
-    , _rmInLinks = [(V2 0 20,0.5* pi)]
+    , _rmOutLinks  = [uncurry outLink(V2 20 190,1.5* pi)]
+    , _rmInLinks = [uncurry inLink(V2 0 20,0.5* pi)]
    , _rmPmnts     = [putLasTurret 0.005 & plSpot .~ PS (V2 10 240) (1.5*pi)
        , midWall (rectNSEW 65 40 0 25)
        , mntLS vShape (V2 50 10) (V3 40 20 50)