Refactor crPos to be a V3
This commit is contained in:
@@ -5,6 +5,7 @@ module Dodge.RadarSweep (
|
||||
updateRadarSweep,
|
||||
) where
|
||||
|
||||
import Linear
|
||||
import Color
|
||||
import Data.Maybe
|
||||
import qualified Data.Set as S
|
||||
@@ -29,7 +30,7 @@ aRadarPulse itid mitid armitid ob cr =
|
||||
.:~ RadarSweep
|
||||
{ _rsTimer = 50
|
||||
, _rsRad = 0
|
||||
, _rsPos = _crPos cr
|
||||
, _rsPos = cr ^. crPos . _xy
|
||||
, _rsObject = ob
|
||||
, _rsMapper = mitid
|
||||
, _rsAR = armitid
|
||||
@@ -85,7 +86,7 @@ blipAt r col i p =
|
||||
}
|
||||
|
||||
crBlips :: Point2 -> Float -> World -> ([Point2], S.Set (Point2, Point2))
|
||||
crBlips p r = (,mempty) . IM.elems . IM.filter f . fmap _crPos . IM.filter g . _creatures . _lWorld . _cWorld
|
||||
crBlips p r = (,mempty) . IM.elems . IM.filter f . fmap (^. crPos . _xy) . IM.filter g . _creatures . _lWorld . _cWorld
|
||||
where
|
||||
f q = dist p q <= r && dist p q > r - 100
|
||||
g cr = _crID cr /= 0
|
||||
|
||||
Reference in New Issue
Block a user