From 045659caf3ef41bc9cd091d4c1e3eac6d06cd982 Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 12 Mar 2018 00:21:16 +0100 Subject: [PATCH] reorganizing code --- src/Test.hs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Test.hs b/src/Test.hs index 5943db7..92501cc 100644 --- a/src/Test.hs +++ b/src/Test.hs @@ -5,6 +5,7 @@ import Affection as A hiding (get) import SDL (get, ($=)) import qualified SDL import qualified Graphics.Rendering.OpenGL as GL hiding (get) +import NanoVG hiding (V2(..)) import Control.Monad (when, unless, void) import Control.Monad.IO.Class (liftIO) @@ -16,12 +17,6 @@ import Data.Matrix as M import Data.Ecstasy as E import Data.Maybe -import NanoVG hiding (V2(..)) - -import Types - -import Floorplan - import Linear import Foreign.C.Types (CFloat(..)) @@ -32,13 +27,15 @@ import Debug.Trace import Interior import Util +import Types +import Floorplan loadMap :: Affection UserData () loadMap = do ud <- getAffection let fc = FloorConfig (20, 20) - [] -- [(5,5), (35, 35)] + [(5,5), (35, 35)] (50,75) (Subsystems _ m) = subsystems ud (mat, gr) <- liftIO $ buildHallFloorIO fc