justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactor tesla

Browse Source
This commit is contained in:
justin
2022-07-20 21:18:11 +01:00
parent 845c1f282e
commit b36e7f8b78
9 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Tesla/Arc/Default.hs
+5 -4
View File
@@ -12,7 +12,8 @@ import qualified Data.IntMap.Strict as IM
defaultArcStep :: RandomGen g => ItemParams -> World -> ArcStep
-> State g (Maybe ArcStep)
defaultArcStep _ _ (ArcStep _ _ (Just _)) = return Nothing
defaultArcStep _ _ (ArcStep _ _ (CrID _)) = return Nothing
defaultArcStep _ _ (ArcStep _ _ (WlID _)) = return Nothing
defaultArcStep itparams w (ArcStep p dir _) = do
let csize = _arcSize itparams
--rot <- takeOne [pi/4,negate pi/4]
@@ -29,7 +30,7 @@ defaultArcStep itparams w (ArcStep p dir _) = do
. mapMaybe (\ q -> sequence $ collidePointWallsFilterStream (const True) p (center +.+ q) w)
-- collidePointWallsWall and wlsnearpoint
$ polyCirc 6 csize
f (q,wl) = ArcStep q dir (Just $ Right wl)
g cr = ArcStep (_crPos cr +.+ csize *.* unitVectorAtAngle dir) dir (Just $ Left cr)
f (q,wl) = ArcStep q dir (WlID $ _wlID wl)
g cr = ArcStep (_crPos cr +.+ csize *.* unitVectorAtAngle dir) dir (CrID $ _crID cr)
return . listToMaybe . sortOn (dist p . (^. asPos))
$ ArcStep newp dir Nothing : catMaybes [fmap f mwl,fmap g mcr]
$ ArcStep newp dir NothingID : catMaybes [fmap f mwl,fmap g mcr]