From 0081134bc6179f0206452a78e8758946c2cb619f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 31 Jan 2006 03:51:36 +0000 Subject: [PATCH] simplify. (It's not obvious what this subtracting of, typically, 1/16 is actually doing ...) --- stepmania/src/NoteDisplay.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp index 34ed98997c..e6ea4ff018 100644 --- a/stepmania/src/NoteDisplay.cpp +++ b/stepmania/src/NoteDisplay.cpp @@ -300,12 +300,11 @@ void NoteDisplay::SetActiveFrame( float fNoteBeat, Actor &actorToSet, float fAni if( bVivid ) { - // changed to deal with the minor complaint that the color cycling is - // one tick off in general - const float fNoteBeatFraction = fmodf( fNoteBeat, 1.0f ); - const float fFraction = fNoteBeatFraction - 0.25f/fAnimationLengthInBeats; + float fNoteBeatFraction = fmodf( fNoteBeat, 1.0f ); + fNoteBeatFraction -= 1/(fAnimationLengthInBeats*4); + const float fInterval = 1.f / fAnimationLengthInBeats; - fPercentIntoAnimation += Quantize(fFraction,fInterval); + fPercentIntoAnimation += Quantize( fNoteBeatFraction, fInterval ); // just in case somehow we're majorly negative with the subtraction wrap( fPercentIntoAnimation, 1.f );