gloss-examples 1.9.4.1 → 1.10.1.1
raw patch · 4 files changed
+38/−36 lines, 4 filesdep ~glossdep ~gloss-algorithmsdep ~gloss-raster
Dependency ranges changed: gloss, gloss-algorithms, gloss-raster, gloss-rendering
Files
- gloss-examples.cabal +34/−34
- picture/Styrene/Main.hs +1/−1
- raster/Fluid/src-repa/Model.hs +1/−0
- raster/Mandel/Solver.hs +2/−1
gloss-examples.cabal view
@@ -1,5 +1,5 @@ Name: gloss-examples-Version: 1.9.4.1+Version: 1.10.1.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.4.*+ gloss == 1.10.* 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.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: KDTree2d Vec2 hs-source-dirs: picture/Boids@@ -51,7 +51,7 @@ Executable gloss-clock Build-depends: base == 4.8.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Clock ghc-options: -threaded -O2@@ -61,7 +61,7 @@ Build-depends: base == 4.8.*, vector == 0.10.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Color ghc-options: -threaded -O2@@ -72,7 +72,7 @@ Build-depends: base == 4.8.*, vector == 0.10.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: Cell World hs-source-dirs: picture/Conway@@ -82,7 +82,7 @@ Executable gloss-draw Build-depends: base == 4.8.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Draw ghc-options: -threaded -O2@@ -91,7 +91,7 @@ Executable gloss-easy Build-depends: base == 4.8.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Easy ghc-options: -threaded -O2@@ -101,7 +101,7 @@ Build-depends: base == 4.8.*, random == 1.1.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: Cell Community World hs-source-dirs: picture/Eden@@ -111,7 +111,7 @@ Executable gloss-flake Build-depends: base == 4.8.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Flake ghc-options: -threaded -O2@@ -120,7 +120,7 @@ Executable gloss-gameevent Build-depends: base == 4.8.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/GameEvent ghc-options: -threaded -O2@@ -129,7 +129,7 @@ Executable gloss-hello Build-depends: base == 4.8.*, - gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Hello ghc-options: -threaded -O2@@ -138,7 +138,7 @@ Executable gloss-lifespan Build-depends: base == 4.8.*, - gloss == 1.9.4.*,+ gloss == 1.10.*, random == 1.1.* Main-is: Main.hs other-modules: Cell Community World@@ -149,7 +149,7 @@ Executable gloss-machina Build-depends: base == 4.8.*, - gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Machina ghc-options: -threaded -O2@@ -158,8 +158,8 @@ Executable gloss-occlusion Build-depends: base == 4.8.*, - gloss == 1.9.4.*,- gloss-algorithms == 1.9.4.*+ gloss == 1.10.*,+ gloss-algorithms == 1.10.* Main-is: Main.hs other-modules: Cell World State Data hs-source-dirs: picture/Occlusion@@ -171,7 +171,7 @@ base == 4.8.*, ghc-prim == 0.4.*, containers == 0.5.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: Actor Advance Collide Config Contact QuadTree World hs-source-dirs: picture/Styrene@@ -181,7 +181,7 @@ Executable gloss-tree Build-depends: base == 4.8.*, - gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Tree ghc-options: -threaded -O2@@ -191,7 +191,7 @@ Build-depends: base == 4.8.*, vector == 0.10.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: Draw Interface State World Geometry.Randomish Geometry.Segment hs-source-dirs: picture/Visibility @@ -201,7 +201,7 @@ Executable gloss-zen Build-depends: base == 4.8.*, - gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Zen ghc-options: -threaded -O2@@ -210,8 +210,8 @@ Executable gloss-crystal Build-depends: base == 4.8.*,- gloss == 1.9.4.*,- gloss-raster == 1.9.4.*+ gloss == 1.10.*,+ gloss-raster == 1.10.* Main-is: Main.hs hs-source-dirs: raster/Crystal @@ -234,8 +234,8 @@ Executable gloss-ray Build-depends: base == 4.8.*,- gloss == 1.9.4.*,- gloss-raster == 1.9.4.*+ gloss == 1.10.*,+ gloss-raster == 1.10.* Main-is: Main.hs other-modules: Light Object Trace Vec3 World hs-source-dirs: raster/Ray@@ -253,8 +253,8 @@ Executable gloss-pulse Build-depends: base == 4.8.*,- gloss == 1.9.4.*,- gloss-raster == 1.9.4.*+ gloss == 1.10.*,+ gloss-raster == 1.10.* Main-is: Main.hs hs-source-dirs: raster/Pulse ghc-options:@@ -273,8 +273,8 @@ base == 4.8.*, ghc-prim == 0.4.*, vector == 0.10.*,- gloss == 1.9.4.*,- gloss-raster == 1.9.4.*+ gloss == 1.10.*,+ gloss-raster == 1.10.* Main-is: Main.hs hs-source-dirs: raster/Wave ghc-options:@@ -296,7 +296,7 @@ repa == 3.4.*, repa-io == 3.4.*, repa-algorithms == 3.4.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: Args Config FieldElt Model UserEvent@@ -324,7 +324,7 @@ Build-depends: base == 4.8.*, repa == 3.4.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: raster/Snow ghc-options:@@ -342,7 +342,7 @@ Build-depends: base == 4.8.*, repa == 3.4.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs other-modules: Solver hs-source-dirs: raster/Mandel@@ -366,7 +366,7 @@ Build-depends: base == 4.8.*, containers == 0.5.*,- gloss == 1.9.4.*+ gloss == 1.10.* Main-is: Main.hs hs-source-dirs: picture/Graph ghc-options:@@ -377,8 +377,8 @@ Build-depends: base == 4.8.*, containers == 0.5.*,- gloss == 1.9.4.*,- gloss-rendering == 1.9.3.*,+ gloss == 1.10.*,+ gloss-rendering == 1.10.*, GLFW-b Main-is: Main.hs hs-source-dirs: picture/Render
picture/Styrene/Main.hs view
@@ -18,7 +18,7 @@ main = simulate - (InWindow "Polystyrene - right-click-drag rotates"+ (InWindow "Polystyrene - alt-left-click-drag rotates" (600, 600) -- x and y size of window (in pixels). (10, 10)) -- position of window black -- background color
raster/Fluid/src-repa/Model.hs view
@@ -129,6 +129,7 @@ let picDens :: G.Picture picDens = G.bitmapOfForeignPtr width' height'+ (G.BitmapFormat G.BottomToTop G.PxABGR) (R.toForeignPtr $ unsafeCoerce arrDensity) False
raster/Mandel/Solver.hs view
@@ -102,7 +102,8 @@ = Scale (fromIntegral zoomX) (fromIntegral zoomY) $ bitmapOfForeignPtr sizeX sizeY -- raw image size- (R.toForeignPtr $ unsafeCoerce arrRGB) + (BitmapFormat BottomToTop PxABGR)+ (R.toForeignPtr $ unsafeCoerce arrRGB) -- the image data. False -- don't cache this in texture memory.