Cleanup
This commit is contained in:
+2
-7
@@ -9,7 +9,6 @@ module Dodge.Path (
|
|||||||
walkableNodeNear,
|
walkableNodeNear,
|
||||||
snapToGrid,
|
snapToGrid,
|
||||||
pairsToIncGraph,
|
pairsToIncGraph,
|
||||||
-- updateEdge,
|
|
||||||
getEdgesCrossing,
|
getEdgesCrossing,
|
||||||
) where
|
) where
|
||||||
|
|
||||||
@@ -17,12 +16,8 @@ import Dodge.WorldEvent.ThingsHit
|
|||||||
import qualified Data.Set as S
|
import qualified Data.Set as S
|
||||||
import qualified Algorithm.Search as AS
|
import qualified Algorithm.Search as AS
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
--import Data.Bifunctor
|
|
||||||
import Data.Foldable
|
import Data.Foldable
|
||||||
--import Data.Graph.Inductive hiding ((&))
|
|
||||||
import Data.List (sortOn)
|
import Data.List (sortOn)
|
||||||
--import Data.Map.Strict (Map)
|
|
||||||
--import qualified Data.Map.Strict as M
|
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Data.Set (Set)
|
import Data.Set (Set)
|
||||||
import qualified Data.Set as Set
|
import qualified Data.Set as Set
|
||||||
@@ -99,7 +94,6 @@ pointTowardsImpulse a b w = find (flip (isWalkable a) w) =<< makePathBetweenPs b
|
|||||||
pairsToIncGraph ::
|
pairsToIncGraph ::
|
||||||
Set.Set (Point2, Point2) ->
|
Set.Set (Point2, Point2) ->
|
||||||
( UV.Vector Point2
|
( UV.Vector Point2
|
||||||
--, V.Vector [(Int, SimpleEdge)]
|
|
||||||
, V.Vector (IM.IntMap SimpleEdge)
|
, V.Vector (IM.IntMap SimpleEdge)
|
||||||
, [(Int, Int)]
|
, [(Int, Int)]
|
||||||
)
|
)
|
||||||
@@ -133,7 +127,8 @@ obstructPathsCrossing obs s e w = w & cWorld . incGraph %~ updateincedges
|
|||||||
f i = w ^?! cWorld . incNode . ix i
|
f i = w ^?! cWorld . incNode . ix i
|
||||||
|
|
||||||
snapToGrid :: Set (Point2, Point2) -> Set (Point2, Point2)
|
snapToGrid :: Set (Point2, Point2) -> Set (Point2, Point2)
|
||||||
snapToGrid = Set.map (over each (fmap (fromIntegral . f)))
|
--snapToGrid = Set.map (over each (fmap (fromIntegral . f)))
|
||||||
|
snapToGrid = Set.map $ over (each . each) (fromIntegral . f)
|
||||||
where
|
where
|
||||||
f :: Float -> Int
|
f :: Float -> Int
|
||||||
f = round
|
f = round
|
||||||
|
|||||||
Reference in New Issue
Block a user