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

Cleanup

Browse Source
This commit is contained in:
justin
2026-01-02 11:07:47 +00:00
parent 119234af89
commit 804e4eb1e2
4 changed files with 60 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Render/ShapePicture.hs
+41 -41
View File
@@ -21,31 +21,30 @@ import ShapePicture
worldSPic :: Config -> Universe -> SPic
worldSPic cfig u =
-- (mempty :!: extraPics cfig u)
-- <> foldup propSPic (filtOn _prPos _props)
-- <> foldMap' debrisSPic (filtOn' (xyV3 . _dbPos) _debris)
-- <> foldup drawProjectile (filtOn (^. pjPos . _xy) _projectiles)
-- <> foldup drawPulseBall (filtOn _pbPos _pulseBalls)
-- <> foldup (shiftDraw _blPos _blDir (const drawBlock)) (filtOn _blPos _blocks)
-- <> foldMap' (shiftDraw _fsPos _fsDir (const _fsSPic)) (filtOn' _fsPos _foreShapes)
-- <> foldup (drawCreature (lw ^. items)) (filtOn (^. crPos . _xy) _creatures)
-- <> foldup
-- (Prelude.uncurry floorItemSPic)
-- ( IM.intersectionWith
-- (,)
-- (lw ^. items)
-- (filtOn _flItPos _floorItems)
-- )
-- <> foldup btSPic (filtOn _btPos _buttons)
-- <> foldup (mcSPic (w ^. cWorld)) (filtOn _mcPos _machines)
-- <> foldMap' drawChasm (w ^. cWorld . chasms)
-- <> w ^. cWorld . lWorld . tempSPic
-- <>
testSPic cfig u
(mempty :!: extraPics cfig u)
<> foldup propSPic (filtOn _prPos _props)
<> foldMap' debrisSPic (filtOn' (xyV3 . _dbPos) _debris)
<> foldup drawProjectile (filtOn (^. pjPos . _xy) _projectiles)
<> foldup drawPulseBall (filtOn _pbPos _pulseBalls)
<> foldup (shiftDraw _blPos _blDir (const drawBlock)) (filtOn _blPos _blocks)
<> foldMap' (shiftDraw _fsPos _fsDir (const _fsSPic)) (filtOn' _fsPos _foreShapes)
<> foldup (drawCreature (lw ^. items)) (filtOn (^. crPos . _xy) _creatures)
<> foldup
(Prelude.uncurry floorItemSPic)
( IM.intersectionWith
(,)
(lw ^. items)
(filtOn _flItPos _floorItems)
)
<> foldup btSPic (filtOn _btPos _buttons)
<> foldup (mcSPic (w ^. cWorld)) (filtOn _mcPos _machines)
<> foldMap' drawChasm (w ^. cWorld . chasms)
<> w ^. cWorld . lWorld . tempSPic
<> testSPic cfig u
where
w = u ^. uvWorld
lw = w ^. cWorld . lWorld
--foldup = foldMap'
foldup = foldMap'
filtOn f g = IM.filter (pointIsClose . f) (g lw)
filtOn' f g = filter (pointIsClose . f) (g lw)
pointIsClose = cullPoint cfig w
@@ -54,26 +53,27 @@ testSPic :: Config -> Universe -> SPic
testSPic cfig u = noShape $ testPic cfig u
testPic :: Config -> Universe -> Picture
testPic _ _ = f
$ mempty
<> color white (line [0,10])
<> text "A"
<> translate 20 20 (arc pi 0 10)
<> translate 0 20 (circleSolidCol white red 10)
where
f x = translate 5 20 (setLayer DebugLayer x) <> setLayer BloomLayer x
-- fold $ do
-- cr <- u ^? uvWorld . cWorld . lWorld . creatures . ix 0
---- return mempty
-- invid <- cr ^? crManipulation . manObject . imRootSelectedItem . unNInt
-- loc <- invIndents ((\k -> u ^?! uvWorld . cWorld . lWorld . items . ix k) <$> _crInv cr)
-- ^? ix invid . _2
-- return . color red $ setLayer DebugLayer $ reduceLocDT (f cr) loc
testPic _ _ = mempty
-- f
-- $ mempty
-- <> color white (line [0,10])
-- <> text "A"
-- <> translate 20 20 (arc pi 0 10)
-- <> translate 0 20 (circleSolidCol white red 10)
-- where
-- f cr loc = foldMap g $ map (muzzlePos loc cr) (itemMuzzles $ loc ^. locDT . dtValue . _1)
-- where
-- g :: Point3Q -> Picture
-- g pq = translate3 (pq ^. _1) $ crossPic 5
-- f x = translate 5 20 (setLayer DebugLayer x) <> setLayer BloomLayer x
---- fold $ do
---- cr <- u ^? uvWorld . cWorld . lWorld . creatures . ix 0
------ return mempty
---- invid <- cr ^? crManipulation . manObject . imRootSelectedItem . unNInt
---- loc <- invIndents ((\k -> u ^?! uvWorld . cWorld . lWorld . items . ix k) <$> _crInv cr)
---- ^? ix invid . _2
---- return . color red $ setLayer DebugLayer $ reduceLocDT (f cr) loc
---- where
---- f cr loc = foldMap g $ map (muzzlePos loc cr) (itemMuzzles $ loc ^. locDT . dtValue . _1)
---- where
---- g :: Point3Q -> Picture
---- g pq = translate3 (pq ^. _1) $ crossPic 5
drawBlock :: Block -> SPic