reflex-animation 0.1.2 → 0.1.3

raw patch · 2 files changed

+32/−16 lines, 2 files

Files

• reflex-animation.cabal +1/−1
• src/Reflex/Monad/Time.hs +31/−15

@@ -1,5 +1,5 @@ name:                reflex-animation-version:             0.1.2+version:             0.1.3 synopsis:            Continuous animations support for reflex description:         This package provides a set of functions for creating and playing continuous animations of the form Time -> a.                      Finite animations (with a length) and infinite animations complement one another, we chose a representation of 

@@ -3,9 +3,7 @@    , observeChanges   , delay_-  -  , pushFor-  +      , animate   , animateClip   , animateOn@@ -19,6 +17,7 @@   , match   , matchBy  +  , pushFor      ) where @@ -41,21 +40,30 @@      class (MonadReflex t m, RealFrac time) => MonadTime t time m | m -> t time where-  ++  -- | Integrate a behavior with respect to time, at a sampling rate determined by the implementor+  -- uses VectorSpace to allow for monomorphic vectors, e.g. gloss   integrate :: (VectorSpace v, Scalar v ~ time) => v -> Behavior t v -> m (Behavior t v)+  +  -- | Observe an event by sampling it at a rate determined by the implementing framework+  -- e.g. reflex-gloss-scene uses a fixed sampling rate.   observe :: Behavior t a -> m (Event t a)   +  -- | A behavior for time, must be up to date +  -- (i.e. represents current time not previous time)   getTime :: m (Behavior t time)   +  -- | Fire an event at or just after a period of time   after :: time -> m (Event t ())+  +  -- | Delay an event by a period of time, returns a list in case+  -- two delayed events occur within the sampling rate of the framework   delay :: Event t (a, time) ->  m (Event t (NonEmpty a))    -pushFor ::  Reflex t => Event t a -> (a -> PushM t b) -> Event t b-pushFor = flip pushAlways  -+-- | Delay a void event stream delay_ :: (MonadTime t time m) => Event t time ->  m (Event t ()) delay_ e = void <$> delay (((), ) <$>  e)     @@ -64,22 +72,24 @@ animateClip :: (Reflex t, RealFrac time) => Clip time a -> Behavior t time -> Behavior t (Maybe a) animateClip clip = animate $ toMaybe clip +-- | Animate an infinite animation using framework time animate :: (Reflex t, RealFrac time) => Animation time a -> Behavior t time -> Behavior t a animate anim time = sampleAt anim <$> time      -   +-- | Helper for animateOn using the underlying representation (time -> a) sampleOn :: (Reflex t, RealFrac time) => Event t (time -> a) -> Behavior t time -> Event t (Behavior t a) sampleOn e t = attachWith startAt t e where   startAt start f = f . subtract start <$> t     -   +-- | Create a Behavior from an infinite animation on the occurance of the event    animateOn :: (Reflex t, RealFrac time) => Event t (Animation time a) -> Behavior t time -> Event t (Behavior t a) animateOn e = sampleOn (sampleAt <$> e)  +-- | Record time offset from the current time fromNow ::  MonadTime t time m => m (Behavior t time) fromNow = do   time  <- getTime@@ -87,13 +97,15 @@   return (subtract start <$> time)  +-- | Play an animation clip, giving a Behavior of it's value and an Event firing as it finishes playClip :: MonadTime t time m =>  Clip time a ->  m (Behavior t (Maybe a), Event t ()) playClip clip = do   (b, done) <- playClamp clip   b' <- switcher (Just <$> b) (constant Nothing <$ done)   return (b', done) -  ++-- | Play an animation clip, except clamp the ends so the Behavior is no longer 'Maybe a' playClamp :: MonadTime t time m =>  Clip time a ->  m (Behavior t a, Event t ()) playClamp clip = do   b <- play (clamped clip)@@ -101,15 +113,16 @@   return (b, done)        -  +-- | Play an infinite animation starting now play :: MonadTime t time m =>  Animation time a ->  m (Behavior t a) play anim = do   time <- fromNow   return (sampleAt anim <$> time)      -   +-- | Play an animation clip starting on the occurance of an Event+-- if another play event occurs before the last one has finished, switch to that one instead. playOn :: MonadTime t time m => Event t (Clip time a) ->  m (Behavior t (Maybe a), Event t ()) playOn e = do   time <- getTime@@ -119,7 +132,8 @@       leftmost [constant Nothing <$ done, fmap Just <$> animateOn (clamped <$> e) time]   return (join b, done)   -  ++-- | Observe changes in a 'Behavior a' it's Eq a instance observeChanges :: (Eq a, MonadTime t time m) => Behavior t a -> m (Event t a) observeChanges b = do   initial <- sample b@@ -127,14 +141,16 @@   return (updated $ nubDyn d)    -+-- | Helper functions using filter with Eq match :: (Reflex t, Eq a) => a -> Event t a -> Event t () match a = matchBy (== a)  matchBy :: (Reflex t) => (a -> Bool) -> Event t a -> Event t () matchBy f = void . ffilter f   -+-- | Helper for pushAlways+pushFor ::  Reflex t => Event t a -> (a -> PushM t b) -> Event t b+pushFor = flip pushAlways