Continue to work on pathfinding
This commit is contained in:
+18
-18
@@ -24,20 +24,20 @@ import Geometry.Data
|
||||
-- }
|
||||
-- deriving (Eq, Show, Read) --, Generic)
|
||||
|
||||
data PathEdgeNodes = PathEdgeNodes
|
||||
{ _penStart :: Int
|
||||
, _penEnd :: Int
|
||||
, _penPathEdge :: PathEdge
|
||||
}
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data PathEdge = PathEdge
|
||||
{ _peStart :: Point2
|
||||
, _peEnd :: Point2
|
||||
, _peDist :: Float
|
||||
, _peObstacles :: Set.Set EdgeObstacle
|
||||
}
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
--data PathEdgeNodes = PathEdgeNodes
|
||||
-- { _penStart :: Int
|
||||
-- , _penEnd :: Int
|
||||
-- , _penPathEdge :: PathEdge
|
||||
-- }
|
||||
-- deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
--
|
||||
--data PathEdge = PathEdge
|
||||
-- { _peStart :: Point2
|
||||
-- , _peEnd :: Point2
|
||||
-- , _peDist :: Float
|
||||
-- , _peObstacles :: Set.Set EdgeObstacle
|
||||
-- }
|
||||
-- deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data SimpleEdge = SimpleEdge
|
||||
{ _seDist :: Float
|
||||
@@ -61,12 +61,12 @@ data EdgeObstacle
|
||||
--deriving instance (Flat (Gr Point2 PathEdge))
|
||||
|
||||
--makeLenses ''PathGraph
|
||||
makeLenses ''PathEdge
|
||||
makeLenses ''PathEdgeNodes
|
||||
--makeLenses ''PathEdge
|
||||
--makeLenses ''PathEdgeNodes
|
||||
makeLenses ''SimpleEdge
|
||||
deriveJSON defaultOptions ''EdgeObstacle
|
||||
deriveJSON defaultOptions ''PathEdge
|
||||
deriveJSON defaultOptions ''PathEdgeNodes
|
||||
--deriveJSON defaultOptions ''PathEdge
|
||||
--deriveJSON defaultOptions ''PathEdgeNodes
|
||||
deriveJSON defaultOptions ''Gr
|
||||
deriveJSON defaultOptions ''SimpleEdge
|
||||
--deriveJSON defaultOptions ''PathGraph
|
||||
|
||||
Reference in New Issue
Block a user