Reverse dependency of Sound and Sound.Preload on Dodge.Data

2021-02-23 21:00:42 +01:00
parent 47eb0b378b
commit 059913902a
4 changed files with 16 additions and 36 deletions
@@ -8,14 +8,25 @@ import qualified Data.Map as M

 import Control.Lens

-import Dodge.Data
+import Geometry
+

 data SoundData a = SoundData
    {_loadedChunks :: IM.IntMap Mix.Chunk
    ,_playingSounds :: M.Map a Sound
    }
+data Sound = Sound { _soundTime :: Int
+                   , _soundFadeTime :: Int
+                   --, _soundChannel :: Maybe Int
+                   , _soundChannel :: Maybe Mix.Channel
+                   , _soundPos :: Maybe Point2
+                   , _soundType :: Int
+                   }
+    deriving (Eq,Ord,Show)
+

 makeLenses ''SoundData
+makeLenses ''Sound


 cleanUpSoundPreload :: SoundData a -> IO ()