actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[splittiming] Remember transitions to 1x.

Browse Source
This commit is contained in:
Jason Felds
2011-05-15 19:39:14 -04:00
parent 183e745534
commit f36121e647
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ArrowEffects.cpp
+9 -4
View File
@@ -252,18 +252,23 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float
fYOffset *= ARROW_SPACING; fYOffset *= ARROW_SPACING;
// Factor in the SpeedSegment. // Factor in the SpeedSegment.
SpeedSegment &seg = pCurSteps->m_Timing.GetSpeedSegmentAtBeat( fSongBeat ); TimingData &tim = pCurSteps->m_Timing;
if( seg.m_fPercent != 1 )
const int index = tim.GetSpeedSegmentIndexAtBeat( fSongBeat );
if( index > 0 )
{ {
SpeedSegment &seg = tim.GetSpeedSegmentAtBeat( fSongBeat );
float fStartBeat = NoteRowToBeat(seg.m_iStartRow); float fStartBeat = NoteRowToBeat(seg.m_iStartRow);
if( fStartBeat + seg.m_fWait >= fSongBeat ) if( fStartBeat + seg.m_fWait >= fSongBeat )
{ {
const float fPriorSpeed = tim.m_SpeedSegments[index - 1].m_fPercent;
float fBeatsUsed = fSongBeat - fStartBeat; float fBeatsUsed = fSongBeat - fStartBeat;
float fRatioUsed = fBeatsUsed / seg.m_fWait; float fRatioUsed = fBeatsUsed / seg.m_fWait;
float fDistance = 1 - seg.m_fPercent;
float fDistance = fPriorSpeed - seg.m_fPercent;
float fRatioNeed = fRatioUsed * -fDistance; float fRatioNeed = fRatioUsed * -fDistance;
fYOffset *= (1 + fRatioNeed); fYOffset *= (fPriorSpeed + fRatioNeed);
} }
else else
{ {