Merge branch 'master' into color-theory

Former-commit-id: 07242075d6ff0b1e1ac0adf697dc8d4eec5592d8
This commit is contained in:
David Himmelstrup 2019-09-17 20:11:05 +08:00
commit 382c4ed341
17 changed files with 256 additions and 44 deletions

View file

@ -41,8 +41,6 @@ dropA :: Double -> Animation -> Animation
dropA d1 (Animation d2 f) = Animation (max 0 (d2-d1)) $
Frame $ \d t -> unFrame f d (t+d1)
o # f = f o
-- screen width 320
-- screen height 180
main :: IO ()