justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

basicWorld

Browse Source
This commit is contained in:
Ross
2021-04-02 09:59:25 +01:00
parent fdebeb9aba
commit b75c24e384
1 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Main.hs
+37 -40
View File
@@ -1,39 +1,39 @@
module Main where module Main where
import Loop import Dodge.Data
import Shader import Dodge.Default
import LoadConfig import Dodge.Event
import Dodge.Default import Dodge.Floor
import Dodge.Data import Dodge.Initialisation
import Dodge.Initialisation import Dodge.Layout
import Dodge.Rooms import Dodge.LoadConfig
import Dodge.Layout import Dodge.LoadSound
import Dodge.LoadSound import Dodge.Menu
import Dodge.Update import Dodge.Render
import Dodge.Event import Dodge.Rooms
import Dodge.Render import Dodge.Update
import Dodge.Menu import LoadConfig
import Dodge.Floor import Loop
import Dodge.LoadConfig import Picture
import Dodge.LoadSound import Picture.Preload
import Picture import Picture.Render
import Picture.Render import Preload
import Picture.Preload import Shader
import Sound import Sound
import Preload import Sound.Preload
import Sound.Preload
import Control.Concurrent import Control.Concurrent
import Control.Lens import Control.Lens
import Foreign (Word32) import Foreign (Word32)
import Control.Monad (when) import Control.Monad (void, when)
import System.Random
import qualified Data.Map as M import System.Random
import qualified Data.Map as M
import Graphics.Rendering.OpenGL hiding (color, rotate, scale,
translate)
import qualified SDL import qualified SDL
import qualified SDL.Mixer as Mix import qualified SDL.Mixer as Mix
import Graphics.Rendering.OpenGL hiding (color,scale,translate,rotate)
doPreload' :: IO (PreloadData a) doPreload' :: IO (PreloadData a)
doPreload' = do doPreload' = do
@@ -46,7 +46,7 @@ main :: IO ()
main = do main = do
(sizex,sizey) <- loadConfig (sizex,sizey) <- loadConfig
keyConfig <- loadKeyConfig keyConfig <- loadKeyConfig
setupLoop setupLoop
(sizex,sizey) (sizex,sizey)
(SDL.cursorVisible $= False >> doPreload' >>= resizeSpareFBO sizex sizey) (SDL.cursorVisible $= False >> doPreload' >>= resizeSpareFBO sizex sizey)
(\x -> (SDL.cursorVisible $= True) >> cleanUpPreload x) (\x -> (SDL.cursorVisible $= True) >> cleanUpPreload x)
@@ -59,16 +59,13 @@ main = do
endTicks <- SDL.ticks endTicks <- SDL.ticks
let lastFrameTicks = _frameTimer preData let lastFrameTicks = _frameTimer preData
if (_debugMode w) then when (_debugMode w) $ void $ renderFoldable
renderFoldable (_renderData preData)
(_renderData preData) (picToLTree Nothing . setLayer 1 . setDepth (-1)
(picToLTree Nothing . setLayer 1 . setDepth (-1) . translate (-0.5) (-0.8) . scale 0.0005 0.0005
. translate (-0.5) (-0.8) . scale 0.0005 0.0005
. text $ "ms/frame " ++ show (endTicks - lastFrameTicks) . text $ "ms/frame " ++ show (endTicks - lastFrameTicks)
) )
else
-- ? Why (or rather how to avoid)
return endTicks
return $ preData & soundData .~ newSoundData return $ preData & soundData .~ newSoundData
& frameTimer .~ endTicks & frameTimer .~ endTicks