Simplify room link functions

2025-10-03 18:55:18 +01:00
parent a8348a3515
commit 2d44809900
14 changed files with 229 additions and 205 deletions
@@ -29,10 +29,10 @@ roomGlassOctogon x =
                [ rectNSWE x (- x) (- x) x
                , rectNSWE 0 (- (x + 40)) (-20) 20
                ]
-            , _rmLinks = map (uncurry outLink) (init lnks) ++ [uncurry inLink $ last lnks]
+            , _rmLinks = lnks'
            , _rmPath =
-                linksAndPath
-                    lnks
+                linksAndPath'
+                    lnks'
                    [ (V2 0 x, V2 0 (- (x + 40)))
                    , (V2 0 (- (x + 40)), V2 0 x)
                    ]
@@ -52,6 +52,7 @@ roomGlassOctogon x =
            }
  where
    fx = 4 * x / 5
+    lnks' = map (uncurry outLink) (init lnks) ++ [uncurry inLink $ last lnks]
    lnks =
        [ (V2 0 x, 0)
        , (V2 0 (- (x + 40)), pi)