Include tick counting code
This commit is contained in:
+13
-26
@@ -57,26 +57,20 @@ fixedCoordPictures w = pictures
|
||||
|
||||
worldPictures :: World -> Picture
|
||||
worldPictures w
|
||||
= pictures $ map screenShift $ concat
|
||||
[ decPicts
|
||||
, ppPicts
|
||||
, itFloorPicts
|
||||
, crPicts
|
||||
, clPicts
|
||||
, buttonPicts
|
||||
, ptPicts
|
||||
, ptPicts'
|
||||
, afterPtPicts'
|
||||
, wlPicts
|
||||
, wallShadows
|
||||
, smokeShadows
|
||||
]
|
||||
= pictures $ concat [ decPicts
|
||||
, ppPicts
|
||||
, itFloorPicts
|
||||
, crPicts
|
||||
, clPicts
|
||||
, buttonPicts
|
||||
, ptPicts
|
||||
, ptPicts'
|
||||
, afterPtPicts'
|
||||
, wlPicts
|
||||
, wallShadows
|
||||
, smokeShadows
|
||||
]
|
||||
where
|
||||
screenShift = id--scale zoomx zoomy . rotate (0 - (_cameraRot w) )
|
||||
-- . uncurry translate ((0,0) -.- _cameraPos w)
|
||||
zoomx = 2 * _cameraZoom w / _windowX w
|
||||
zoomy = 2 * _cameraZoom w / _windowY w
|
||||
scaler = scale (2 / _windowX w) (2 / _windowY w)
|
||||
decPicts = IM.elems $ _decorations w
|
||||
ptPicts = map _ptPict (IM.elems (_particles w))
|
||||
ptPicts' = map _ptPict' $ _particles' w
|
||||
@@ -565,13 +559,6 @@ displayHP n w = translate (halfWidth w-70) (halfHeight w-40) $
|
||||
|
||||
testPic w = blank
|
||||
|
||||
wallsForGloom :: World -> [(Point2,Point2)]
|
||||
wallsForGloom w = map (\(x:y:_) -> (screenShift x,screenShift y)) $
|
||||
map _wlLine $ filter (not . _wlIsSeeThrough)
|
||||
$ IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
|
||||
where screenShift x = zoom *.* rotateV (0 - _cameraRot w) (x -.- _cameraPos w)
|
||||
zoom = _cameraZoom w
|
||||
|
||||
wallsForGloom' :: World -> [(Point2,Point2,Point2,Point2)]
|
||||
wallsForGloom' w = map (wallPairToFour . _wlLine) $ filter (not . _wlIsSeeThrough)
|
||||
$ IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
|
||||
|
||||
Reference in New Issue
Block a user