SoccerFun 0.3.3 → 0.3.4

raw patch · 4 files changed

+10/−5 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• SoccerFun.cabal +1/−1
• SoccerFun/Field.hs +1/−1
• SoccerFun/UI/GL.hs +7/−2
• template/Makefile +1/−1

@@ -1,5 +1,5 @@ Name:           SoccerFun-Version:        0.3.3+Version:        0.3.4 Copyright:      (c) 2010, Jan Rochel License:        BSD3 License-File:   LICENSE

@@ -49,7 +49,7 @@ goalAreaDepth = 5.50 :: Float radiusCornerKickArea = 0.90 :: Float -- | not official, taken for rendering-goalPoleWidth = 0.3 :: Float+goalPoleWidth = 0.4 :: Float -- | not official, taken for rendering radiusCentreSpot = 0.3 :: Float 

@@ -1,4 +1,5 @@ {-# LANGUAGE UnicodeSyntax #-}+-- | Usage: Hit /q/ to abort the match module SoccerFun.UI.GL where  import qualified Graphics.UI.GLUT as GL@@ -6,8 +7,7 @@ import Data.IORef import Control.Monad import Unsafe.Coerce-import Data.Maybe---import Control.DeepSeq+import System.Exit  import SoccerFun.MatchControl import SoccerFun.Types@@ -53,10 +53,14 @@ registerCallbacks window aspect match = do 	GL.displayCallback $= display 	GL.reshapeCallback $= Just reshape+	GL.keyboardMouseCallback $= Just inputCallback 	gameLoop --	GL.keyboardMouseCallback $= Just inputCallback 	where +	inputCallback ∷ GL.Key → GL.KeyState → GL.Modifiers → GL.Position → IO ()+	inputCallback (GL.Char 'q') _ _ _ = exitSuccess+ 	gameLoop = do 		((refereeActions,playerWithActions),match') ← liftM stepMatch $ readIORef match 		writeIORef match match'@@ -130,6 +134,7 @@ 			GL.renderPrimitive GL.Polygon $ circle radiusPenaltySpot 7  	renderPole pos = GL.preservingMatrix $ do+		colorRGB (0.3,0.3,0.3) 		GL.translate $ vector2 pos 		GL.renderPrimitive GL.Polygon (circle goalPoleWidth 7) 

@@ -4,7 +4,7 @@ build: Main  Main: *.hs-	ghc --make Main.hs+	ghc ${GHC_ARGS} --make Main.hs  clean: 	rm -f *.o *.hi Main