diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..819438611c0b3db70a8557a4af37e66123d5ee1f --- /dev/null +++ b/LICENSE @@ -0,0 +1,30 @@ +Copyright (c) 2014, Frank Staals + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Frank Staals nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/freeglut.dll b/freeglut.dll new file mode 100644 index 0000000000000000000000000000000000000000..1feaac4db9b4e27c7b7d1ea8ac80f4939e94749b Binary files /dev/null and b/freeglut.dll differ diff --git a/gloss-counter.cabal b/gloss-counter.cabal new file mode 100644 index 0000000000000000000000000000000000000000..8f86a5851bcdd2962f3cdd32463a375ca176f870 --- /dev/null +++ b/gloss-counter.cabal @@ -0,0 +1,19 @@ +name: gloss-counter +version: 0.1.0.0 +author: Alejandro Serrano +maintainer: A.SerranoMena@uu.nl +category: Game +build-type: Simple +cabal-version: >=1.10 + + +executable gloss-counter + main-is: Main.hs + build-depends: base >= 4 && < 5, + gloss, + random + hs-source-dirs: src + other-modules: Controller + , Model + , View + default-language: Haskell2010 \ No newline at end of file diff --git a/hie.yaml b/hie.yaml new file mode 100644 index 0000000000000000000000000000000000000000..04cd24395e4d108febbd22b6ce41a92f7fe0d065 --- /dev/null +++ b/hie.yaml @@ -0,0 +1,2 @@ +cradle: + cabal: diff --git a/if_you_use_stack_rename_this_to_stack.yaml b/if_you_use_stack_rename_this_to_stack.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1b2dda586b3a8a20fac9f8cda77f25ed5aa07b7f --- /dev/null +++ b/if_you_use_stack_rename_this_to_stack.yaml @@ -0,0 +1,65 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# resolver: ghcjs-0.1.0_ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: lts-14.6 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# - location: +# git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# subdirs: +# - auto-update +# - wai +packages: +- . +# Dependency packages to be pulled from upstream that are not in the resolver +# using the same syntax as the packages field. +# (e.g., acme-missiles-0.3) +#extra-deps: [] + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=1.7" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor \ No newline at end of file diff --git a/src/Controller.hs b/src/Controller.hs new file mode 100644 index 0000000000000000000000000000000000000000..00029d78a6f64aa12d22f6528d2bf322dd4ddd06 --- /dev/null +++ b/src/Controller.hs @@ -0,0 +1,31 @@ +-- | This module defines how the state changes +-- in response to time and user input +module Controller where + +import Model + +import Graphics.Gloss +import Graphics.Gloss.Interface.IO.Game +import System.Random + +-- | Handle one iteration of the game +step :: Float -> GameState -> IO GameState +step secs gstate + | elapsedTime gstate + secs > nO_SECS_BETWEEN_CYCLES + = -- We show a new random number + do randomNumber <- randomIO + let newNumber = abs randomNumber `mod` 10 + return $ GameState (ShowANumber newNumber) 0 + | otherwise + = -- Just update the elapsed time + return $ gstate { elapsedTime = elapsedTime gstate + secs } + +-- | Handle user input +input :: Event -> GameState -> IO GameState +input e gstate = return (inputKey e gstate) + +inputKey :: Event -> GameState -> GameState +inputKey (EventKey (Char c) _ _ _) gstate + = -- If the user presses a character key, show that one + gstate { infoToShow = ShowAChar c } +inputKey _ gstate = gstate -- Otherwise keep the same \ No newline at end of file diff --git a/src/Main.hs b/src/Main.hs new file mode 100644 index 0000000000000000000000000000000000000000..9c7cdab14f5d1b971470e2d2be413e65aaf5e436 --- /dev/null +++ b/src/Main.hs @@ -0,0 +1,16 @@ +module Main where + +import Controller +import Model +import View + +import Graphics.Gloss.Interface.IO.Game + +main :: IO () +main = playIO (InWindow "Counter" (400, 400) (0, 0)) -- Or FullScreen + black -- Background color + 10 -- Frames per second + initialState -- Initial state + view -- View function + input -- Event function + step -- Step function \ No newline at end of file diff --git a/src/Model.hs b/src/Model.hs new file mode 100644 index 0000000000000000000000000000000000000000..769848c5eb35f1e9e69ba34066182e7936d8578f --- /dev/null +++ b/src/Model.hs @@ -0,0 +1,18 @@ +-- | This module contains the data types +-- which represent the state of the game +module Model where + +data InfoToShow = ShowNothing + | ShowANumber Int + | ShowAChar Char + +nO_SECS_BETWEEN_CYCLES :: Float +nO_SECS_BETWEEN_CYCLES = 5 + +data GameState = GameState { + infoToShow :: InfoToShow + , elapsedTime :: Float + } + +initialState :: GameState +initialState = GameState ShowNothing 0 \ No newline at end of file diff --git a/src/View.hs b/src/View.hs new file mode 100644 index 0000000000000000000000000000000000000000..510ffd22cb2bbdfe684db23e1ff460f727af3d09 --- /dev/null +++ b/src/View.hs @@ -0,0 +1,15 @@ +-- | This module defines how to turn +-- the game state into a picture +module View where + +import Graphics.Gloss +import Model + +view :: GameState -> IO Picture +view = return . viewPure + +viewPure :: GameState -> Picture +viewPure gstate = case infoToShow gstate of + ShowNothing -> blank + ShowANumber n -> color green (text (show n)) + ShowAChar c -> color green (text [c]) \ No newline at end of file