diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010-2014 Benjamin Lippmeier +Copyright (c) 2010-2016 The Gloss Development Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/gloss-examples.cabal b/gloss-examples.cabal --- a/gloss-examples.cabal +++ b/gloss-examples.cabal @@ -1,5 +1,5 @@ Name: gloss-examples -Version: 1.10.1.1 +Version: 1.10.2.1 License: MIT License-file: LICENSE Author: Ben Lippmeier @@ -29,7 +29,7 @@ Executable gloss-bitmap Build-depends: - base == 4.8.*, + base == 4.9.*, bytestring == 0.10.*, bmp == 1.2.*, gloss == 1.10.* @@ -40,7 +40,7 @@ Executable gloss-boids Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs other-modules: KDTree2d Vec2 @@ -50,7 +50,7 @@ Executable gloss-clock Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Clock @@ -59,8 +59,8 @@ Executable gloss-color Build-depends: - base == 4.8.*, - vector == 0.10.*, + base == 4.9.*, + vector == 0.11.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Color @@ -70,8 +70,8 @@ Executable gloss-conway Build-depends: - base == 4.8.*, - vector == 0.10.*, + base == 4.9.*, + vector == 0.11.*, gloss == 1.10.* Main-is: Main.hs other-modules: Cell World @@ -81,7 +81,7 @@ Executable gloss-draw Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Draw @@ -90,7 +90,7 @@ Executable gloss-easy Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Easy @@ -99,7 +99,7 @@ Executable gloss-eden Build-depends: - base == 4.8.*, + base == 4.9.*, random == 1.1.*, gloss == 1.10.* Main-is: Main.hs @@ -110,7 +110,7 @@ Executable gloss-flake Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Flake @@ -119,7 +119,7 @@ Executable gloss-gameevent Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/GameEvent @@ -128,7 +128,7 @@ Executable gloss-hello Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Hello @@ -137,7 +137,7 @@ Executable gloss-lifespan Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.*, random == 1.1.* Main-is: Main.hs @@ -148,7 +148,7 @@ Executable gloss-machina Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Machina @@ -157,7 +157,7 @@ Executable gloss-occlusion Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.*, gloss-algorithms == 1.10.* Main-is: Main.hs @@ -168,8 +168,8 @@ Executable gloss-styrene Build-depends: - base == 4.8.*, - ghc-prim == 0.4.*, + base == 4.9.*, + ghc-prim == 0.5.*, containers == 0.5.*, gloss == 1.10.* Main-is: Main.hs @@ -180,7 +180,7 @@ Executable gloss-tree Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Tree @@ -189,8 +189,8 @@ Executable gloss-visibility Build-depends: - base == 4.8.*, - vector == 0.10.*, + base == 4.9.*, + vector == 0.11.*, gloss == 1.10.* Main-is: Main.hs other-modules: Draw Interface State World Geometry.Randomish Geometry.Segment @@ -200,7 +200,7 @@ Executable gloss-zen Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Zen @@ -209,7 +209,7 @@ Executable gloss-crystal Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.*, gloss-raster == 1.10.* Main-is: Main.hs @@ -233,7 +233,7 @@ Executable gloss-ray Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.*, gloss-raster == 1.10.* Main-is: Main.hs @@ -252,7 +252,7 @@ Executable gloss-pulse Build-depends: - base == 4.8.*, + base == 4.9.*, gloss == 1.10.*, gloss-raster == 1.10.* Main-is: Main.hs @@ -270,9 +270,9 @@ Executable gloss-wave Build-depends: - base == 4.8.*, - ghc-prim == 0.4.*, - vector == 0.10.*, + base == 4.9.*, + ghc-prim == 0.5.*, + vector == 0.11.*, gloss == 1.10.*, gloss-raster == 1.10.* Main-is: Main.hs @@ -290,9 +290,9 @@ Executable gloss-fluid Build-depends: - base == 4.8.*, - ghc-prim == 0.4.*, - vector == 0.10.*, + base == 4.9.*, + ghc-prim == 0.5.*, + vector == 0.11.*, repa == 3.4.*, repa-io == 3.4.*, repa-algorithms == 3.4.*, @@ -322,7 +322,7 @@ Executable gloss-snow Build-depends: - base == 4.8.*, + base == 4.9.*, repa == 3.4.*, gloss == 1.10.* Main-is: Main.hs @@ -340,7 +340,7 @@ Executable gloss-mandel Build-depends: - base == 4.8.*, + base == 4.9.*, repa == 3.4.*, gloss == 1.10.* Main-is: Main.hs @@ -364,7 +364,7 @@ Executable gloss-graph Build-depends: - base == 4.8.*, + base == 4.9.*, containers == 0.5.*, gloss == 1.10.* Main-is: Main.hs @@ -375,7 +375,7 @@ Executable gloss-render Build-depends: - base == 4.8.*, + base == 4.9.*, containers == 0.5.*, gloss == 1.10.*, gloss-rendering == 1.10.*, diff --git a/raster/Fluid/src-repa/Stage/Advection.hs b/raster/Fluid/src-repa/Stage/Advection.hs --- a/raster/Fluid/src-repa/Stage/Advection.hs +++ b/raster/Fluid/src-repa/Stage/Advection.hs @@ -12,7 +12,7 @@ -- | Apply a velocity field to another field. -- Both fields must have the same extent. advection - :: (FieldElt a, Unbox a, Show a) + :: (FieldElt a, Unbox a) => Delta -> VelocityField -> Field a @@ -36,7 +36,7 @@ -- | Compute the new field value at the given location. advectElem - :: (FieldElt a, Unbox a) + :: (FieldElt a) => Delta -- ^ Time delta (in seconds) -> VelocityField -- ^ Velocity field that moves the source field. -> (DIM2 -> a) -- ^ Get an element from the source field. diff --git a/raster/Fluid/src-repa/Stage/Linear.hs b/raster/Fluid/src-repa/Stage/Linear.hs --- a/raster/Fluid/src-repa/Stage/Linear.hs +++ b/raster/Fluid/src-repa/Stage/Linear.hs @@ -15,7 +15,7 @@ ------------------------------------------------------------------------------- linearSolver - :: (FieldElt a, Source U a, Unbox a, Elt a, Num a, Show a) + :: (FieldElt a, Source U a, Unbox a, Elt a, Num a) => Field a -- ^ Original field. -> Field a -- ^ Current field. -> Float @@ -89,7 +89,7 @@ -- Unstable ------------------------------------------------------------------- unstableSolver - :: (FieldElt a, Source U a, Unbox a, Elt a, Num a, Show a) + :: (FieldElt a, Source U a, Unbox a, Elt a, Num a) => Field a -- ^ Original field. -> Field a -- ^ Current field. -> Float diff --git a/raster/Fluid/src-repa/Stage/Sources.hs b/raster/Fluid/src-repa/Stage/Sources.hs --- a/raster/Fluid/src-repa/Stage/Sources.hs +++ b/raster/Fluid/src-repa/Stage/Sources.hs @@ -11,7 +11,7 @@ -- | Addition of forces stage for simulation addSources - :: (FieldElt a, FieldSource a, Unbox a) + :: (FieldSource a, Unbox a) => Delta -- ^ Time delta. -> a -- ^ Value to insert. -> Maybe (SourceDensity a) @@ -28,7 +28,7 @@ insertSource - :: (FieldElt a, FieldSource a) + :: (FieldSource a) => Delta -> a -- ^ Value to insert -> DIM2 -> a