From e022eaf710c8c26632cfdfc11f60b5bed85643f5 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Tue, 29 Dec 2020 01:22:59 +0000 Subject: Format with stylish-haskell --- src/Vivant.hs | 60 +++++++++++++++++++++++++-------------------------- src/Vivant/Noise.hs | 16 +++++++------- src/Vivant/Shader.hs | 12 +++++------ src/Vivant/Texture.hs | 10 ++++----- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/Vivant.hs b/src/Vivant.hs index 1797737..4a93b62 100644 --- a/src/Vivant.hs +++ b/src/Vivant.hs @@ -14,36 +14,36 @@ module Main where -import Control.Monad -import Foreign.C.Types -import Foreign.Ptr -import Foreign.Storable (sizeOf, poke) -import Foreign.Marshal.Alloc (malloc, free) -import SDL.Vect -import System.Exit (exitFailure) -import System.IO -import SDL (($=)) -import SDL.Time (ticks) -import SDL.Raw.Video as SDL (glSetAttribute) -import SDL.Raw.Enum as SDL -import Data.Word (Word32) -import Linear -import Control.Lens ((^.), (.~)) -import Data.Fixed (mod') -import Data.Function ((&)) -import qualified Data.Set as Set -import Data.Set (Set) -import Data.Int (Int32) - -import qualified Graphics.Rendering.OpenGL.GL.Shaders.Uniform as GL (UniformLocation(..)) -import qualified Graphics.GL.Functions as GL (glUniformMatrix4fv) -import qualified Graphics.Rendering.OpenGL as GL -import qualified Data.ByteString as BS -import qualified Data.Vector.Storable as V +import Control.Lens ((.~), (^.)) +import Control.Monad +import Data.Fixed (mod') +import Data.Function ((&)) +import Data.Int (Int32) +import Data.Set (Set) +import qualified Data.Set as Set +import Data.Word (Word32) +import Foreign.C.Types +import Foreign.Marshal.Alloc (free, malloc) +import Foreign.Ptr +import Foreign.Storable (poke, sizeOf) +import Linear +import SDL (($=)) +import SDL.Raw.Enum as SDL +import SDL.Raw.Video as SDL (glSetAttribute) +import SDL.Time (ticks) +import SDL.Vect +import System.Exit (exitFailure) +import System.IO + +import qualified Data.ByteString as BS +import qualified Data.Vector.Storable as V +import qualified Graphics.GL.Functions as GL (glUniformMatrix4fv) +import qualified Graphics.Rendering.OpenGL as GL +import qualified Graphics.Rendering.OpenGL.GL.Shaders.Uniform as GL (UniformLocation (..)) import qualified SDL -import Paths_vivant (getDataDir) -import Vivant.Shader (createProgram) +import Paths_vivant (getDataDir) +import Vivant.Shader (createProgram) screenWidth, screenHeight :: CInt (screenWidth, screenHeight) = (640, 480) @@ -87,8 +87,8 @@ initialGameState = Game } data MouseInputs = MouseInputs - { mousePosition :: Point V2 Int32 - , mouseRelative :: V2 Int32 + { mousePosition :: Point V2 Int32 + , mouseRelative :: V2 Int32 , mousePositionOld :: Maybe (V2 Int32) } deriving (Show) diff --git a/src/Vivant/Noise.hs b/src/Vivant/Noise.hs index 09a4b3e..131ffce 100644 --- a/src/Vivant/Noise.hs +++ b/src/Vivant/Noise.hs @@ -4,14 +4,14 @@ module Vivant.Noise (Permutation(..), perlin3, permutation, mkPermutation) where -import Control.Arrow -import Data.Bits -import Data.Vector.Unboxed ((!)) -import Data.Word -import System.Environment (getArgs) - -import qualified Codec.Picture as P -import qualified Data.ByteString as B +import Control.Arrow +import Data.Bits +import Data.Vector.Unboxed ((!)) +import Data.Word +import System.Environment (getArgs) + +import qualified Codec.Picture as P +import qualified Data.ByteString as B import qualified Data.Vector.Unboxed as V perlin3 :: (Ord a, Num a, RealFrac a, V.Unbox a) => Permutation -> (a, a, a) -> a diff --git a/src/Vivant/Shader.hs b/src/Vivant/Shader.hs index dfd5d41..c2df314 100644 --- a/src/Vivant/Shader.hs +++ b/src/Vivant/Shader.hs @@ -1,12 +1,12 @@ module Vivant.Shader (createProgram) where -import SDL (($=)) +import Control.Monad (unless) +import qualified Data.ByteString as BS import qualified Graphics.Rendering.OpenGL as GL -import qualified Data.ByteString as BS -import System.Exit (exitFailure) -import System.IO (stderr, hPutStrLn) -import Control.Monad (unless) -import Paths_vivant (getDataDir) +import Paths_vivant (getDataDir) +import SDL (($=)) +import System.Exit (exitFailure) +import System.IO (hPutStrLn, stderr) createProgram :: IO GL.Program createProgram = do diff --git a/src/Vivant/Texture.hs b/src/Vivant/Texture.hs index 7328c87..dceba80 100644 --- a/src/Vivant/Texture.hs +++ b/src/Vivant/Texture.hs @@ -1,12 +1,12 @@ module Vivant.Texture (initTexture, loadTexture) where -import Codec.Picture.Jpg (decodeJpeg) -import Codec.Picture.Types (convertImage) +import Codec.Picture.Jpg (decodeJpeg) +import Codec.Picture.Types (convertImage) +import qualified Data.ByteString as BS +import qualified Data.Vector.Storable as V import qualified Graphics.Rendering.OpenGL as GL -import qualified Data.ByteString as BS -import qualified Data.Vector.Storable as V -import Paths_vivant (getDataDir) +import Paths_vivant (getDataDir) initTexture = do GL.textureWrapMode GL.Texture2D GL.S $= (GL.Mirrored, GL.Repeat) -- cgit