gloss-examples 1.1.1.0 → 1.2.0.0
raw patch · 17 files changed
+38/−32 lines, 17 filesdep ~glossdep ~vector
Dependency ranges changed: gloss, vector
Files
- Clock/Main.hs +4/−4
- Conway/Main.hs +1/−0
- Conway/World.hs +1/−0
- Eden/Main.hs +1/−0
- Eden/World.hs +1/−1
- Lifespan/Main.hs +1/−0
- Lifespan/World.hs +1/−0
- Occlusion/Main.hs +1/−2
- Occlusion/State.hs +1/−1
- Occlusion/World.hs +1/−1
- Styrene/Advance.hs +3/−2
- Styrene/Collide.hs +2/−1
- Styrene/Contact.hs +2/−2
- Styrene/Main.hs +2/−1
- Styrene/QuadTree.hs +1/−1
- Zen/Main.hs +0/−1
- gloss-examples.cabal +15/−15
Clock/Main.hs view
@@ -55,7 +55,7 @@ -- circNm1 = Pictures- [ circle 1 50+ [ circle' 1 50 , Scale (a/2.5) (a/2.5) $ clockFractal (n-1) s , if n > 2 then Color cyan @@ -78,12 +78,12 @@ -- Make a circle of radius r consisting of n lines.-circle :: Float -> Float -> Picture-circle r n+circle' :: Float -> Float -> Picture+circle' r n = Scale r r $ Line (circlePoints n) - + -- A list of n points spaced equally around the unit circle. circlePoints :: Float -> [(Float, Float)] circlePoints n
Conway/Main.hs view
@@ -3,6 +3,7 @@ import World import Cell import Graphics.Gloss+import Graphics.Gloss.Interface.Simulate import qualified Data.Vector as Vec main :: IO ()
Conway/World.hs view
@@ -5,6 +5,7 @@ import System.Random import Control.Monad import Graphics.Gloss+import Graphics.Gloss.Interface.Simulate import qualified Data.Vector as Vec type Vec = Vec.Vector
Eden/Main.hs view
@@ -3,6 +3,7 @@ module Main where import World import Graphics.Gloss+import Graphics.Gloss.Interface.Simulate import System.Random -- varying prng sequence
Eden/World.hs view
@@ -1,7 +1,7 @@ module World where - import Graphics.Gloss+import Graphics.Gloss.Interface.Simulate import System.Random import Community import Cell
Lifespan/Main.hs view
@@ -3,6 +3,7 @@ module Main where import World import Graphics.Gloss+import Graphics.Gloss.Interface.Simulate import System.Random -- varying prng sequence
Lifespan/World.hs view
@@ -1,6 +1,7 @@ module World where import Graphics.Gloss+import Graphics.Gloss.Interface.Simulate import System.Random import Community import Cell
Occlusion/Main.hs view
@@ -4,10 +4,9 @@ import Data import State import Cell-import Graphics.Gloss.Game+import Graphics.Gloss.Interface.Game import Graphics.Gloss.Data.QuadTree import Graphics.Gloss.Data.Extent-import Graphics.Gloss.Shapes import System.Environment import Data.Maybe import Data.List
Occlusion/State.hs view
@@ -2,7 +2,7 @@ module State where import World-import Graphics.Gloss.Game+import Graphics.Gloss.Interface.Game -- | The game state. data State
Occlusion/World.hs view
@@ -2,7 +2,7 @@ module World where import Cell-import Graphics.Gloss.Game+import Graphics.Gloss.Interface.Game import Graphics.Gloss.Data.Extent import Graphics.Gloss.Data.QuadTree import Graphics.Gloss.Algorithms.RayCast
Styrene/Advance.hs view
@@ -10,8 +10,9 @@ import Config import Graphics.Gloss.Geometry-import Graphics.Gloss.ViewPort-import Graphics.Gloss.Picture (Point)+import Graphics.Gloss.Interface.Simulate+import Graphics.Gloss.Data.Point+import Graphics.Gloss.Data.Vector import Data.List import qualified Data.Map as Map
Styrene/Collide.hs view
@@ -2,7 +2,8 @@ module Collide where import World import Actor-import Graphics.Gloss.Picture (Point)+import Graphics.Gloss.Data.Point+import Graphics.Gloss.Data.Vector import Graphics.Gloss.Geometry -- Config -----------------------------------------------------------------------------------------
Styrene/Contact.hs view
@@ -1,11 +1,11 @@-{-# OPTIONS -fglasgow-exts #-}+{-# LANGUAGE MagicHash #-} -- | Find actors in the world that are in contact with each other. module Contact where import World import QuadTree import Actor-import Graphics.Gloss.Picture (Point)+import Graphics.Gloss.Data.Point import Graphics.Gloss.Geometry.Line import Data.Maybe import Data.List
Styrene/Main.hs view
@@ -9,7 +9,8 @@ import Graphics.Gloss import Graphics.Gloss.Geometry-import Graphics.Gloss.Shapes +import Graphics.Gloss.Interface.Simulate+import Graphics.Gloss.Data.Vector import qualified Data.Map as Map import Data.Map (Map)
Styrene/QuadTree.hs view
@@ -5,7 +5,7 @@ , treeInsert , treeElems ) where-import Graphics.Gloss.Picture (Point)+import Graphics.Gloss.Data.Point data QuadTree a -- Nil cells take up space in the world, but don't contain any elements.
Zen/Main.hs view
@@ -2,7 +2,6 @@ -- A nifty animated fractal of a tree, superimposed on a background -- of three red rectangles. import Graphics.Gloss-import Graphics.Gloss.Shapes main :: IO () main
gloss-examples.cabal view
@@ -1,9 +1,9 @@ Name: gloss-examples-Version: 1.1.1.0+Version: 1.2.0.0 License: MIT License-file: LICENSE Author: Ben Lippmeier-Maintainer: gloss@ouroborus.net+Maintainer: benl@ouroborus.net Build-Type: Simple Cabal-Version: >=1.6 Stability: experimental@@ -20,21 +20,21 @@ Executable gloss-easy Build-depends: base == 4.*,- gloss == 1.1.*+ gloss == 1.2.* Main-is: Easy/Main.hs ghc-options: -O2 Executable gloss-clock Build-depends: base == 4.*,- gloss == 1.1.*+ gloss == 1.2.* Main-is: Clock/Main.hs ghc-options: -O2 Executable gloss-eden Build-depends: base == 4.*,- gloss == 1.1.*,+ gloss == 1.2.*, random == 1.0.* Main-is: Main.hs other-modules: Cell Community World@@ -44,21 +44,21 @@ Executable gloss-flake Build-depends: base == 4.*,- gloss == 1.1.*+ gloss == 1.2.* Main-is: Flake/Main.hs ghc-options: -O2 Executable gloss-hello Build-depends: base == 4.*, - gloss == 1.1.*+ gloss == 1.2.* Main-is: Hello/Main.hs ghc-options: -O2 Executable gloss-lifespan Build-depends: base == 4.*, - gloss == 1.1.*, + gloss == 1.2.*, random == 1.0.* Main-is: Main.hs other-modules: Cell Community World@@ -68,7 +68,7 @@ Executable gloss-styrene Build-depends: base == 4.*,- gloss == 1.1.*,+ gloss == 1.2.*, containers == 0.3.*, ghc-prim == 0.2.* Main-is: Main.hs@@ -79,29 +79,29 @@ Executable gloss-tree Build-depends: base == 4.*, - gloss == 1.1.*+ gloss == 1.2.* Main-is: Tree/Main.hs ghc-options: -O2 Executable gloss-zen Build-depends: base == 4.*, - gloss == 1.1.*+ gloss == 1.2.* Main-is: Zen/Main.hs ghc-options: -O2 Executable gloss-machina Build-depends: base == 4.*, - gloss == 1.1.*+ gloss == 1.2.* Main-is: Machina/Main.hs ghc-options: -O2 Executable gloss-conway Build-depends: base == 4.*,- gloss == 1.1.*,- vector >= 0.5 && < 0.7+ gloss == 1.2.*,+ vector >= 0.5 && < 0.8 Main-is: Main.hs other-modules: Cell World hs-source-dirs: Conway@@ -110,7 +110,7 @@ Executable gloss-occlusion Build-depends: base == 4.*, - gloss == 1.1.*+ gloss == 1.2.* Main-is: Main.hs other-modules: Cell World State Data hs-source-dirs: Occlusion