Continue to work on pathfinding
This commit is contained in:
+6
-6
@@ -6,12 +6,12 @@ module Dodge.Layout (
|
||||
) where
|
||||
|
||||
import qualified Data.Vector.Unboxed as UV
|
||||
import Dodge.Path.Translate
|
||||
--import Dodge.Path.Translate
|
||||
import qualified Control.Foldl as L
|
||||
import Control.Lens
|
||||
import Data.Foldable
|
||||
import Data.Function
|
||||
import Data.Graph.Inductive (labEdges, labNodes)
|
||||
--import Data.Graph.Inductive (labEdges, labNodes)
|
||||
import Data.List (nubBy,sortOn)
|
||||
import Data.Maybe
|
||||
import Data.Tile
|
||||
@@ -45,16 +45,16 @@ generateLevelFromRoomList gr' w =
|
||||
. worldToGenWorld rs'
|
||||
$ w & cWorld . lWorld . walls .~ wallsFromRooms rs
|
||||
& cWorld . cwGen . cwgGameRooms .~ gameRoomsFromRooms (IM.elems rs')
|
||||
& cWorld . pathGraph .~ path
|
||||
-- & cWorld . pathGraph .~ path
|
||||
& cWorld . incNode .~ inodes
|
||||
& cWorld . incGraph .~ igraph
|
||||
& pnZoning .~ foldl' (flip zonePn) mempty (labNodes path)
|
||||
& peZoning .~ foldl' (flip zonePe) mempty (map fromEdgeTuple $ labEdges path)
|
||||
-- & pnZoning .~ foldl' (flip zonePn) mempty (labNodes path)
|
||||
-- & peZoning .~ foldl' (flip zonePe) mempty (map fromEdgeTuple $ labEdges path)
|
||||
& incNodeZoning .~ UV.ifoldl' (\m i p -> zonePn (i,p) m) mempty inodes
|
||||
& incEdgeZoning .~ foldl' (flip (zoneIncPe inodes)) mempty ipairs
|
||||
where
|
||||
pairs = snapToGrid $ foldMap _rmPath rs
|
||||
(_, path) = pairsToGraph pairs
|
||||
-- (_, path) = pairsToGraph pairs
|
||||
(inodes,igraph,ipairs) = pairsToIncGraph pairs
|
||||
rs = map doRoomShift $ IM.elems rs'
|
||||
rs' = mapM shuffleRoomPos gr' & evalState $ _randGen w
|
||||
|
||||
Reference in New Issue
Block a user