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
@@ -65,30 +65,6 @@ update w
 updateSoundQueue = set soundQueue []
                    . set sounds M.empty

--updateSound :: World -> World
--updateSound = set soundQueue [] . stepSoundTimers
--stepSoundTimers :: World -> IO World
--stepSoundTimers w = M.foldrWithKey stepSoundTimer (return w) (_sounds w)
-
---- ok, this is hard to reason about-- bugs can occur because I am unsure when
---- everything is evaluated
--stepSoundTimer :: SoundOrigin -> Sound -> IO World -> IO World
--stepSoundTimer so s w = 
--    case _soundChannel s of
--        Nothing -> do w1 <- w
--                      let soundChunk = _loadedSounds w1 IM.! _soundType s
----                      n <- Mix.playingCount
--                      channel <- Mix.playOn (-1) (-1) soundChunk
--                      -- w2 <- w -- Note that using w2 instead of w1 in the
--                                 -- final return breaks the sound sometimes, must be
--                                 -- something to do with order of evaluation
--                      return $ set (sounds . ix so . soundChannel) (Just $ fromIntegral channel) w1
--        Just channel -> case _soundTime s of
--                                x | x > 0     -> fmap (set (sounds . ix so . soundTime) (x-1)) w
--                                  | x <= 0 -> do Mix.fadeOut channel (fromIntegral $ _soundFadeTime s+ 1)
--                                                 fmap (over sounds (M.delete so)) w
---- the sound fade doesn't seem to like being 0
-
 updateLightSources w = set tempLightSources (catMaybes tlss) w'
    where (w',tlss) = mapAccumR (\a b -> _tlsUpdate b a b) w $ _tempLightSources w