diff --git a/Boids/Main.hs b/Boids/Main.hs --- a/Boids/Main.hs +++ b/Boids/Main.hs @@ -11,7 +11,7 @@ import Debug.Trace import Graphics.Gloss import Graphics.Gloss.Data.Picture -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate -- Parameters ----------------------------------------------------------------- diff --git a/Conway/Main.hs b/Conway/Main.hs --- a/Conway/Main.hs +++ b/Conway/Main.hs @@ -3,7 +3,6 @@ import World import Cell import Graphics.Gloss -import Graphics.Gloss.Interface.Simulate import qualified Data.Vector as Vec main :: IO () diff --git a/Conway/World.hs b/Conway/World.hs --- a/Conway/World.hs +++ b/Conway/World.hs @@ -5,7 +5,7 @@ import System.Random import Control.Monad import Graphics.Gloss -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import qualified Data.Vector as Vec type Vec = Vec.Vector diff --git a/Draw/Main.hs b/Draw/Main.hs --- a/Draw/Main.hs +++ b/Draw/Main.hs @@ -1,7 +1,7 @@ {-# LANGUAGE PatternGuards #-} -- | Simple picture drawing application. -- Like MSPaint, but you can only draw lines. -import Graphics.Gloss.Interface.Game +import Graphics.Gloss.Interface.Pure.Game import Graphics.Gloss import Data.Maybe (maybe) import Debug.Trace diff --git a/Eden/Main.hs b/Eden/Main.hs --- a/Eden/Main.hs +++ b/Eden/Main.hs @@ -3,7 +3,7 @@ module Main where import World import Graphics.Gloss -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import System.Random -- varying prng sequence diff --git a/Eden/World.hs b/Eden/World.hs --- a/Eden/World.hs +++ b/Eden/World.hs @@ -1,7 +1,7 @@ module World where import Graphics.Gloss -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import System.Random import Community import Cell diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010 Benjamin Lippmeier +Copyright (c) 2010-2012 Benjamin Lippmeier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/Lifespan/Main.hs b/Lifespan/Main.hs --- a/Lifespan/Main.hs +++ b/Lifespan/Main.hs @@ -3,7 +3,7 @@ module Main where import World import Graphics.Gloss -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import System.Random -- varying prng sequence diff --git a/Lifespan/World.hs b/Lifespan/World.hs --- a/Lifespan/World.hs +++ b/Lifespan/World.hs @@ -1,7 +1,7 @@ module World where import Graphics.Gloss -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import System.Random import Community import Cell diff --git a/Occlusion/Main.hs b/Occlusion/Main.hs --- a/Occlusion/Main.hs +++ b/Occlusion/Main.hs @@ -4,7 +4,7 @@ import Data import State import Cell -import Graphics.Gloss.Interface.Game +import Graphics.Gloss.Interface.Pure.Game import Graphics.Gloss.Data.QuadTree import Graphics.Gloss.Data.Extent import System.Environment diff --git a/Occlusion/State.hs b/Occlusion/State.hs --- a/Occlusion/State.hs +++ b/Occlusion/State.hs @@ -2,7 +2,7 @@ module State where import World -import Graphics.Gloss.Interface.Game +import Graphics.Gloss.Interface.Pure.Game -- | The game state. data State diff --git a/Occlusion/World.hs b/Occlusion/World.hs --- a/Occlusion/World.hs +++ b/Occlusion/World.hs @@ -2,7 +2,7 @@ module World where import Cell -import Graphics.Gloss.Interface.Game +import Graphics.Gloss.Interface.Pure.Game import Graphics.Gloss.Data.Extent import Graphics.Gloss.Data.QuadTree import Graphics.Gloss.Algorithms.RayCast diff --git a/Styrene/Advance.hs b/Styrene/Advance.hs --- a/Styrene/Advance.hs +++ b/Styrene/Advance.hs @@ -10,7 +10,7 @@ import Config import Graphics.Gloss.Geometry -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import Graphics.Gloss.Data.Point import Graphics.Gloss.Data.Vector diff --git a/Styrene/Main.hs b/Styrene/Main.hs --- a/Styrene/Main.hs +++ b/Styrene/Main.hs @@ -9,7 +9,7 @@ import Graphics.Gloss import Graphics.Gloss.Geometry -import Graphics.Gloss.Interface.Simulate +import Graphics.Gloss.Interface.Pure.Simulate import Graphics.Gloss.Data.Vector import qualified Data.Map as Map diff --git a/Visibility/Interface.hs b/Visibility/Interface.hs --- a/Visibility/Interface.hs +++ b/Visibility/Interface.hs @@ -4,7 +4,7 @@ , stepState) where import State -import qualified Graphics.Gloss.Interface.Game as G +import qualified Graphics.Gloss.Interface.Pure.Game as G -- Input ------------------------------------------------------------------------------------------ -- | Handle an input event. diff --git a/Visibility/Main.hs b/Visibility/Main.hs --- a/Visibility/Main.hs +++ b/Visibility/Main.hs @@ -15,7 +15,7 @@ import Draw import State import World -import Graphics.Gloss.Interface.Game +import Graphics.Gloss.Interface.Pure.Game main :: IO () main 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.6.1.1 +Version: 1.7.0.1 License: MIT License-file: LICENSE Author: Ben Lippmeier @@ -21,7 +21,7 @@ Executable gloss-bitmap Build-depends: base == 4.*, - gloss == 1.6.*, + gloss == 1.7.*, bytestring == 0.9.*, bmp == 1.2.* Main-is: Main.hs @@ -32,7 +32,7 @@ Executable gloss-boids Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Main.hs other-modules: KDTree2d Vec2 hs-source-dirs: Boids @@ -42,7 +42,7 @@ Executable gloss-clock Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Clock/Main.hs ghc-options: -threaded -O2 @@ -50,7 +50,7 @@ Executable gloss-conway Build-depends: base == 4.*, - gloss == 1.6.*, + gloss == 1.7.*, vector >= 0.7 && < 1.0 Main-is: Main.hs other-modules: Cell World @@ -61,7 +61,7 @@ Executable gloss-draw Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Main.hs hs-source-dirs: Draw ghc-options: -threaded -O2 @@ -70,7 +70,7 @@ Executable gloss-easy Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Easy/Main.hs ghc-options: -threaded -O2 @@ -78,7 +78,7 @@ Executable gloss-eden Build-depends: base == 4.*, - gloss == 1.6.*, + gloss == 1.7.*, random == 1.0.* Main-is: Main.hs other-modules: Cell Community World @@ -89,7 +89,7 @@ Executable gloss-flake Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Flake/Main.hs ghc-options: -threaded -O2 @@ -97,7 +97,7 @@ Executable gloss-gameevent Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Main.hs hs-source-dirs: GameEvent ghc-options: -threaded -O2 @@ -106,7 +106,7 @@ Executable gloss-hello Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Hello/Main.hs ghc-options: -threaded -O2 @@ -114,7 +114,7 @@ Executable gloss-lifespan Build-depends: base == 4.*, - gloss == 1.6.*, + gloss == 1.7.*, random == 1.0.* Main-is: Main.hs other-modules: Cell Community World @@ -125,7 +125,7 @@ Executable gloss-machina Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Machina/Main.hs ghc-options: -threaded -O2 @@ -133,7 +133,7 @@ Executable gloss-occlusion Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Main.hs other-modules: Cell World State Data hs-source-dirs: Occlusion @@ -143,7 +143,7 @@ Executable gloss-styrene Build-depends: base == 4.*, - gloss == 1.6.*, + gloss == 1.7.*, containers >= 0.3 && <= 0.5, ghc-prim == 0.2.* Main-is: Main.hs @@ -155,7 +155,7 @@ Executable gloss-tree Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Tree/Main.hs ghc-options: -threaded -O2 @@ -163,7 +163,7 @@ Executable gloss-visibility Build-depends: base == 4.*, - gloss == 1.6.*, + gloss == 1.7.*, vector >= 0.7 && < 1.0 Main-is: Main.hs other-modules: Draw Interface State World Geometry.Randomish Geometry.Segment @@ -174,9 +174,8 @@ Executable gloss-zen Build-depends: base == 4.*, - gloss == 1.6.* + gloss == 1.7.* Main-is: Zen/Main.hs ghc-options: -threaded -O2 -