Refactor sound

2021-04-06 14:53:40 +02:00
parent f7e0b40cd5
commit ebcac39069
5 changed files with 250 additions and 181 deletions
@@ -1,5 +1,7 @@
 module Dodge.SoundLogic where
 import Dodge.Data
+import Sound.Preload (SoundStatus (..))
+
 import Control.Lens
 import qualified Data.Map as M

@@ -19,24 +21,24 @@ soundOnceOrigin :: Int -> SoundOrigin -> World -> World
 soundOnceOrigin sType so = over sounds (M.insertWith (flip const) so sound)
  where 
    sound = Sound 
-        { _soundChunkID = sType
-        , _soundTime = Nothing
-        , _soundFadeTime = 0
-        , _soundIsFadingOut = False
-        , _soundChannel = Nothing
-        , _soundPos = Nothing
+        { _soundChunkID     = sType
+        , _soundTime        = Nothing
+        , _soundFadeTime    = 0
+        , _soundStatus      = ToStart
+        , _soundChannel     = Nothing
+        , _soundPos         = Nothing
        }

 soundFrom :: SoundOrigin -> Int -> Int -> Int -> World -> World
 soundFrom so sType time fadeTime w = over sounds (M.insertWith f so sound) w
  where 
    sound = Sound 
-        { _soundChunkID = sType
-        , _soundTime = Just time
-        , _soundIsFadingOut = False
-        , _soundFadeTime = fadeTime
-        , _soundChannel = Nothing
-        , _soundPos = Nothing
+        { _soundChunkID     = sType
+        , _soundTime        = Just time
+        , _soundStatus      = ToStart
+        , _soundFadeTime    = fadeTime
+        , _soundChannel     = Nothing
+        , _soundPos         = Nothing
        }
    f _ s = s {_soundTime = Just time, _soundFadeTime = fadeTime}

@@ -45,12 +47,15 @@ soundMultiFrom [] _ _ _ w = w
 soundMultiFrom (so:sos) sType time fadeTime w
    | so `M.member` _sounds w = soundMultiFrom sos sType time fadeTime w
    | otherwise = over sounds (M.insert so sound) w
-        where sound = Sound { _soundChunkID = sType
-                            , _soundTime = Nothing
-                            , _soundFadeTime = fadeTime
-                            , _soundChannel = Nothing
-                            , _soundPos = Nothing
-                            }
+  where 
+    sound = Sound 
+        { _soundChunkID     = sType
+        , _soundTime        = Nothing
+        , _soundStatus      = ToStart
+        , _soundFadeTime    = fadeTime
+        , _soundChannel     = Nothing
+        , _soundPos         = Nothing
+        }


 stopSoundFrom :: SoundOrigin -> World -> World