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.9.3.1 +Version: 1.9.4.1 License: MIT License-file: LICENSE Author: Ben Lippmeier @@ -32,7 +32,7 @@ base == 4.8.*, bytestring == 0.10.*, bmp == 1.2.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Bitmap ghc-options: -threaded -O2 @@ -41,7 +41,7 @@ Executable gloss-boids Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: KDTree2d Vec2 hs-source-dirs: picture/Boids @@ -51,17 +51,28 @@ Executable gloss-clock Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Clock ghc-options: -threaded -O2 +Executable gloss-color + Build-depends: + base == 4.8.*, + vector == 0.10.*, + gloss == 1.9.4.* + Main-is: Main.hs + hs-source-dirs: picture/Color + ghc-options: -threaded -O2 + extensions: ParallelListComp + + Executable gloss-conway Build-depends: base == 4.8.*, vector == 0.10.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: Cell World hs-source-dirs: picture/Conway @@ -71,7 +82,7 @@ Executable gloss-draw Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Draw ghc-options: -threaded -O2 @@ -80,7 +91,7 @@ Executable gloss-easy Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Easy ghc-options: -threaded -O2 @@ -90,7 +101,7 @@ Build-depends: base == 4.8.*, random == 1.1.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: Cell Community World hs-source-dirs: picture/Eden @@ -100,7 +111,7 @@ Executable gloss-flake Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Flake ghc-options: -threaded -O2 @@ -109,7 +120,7 @@ Executable gloss-gameevent Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/GameEvent ghc-options: -threaded -O2 @@ -118,7 +129,7 @@ Executable gloss-hello Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Hello ghc-options: -threaded -O2 @@ -127,7 +138,7 @@ Executable gloss-lifespan Build-depends: base == 4.8.*, - gloss == 1.9.3.*, + gloss == 1.9.4.*, random == 1.1.* Main-is: Main.hs other-modules: Cell Community World @@ -138,7 +149,7 @@ Executable gloss-machina Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Machina ghc-options: -threaded -O2 @@ -147,8 +158,8 @@ Executable gloss-occlusion Build-depends: base == 4.8.*, - gloss == 1.9.3.*, - gloss-algorithms == 1.9.3.* + gloss == 1.9.4.*, + gloss-algorithms == 1.9.4.* Main-is: Main.hs other-modules: Cell World State Data hs-source-dirs: picture/Occlusion @@ -160,7 +171,7 @@ base == 4.8.*, ghc-prim == 0.4.*, containers == 0.5.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: Actor Advance Collide Config Contact QuadTree World hs-source-dirs: picture/Styrene @@ -170,7 +181,7 @@ Executable gloss-tree Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Tree ghc-options: -threaded -O2 @@ -180,7 +191,7 @@ Build-depends: base == 4.8.*, vector == 0.10.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: Draw Interface State World Geometry.Randomish Geometry.Segment hs-source-dirs: picture/Visibility @@ -190,7 +201,7 @@ Executable gloss-zen Build-depends: base == 4.8.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Zen ghc-options: -threaded -O2 @@ -199,8 +210,8 @@ Executable gloss-crystal Build-depends: base == 4.8.*, - gloss == 1.9.3.*, - gloss-raster == 1.9.3.* + gloss == 1.9.4.*, + gloss-raster == 1.9.4.* Main-is: Main.hs hs-source-dirs: raster/Crystal @@ -223,8 +234,8 @@ Executable gloss-ray Build-depends: base == 4.8.*, - gloss == 1.9.3.*, - gloss-raster == 1.9.3.* + gloss == 1.9.4.*, + gloss-raster == 1.9.4.* Main-is: Main.hs other-modules: Light Object Trace Vec3 World hs-source-dirs: raster/Ray @@ -242,8 +253,8 @@ Executable gloss-pulse Build-depends: base == 4.8.*, - gloss == 1.9.3.*, - gloss-raster == 1.9.3.* + gloss == 1.9.4.*, + gloss-raster == 1.9.4.* Main-is: Main.hs hs-source-dirs: raster/Pulse ghc-options: @@ -262,8 +273,8 @@ base == 4.8.*, ghc-prim == 0.4.*, vector == 0.10.*, - gloss == 1.9.3.*, - gloss-raster == 1.9.3.* + gloss == 1.9.4.*, + gloss-raster == 1.9.4.* Main-is: Main.hs hs-source-dirs: raster/Wave ghc-options: @@ -285,7 +296,7 @@ repa == 3.4.*, repa-io == 3.4.*, repa-algorithms == 3.4.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: Args Config FieldElt Model UserEvent @@ -313,7 +324,7 @@ Build-depends: base == 4.8.*, repa == 3.4.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: raster/Snow ghc-options: @@ -331,7 +342,7 @@ Build-depends: base == 4.8.*, repa == 3.4.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs other-modules: Solver hs-source-dirs: raster/Mandel @@ -355,7 +366,7 @@ Build-depends: base == 4.8.*, containers == 0.5.*, - gloss == 1.9.3.* + gloss == 1.9.4.* Main-is: Main.hs hs-source-dirs: picture/Graph ghc-options: @@ -366,7 +377,7 @@ Build-depends: base == 4.8.*, containers == 0.5.*, - gloss == 1.9.3.*, + gloss == 1.9.4.*, gloss-rendering == 1.9.3.*, GLFW-b Main-is: Main.hs diff --git a/picture/Color/Main.hs b/picture/Color/Main.hs new file mode 100644 --- /dev/null +++ b/picture/Color/Main.hs @@ -0,0 +1,31 @@ + +-- Draw a color wheel. +import Graphics.Gloss + +main + = display + (InWindow "Colors" (800, 800) (5, 5)) + (greyN 0.4) + (Pictures + [ Translate + (200 * cos (2 * pi * (fromIntegral n) / 12)) + (200 * sin (2 * pi * (fromIntegral n) / 12)) + $ Color (withAlpha 0.8 c) $ circleSolid 100 + | n <- [0 .. length colors] + | c <- colors ]) +colors + = [ red + , orange + , yellow + , chartreuse + , green + , aquamarine + , cyan + , azure + , blue + , violet + , magenta + , rose + ] + +