Unify RoomPos constructors

2022-03-10 18:40:22 +00:00
parent 7b1ac2b682
commit 01c58490fa
8 changed files with 135 additions and 127 deletions
@@ -118,59 +118,26 @@ data RoomWire
     WallWire Point2 Float Float

 data RPLinkStatus
-    = UsedAsOutLink 
+    = UsedOutLink 
        { _rplsType :: S.Set RoomLinkType 
        , _rplsChildNum :: Int
        , _rplsOutRoomID :: Int
        }
-    | UsedAsInLink  
+    | UsedInLink  
        { _rplsType :: S.Set RoomLinkType 
        , _rplsInRoomID :: Int
        }
-    | UnusedAsLink  { _rplsType :: S.Set RoomLinkType }
+    | UnusedLink  { _rplsType :: S.Set RoomLinkType }
    | NotLink
  deriving (Eq,Ord,Show)

-data RoomPos 
-    = UsedOutLink 
-        { _rpChildNum  :: Int 
-        , _rpOutRoomID :: Int
-        , _rpPos :: Point2  
-        , _rpDir :: Float
-        , _rpLinkType :: S.Set RoomLinkType
-        , _rpLinkStatus :: RPLinkStatus
-        }
-    | UsedInLink 
-        { _rpInRoomID :: Int 
-        , _rpPos :: Point2 
-        , _rpDir :: Float
-        , _rpLinkType :: S.Set RoomLinkType
-        , _rpLinkStatus :: RPLinkStatus
-        }
-    | UnusedLink
-        { _rpPos :: Point2 
-        , _rpDir ::Float
-        , _rpLinkType :: S.Set RoomLinkType
-        , _rpLinkStatus :: RPLinkStatus
-        }
-    | UsedLink
-        { _rpPos :: Point2 
-        , _rpDir :: Float
-        , _rpLinkType :: S.Set RoomLinkType
-        , _rpLinkStatus :: RPLinkStatus
-        }
-    | UsedSpot
-        { _rpPos :: Point2 
-        , _rpDir :: Float
-        , _rpType :: S.Set RoomPosType
-        , _rpLinkStatus :: RPLinkStatus
-        }
-    | UnusedSpot
-        { _rpPos :: Point2 
-        , _rpDir :: Float
-        , _rpType :: S.Set RoomPosType
-        , _rpLinkStatus :: RPLinkStatus
-        }
+data RoomPos = RoomPos
+    { _rpPos :: Point2 
+    , _rpDir :: Float
+    , _rpType :: S.Set RoomPosType
+    , _rpLinkStatus :: RPLinkStatus
+    , _rpPlacementUse :: Int
+    }
  deriving (Eq,Ord,Show)

 data RoomPosType