diff options
Diffstat (limited to 'slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx')
-rw-r--r-- | slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx | 69 |
1 files changed, 12 insertions, 57 deletions
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx index 11a8463d87f3..5c6943614437 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx @@ -35,6 +35,7 @@ #include <continuouskeytimeactivitybase.hxx> +#include <boost/tuple/tuple.hpp> #include <algorithm> #include <iterator> @@ -45,34 +46,14 @@ namespace slideshow { ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase( const ActivityParameters& rParms ) : SimpleContinuousActivityBase( rParms ), - maKeyTimes( rParms.maDiscreteTimes ), - mnLastIndex( 0 ) + maLerper( rParms.maDiscreteTimes ) { - ENSURE_OR_THROW( maKeyTimes.size() > 1, + ENSURE_OR_THROW( rParms.maDiscreteTimes.size() > 1, "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): key times vector must have two entries or more" ); - -#ifdef DBG_UTIL - // check parameters: rKeyTimes must be sorted in - // ascending order, and contain values only from the range - // [0,1] - for( ::std::size_t i=1, len=maKeyTimes.size(); i<len; ++i ) - { - if( maKeyTimes[i] < 0.0 || - maKeyTimes[i] > 1.0 || - maKeyTimes[i-1] < 0.0 || - maKeyTimes[i-1] > 1.0 ) - { - ENSURE_OR_THROW( false, "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): time values not within [0,1] range!" ); - } - - if( maKeyTimes[i-1] > maKeyTimes[i] ) - { - ENSURE_OR_THROW( false, "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): time vector is not sorted in ascending order!" ); - } - } - - // TODO(E2): check this also in production code? -#endif + ENSURE_OR_THROW( rParms.maDiscreteTimes.front() == 0.0, + "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): key times vector first entry must be zero" ); + ENSURE_OR_THROW( rParms.maDiscreteTimes.back() <= 1.0, + "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): key times vector last entry must be less or equal 1" ); } void ContinuousKeyTimeActivityBase::simplePerform( double nSimpleTime, @@ -81,40 +62,14 @@ namespace slideshow // calc simple time from global time - sweep through the // array multiple times for repeated animations (according to // SMIL spec). - const double nT( calcAcceleratedTime( nSimpleTime ) ); - - // determine position within key times vector from - // current simple time - - // shortcut: cached value still okay? - if( maKeyTimes[ mnLastIndex ] < nT || - maKeyTimes[ mnLastIndex+1 ] >= nT ) - { - // nope, find new index - mnLastIndex = ::std::min< ::std::ptrdiff_t >( - maKeyTimes.size()-2, - // range is ensured by max below - ::std::max< ::std::ptrdiff_t >( - 0, - ::std::distance( maKeyTimes.begin(), - ::std::lower_bound( maKeyTimes.begin(), - maKeyTimes.end(), - nT ) ) - 1 ) ); - } - - OSL_ENSURE( mnLastIndex+1 < maKeyTimes.size(), - "ContinuousKeyTimeActivityBase::simplePerform(): index out of range" ); - - // mnLastIndex is now valid and up-to-date + double fAlpha( calcAcceleratedTime( nSimpleTime ) ); + std::ptrdiff_t nIndex; - // calc current simple time, as a fractional value ([0,1] range). - // I.e. the relative position between the two index times. - const double nCurrFractionalSimplTime( (nT - maKeyTimes[ mnLastIndex ]) / - (maKeyTimes[ mnLastIndex+1 ] - maKeyTimes[ mnLastIndex ]) ); + boost::tuples::tie(nIndex,fAlpha) = maLerper.lerp(fAlpha); perform( - mnLastIndex, - nCurrFractionalSimplTime, + nIndex, + fAlpha, nRepeatCount ); } } |