Fix bug determining max radius of convex polys, fixes bugs in room positioning

This commit is contained in:
2022-03-21 07:43:27 +00:00
parent 2a5b6d3597
commit d6285c45b3
12 changed files with 80 additions and 32 deletions
+2 -1
View File
@@ -55,7 +55,8 @@ longRoomRunPast = do
(Node (PassDown r)
[ singleUseAll door
--, return (UseLabel 0 $ door & rmConnectsTo .~ S.singleton InLink)
, treeFromPost [PassDown $ corridor & rmConnectsTo .~ S.member InLink, PassDown corridor]
--, treeFromPost [PassDown $ corridor & rmConnectsTo .~ S.member InLink, PassDown corridor]
, treeFromPost [PassDown $ corridor & rmConnectsTo .~ S.member InLink]
(UseLabel 0 door)
]
)
+5 -1
View File
@@ -170,6 +170,8 @@ quarterRoomTri w = do
]
, _rmBound = [[V2 0 0,V2 w w,V2 (-w) w]]
}
-- where
-- w' = w -10
quarterRoomSquare :: RandomGen g => Float -> State g Room
quarterRoomSquare w = do
@@ -207,8 +209,10 @@ quarterRoomSquare w = do
, _rmPos = [ RoomPos p pi S.empty NotLink 0
| p <- [V2 20 (2*w-40),V2 25 (2*w-45)] ]
--, _rmBound = [map toV2 [(w,w),(0,2*w),(-w,w)]]
, _rmBound = thepoly
, _rmBound = [ map toV2 [(0,0),(w,w),(0,2*w),(-w,w)] ]
}
-- where
-- w' = w - 10
{- | Randomise the ordering of placements in a room.
Useful for randomising the position of generic placements such as 'PutNothing'. -}
shufflePlacements :: RandomGen g => Room -> State g Room