diff --git a/gloss-examples.cabal b/gloss-examples.cabal --- a/gloss-examples.cabal +++ b/gloss-examples.cabal @@ -1,11 +1,11 @@ Name: gloss-examples -Version: 1.13.0.2 +Version: 1.13.0.3 License: MIT License-file: LICENSE Author: Ben Lippmeier Maintainer: benl@ouroborus.net Build-Type: Simple -Cabal-Version: >=1.6 +Cabal-Version: >=1.10 Stability: experimental Category: Graphics Homepage: http://gloss.ouroborus.net @@ -36,11 +36,14 @@ Main-is: Main.hs hs-source-dirs: picture/Bitmap Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , bytestring == 0.10.* , bmp == 1.2.* , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -57,12 +60,15 @@ KDTree2d Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 + , random == 1.1.* , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 - -Wall -threaded -rtsopts @@ -72,9 +78,12 @@ hs-source-dirs: picture/Clock Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -87,10 +96,13 @@ hs-source-dirs: picture/Color Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , vector >= 0.11 && < 0.13 + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -107,10 +119,14 @@ World Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 + , random == 1.1.* , gloss == 1.13.* , vector >= 0.11 && < 0.13 + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -123,9 +139,12 @@ hs-source-dirs: picture/Draw Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -138,9 +157,12 @@ hs-source-dirs: picture/Easy Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -158,10 +180,13 @@ World Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , random == 1.1.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -174,9 +199,12 @@ hs-source-dirs: picture/Flake Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -189,9 +217,12 @@ hs-source-dirs: picture/GameEvent Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -204,9 +235,12 @@ hs-source-dirs: picture/Hello Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -224,10 +258,13 @@ World Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , random == 1.1.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -240,9 +277,12 @@ hs-source-dirs: picture/Machina Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -261,13 +301,15 @@ Data Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , gloss-algorithms == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 - -Wall -threaded -rtsopts @@ -286,11 +328,14 @@ World Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , containers >= 0.5 && < 0.7 , ghc-prim , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -303,9 +348,12 @@ hs-source-dirs: picture/Tree Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -326,10 +374,13 @@ World Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , vector >= 0.11 && < 0.13 + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -342,9 +393,12 @@ hs-source-dirs: picture/Zen Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -357,10 +411,13 @@ hs-source-dirs: raster/Crystal Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , gloss-raster == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -Wall -threaded @@ -391,12 +448,15 @@ World Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , repa == 3.4.* , repa-io == 3.4.* , gloss == 1.13.* , gloss-raster == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -Wall -threaded @@ -420,7 +480,7 @@ hs-source-dirs: raster/Pulse Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , gloss == 1.13.* , gloss-raster == 1.13.* @@ -436,6 +496,9 @@ -funfolding-use-threshold1000 -funfolding-keeness-factor1000 + Default-Language: + Haskell2010 + if flag(llvm) ghc-options: -fllvm @@ -447,12 +510,15 @@ hs-source-dirs: raster/Wave Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , ghc-prim , gloss == 1.13.* , gloss-raster == 1.13.* , vector >= 0.11 && < 0.13 + Default-Language: + Haskell2010 + ghc-options: -Wall -threaded @@ -509,11 +575,15 @@ hs-source-dirs: raster/Snow Build-depends: - base >= 4.8 && < 4.13 - , gloss == 1.13.* + base >= 4.8 && < 5 + , gloss-raster == 1.13.* + , random == 1.1.* , repa == 3.4.* , repa-algorithms == 3.4.* + Default-Language: + Haskell2010 + ghc-options: -Wall -threaded @@ -540,10 +610,16 @@ Solver Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 + , gloss-raster == 1.13.* + , repa-algorithms == 3.4.* + , repa-io == 3.4.* , gloss == 1.13.* , repa == 3.4.* + Default-Language: + Haskell2010 + ghc-options: -Wall -threaded @@ -567,10 +643,14 @@ hs-source-dirs: picture/Graph Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , containers >= 0.5 && < 0.7 + , random == 1.1.* , gloss == 1.13.* + Default-Language: + Haskell2010 + ghc-options: -O2 -Wall @@ -583,9 +663,13 @@ hs-source-dirs: picture/Gravity Build-depends: - base >= 4.8 && < 4.13 + base >= 4.8 && < 5 , containers >= 0.5 && < 0.7 + , random == 1.1.* , gloss == 1.13.* + + Default-Language: + Haskell2010 ghc-options: -O2 diff --git a/picture/Boids/KDTree2d.hs b/picture/Boids/KDTree2d.hs --- a/picture/Boids/KDTree2d.hs +++ b/picture/Boids/KDTree2d.hs @@ -38,7 +38,7 @@ -- | Apply a worker function to all elements of a KDTree. mapKDTree :: KDTreeNode a -> (a -> b) -> [b] mapKDTree Empty _ = [] -mapKDTree (Node l p n r) f = f n : (mapKDTree l f ++ mapKDTree r f) +mapKDTree (Node l _p n r) f = f n : (mapKDTree l f ++ mapKDTree r f) kdtAddWithDepth :: KDTreeNode a -> Vec2 -> a -> Int -> KDTreeNode a @@ -58,6 +58,8 @@ kdtAddPoint t p d = kdtAddWithDepth t p d 0 + +kdtInBounds :: Vec2 -> Vec2 -> Vec2 -> Bool kdtInBounds p bMin bMax = vecLessThan p bMax && vecGreaterThan p bMin diff --git a/picture/Boids/Main.hs b/picture/Boids/Main.hs --- a/picture/Boids/Main.hs +++ b/picture/Boids/Main.hs @@ -10,7 +10,6 @@ import Vec2 import System.Random import System.IO.Unsafe -import Debug.Trace import Graphics.Gloss import Graphics.Gloss.Interface.Pure.Simulate diff --git a/picture/Boids/Vec2.hs b/picture/Boids/Vec2.hs --- a/picture/Boids/Vec2.hs +++ b/picture/Boids/Vec2.hs @@ -45,7 +45,7 @@ vecDimSelect (Vec2 a b) n = case rem n 2 of 0 -> a - 1 -> b + _ -> b vecLessThan :: Vec2 -> Vec2 -> Bool diff --git a/picture/Draw/Main.hs b/picture/Draw/Main.hs --- a/picture/Draw/Main.hs +++ b/picture/Draw/Main.hs @@ -6,7 +6,6 @@ import Graphics.Gloss import Graphics.Gloss.Interface.Pure.Game -import Data.Maybe (maybe) main :: IO () diff --git a/picture/Eden/Cell.hs b/picture/Eden/Cell.hs --- a/picture/Eden/Cell.hs +++ b/picture/Eden/Cell.hs @@ -32,7 +32,5 @@ render :: Cell -> Picture render (Cell (x,y) r gen) = let z = fromIntegral gen * 0.1 - color = makeColor 0.0 z 0.5 1.0 - in Color color - $ Translate x y - $ Circle r + color' = makeColor 0.0 z 0.5 1.0 + in Color color' $ Translate x y $ Circle r