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

ScreenEdit: add GetAppropriateStepsForUpdate function

Browse Source
This commit is contained in:
Devin J. Pohly
2013-01-21 22:53:12 -05:00
parent 4385b9242d
commit 234cbf4281
2 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+55 -43
View File
@@ -1785,7 +1785,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
// does it mean in this case? // does it mean in this case?
return false; return false;
} }
TimingData &sTiming = GetAppropriateTiming(); const TimingData &sTiming = GetAppropriateTiming();
float playerBeat = GetAppropriatePosition().m_fSongBeat; float playerBeat = GetAppropriatePosition().m_fSongBeat;
int beatsPerMeasure = sTiming.GetTimeSignatureSegmentAtBeat( playerBeat )->GetNum(); int beatsPerMeasure = sTiming.GetTimeSignatureSegmentAtBeat( playerBeat )->GetNum();
@@ -2008,7 +2008,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
case EDIT_BUTTON_SEGMENT_NEXT: case EDIT_BUTTON_SEGMENT_NEXT:
{ {
// TODO: Work around Stops and Delays. We MAY have to separate them. // TODO: Work around Stops and Delays. We MAY have to separate them.
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
ScrollTo(timing.GetNextSegmentBeatAtBeat(this->currentCycleSegment, ScrollTo(timing.GetNextSegmentBeatAtBeat(this->currentCycleSegment,
GetBeat())); GetBeat()));
} }
@@ -2016,7 +2016,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
case EDIT_BUTTON_SEGMENT_PREV: case EDIT_BUTTON_SEGMENT_PREV:
{ {
// TODO: Work around Stops and Delays. We MAY have to separate them. // TODO: Work around Stops and Delays. We MAY have to separate them.
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
ScrollTo(timing.GetPreviousSegmentBeatAtBeat(this->currentCycleSegment, ScrollTo(timing.GetPreviousSegmentBeatAtBeat(this->currentCycleSegment,
GetBeat())); GetBeat()));
} }
@@ -2189,7 +2189,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
} }
float fNewBPM = fBPM + fDelta; float fNewBPM = fBPM + fDelta;
GetAppropriateTiming().SetBPMAtBeat( GetBeat(), fNewBPM ); GetAppropriateTimingForUpdate().SetBPMAtBeat( GetBeat(), fNewBPM );
(fDelta>0 ? m_soundValueIncrease : m_soundValueDecrease).Play(); (fDelta>0 ? m_soundValueIncrease : m_soundValueDecrease).Play();
SetDirty( true ); SetDirty( true );
} }
@@ -2217,7 +2217,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
} }
// is there a StopSegment on the current row? // is there a StopSegment on the current row?
TimingData & timing = GetAppropriateTiming(); TimingData & timing = GetAppropriateTimingForUpdate();
StopSegment *seg = timing.GetStopSegmentAtRow( GetRow() ); StopSegment *seg = timing.GetStopSegmentAtRow( GetRow() );
int i = timing.GetSegmentIndexAtRow(SEGMENT_STOP, GetRow()); int i = timing.GetSegmentIndexAtRow(SEGMENT_STOP, GetRow());
if (i == -1 || seg->GetRow() != GetRow()) // invalid if (i == -1 || seg->GetRow() != GetRow()) // invalid
@@ -2263,7 +2263,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
} }
// is there a StopSegment on the current row? // is there a StopSegment on the current row?
TimingData & timing = GetAppropriateTiming(); TimingData & timing = GetAppropriateTimingForUpdate();
DelaySegment *seg = timing.GetDelaySegmentAtRow( GetRow() ); DelaySegment *seg = timing.GetDelaySegmentAtRow( GetRow() );
int i = timing.GetSegmentIndexAtRow(SEGMENT_DELAY, GetRow()); int i = timing.GetSegmentIndexAtRow(SEGMENT_DELAY, GetRow());
if (i == -1 || seg->GetRow() != GetRow()) // invalid if (i == -1 || seg->GetRow() != GetRow()) // invalid
@@ -2306,7 +2306,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
else else
fDelta *= 40; fDelta *= 40;
} }
GetAppropriateTiming().m_fBeat0OffsetInSeconds += fDelta; GetAppropriateTimingForUpdate().m_fBeat0OffsetInSeconds += fDelta;
(fDelta>0 ? m_soundValueIncrease : m_soundValueDecrease).Play(); (fDelta>0 ? m_soundValueIncrease : m_soundValueDecrease).Play();
if (GAMESTATE->m_bIsUsingStepTiming) if (GAMESTATE->m_bIsUsingStepTiming)
{ {
@@ -2547,7 +2547,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
} }
else else
{ {
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
start = timing.GetElapsedTimeFromBeat(NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker)); start = timing.GetElapsedTimeFromBeat(NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker));
AttackArray &attacks = AttackArray &attacks =
(GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks); (GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks);
@@ -2928,7 +2928,7 @@ bool ScreenEdit::InputPlay( const InputEventPlus &input, EditButton EditB )
fOffsetDelta *= 40; fOffsetDelta *= 40;
} }
GetAppropriateTiming().m_fBeat0OffsetInSeconds += fOffsetDelta; GetAppropriateTimingForUpdate().m_fBeat0OffsetInSeconds += fOffsetDelta;
if (!GAMESTATE->m_bIsUsingStepTiming) if (!GAMESTATE->m_bIsUsingStepTiming)
{ {
GAMESTATE->m_pCurSong->m_fMusicSampleStartSeconds += fOffsetDelta; GAMESTATE->m_pCurSong->m_fMusicSampleStartSeconds += fOffsetDelta;
@@ -3317,7 +3317,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
float fBPM = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fBPM = StringToFloat( ScreenTextEntry::s_sLastAnswer );
if( fBPM > 0 ) if( fBPM > 0 )
GetAppropriateTiming().AddSegment( BPMSegment(GetRow(), fBPM) ); GetAppropriateTimingForUpdate().AddSegment( BPMSegment(GetRow(), fBPM) );
SetDirty( true ); SetDirty( true );
} }
@@ -3326,7 +3326,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
float fStop = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fStop = StringToFloat( ScreenTextEntry::s_sLastAnswer );
if( fStop >= 0 ) if( fStop >= 0 )
GetAppropriateTiming().AddSegment( StopSegment(GetRow(), fStop) ); GetAppropriateTimingForUpdate().AddSegment( StopSegment(GetRow(), fStop) );
SetDirty( true ); SetDirty( true );
} }
@@ -3335,7 +3335,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
float fDelay = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fDelay = StringToFloat( ScreenTextEntry::s_sLastAnswer );
if( fDelay >= 0 ) if( fDelay >= 0 )
GetAppropriateTiming().AddSegment( DelaySegment(GetRow(), fDelay) ); GetAppropriateTimingForUpdate().AddSegment( DelaySegment(GetRow(), fDelay) );
SetDirty( true ); SetDirty( true );
} }
@@ -3344,7 +3344,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
int iNum, iDen; int iNum, iDen;
if( sscanf( ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iNum, &iDen ) == 2 ) if( sscanf( ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iNum, &iDen ) == 2 )
GetAppropriateTiming().AddSegment( TimeSignatureSegment(GetRow(), iNum, iDen) ); GetAppropriateTimingForUpdate().AddSegment( TimeSignatureSegment(GetRow(), iNum, iDen) );
SetDirty( true ); SetDirty( true );
} }
@@ -3353,7 +3353,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
int iTick = StringToInt( ScreenTextEntry::s_sLastAnswer ); int iTick = StringToInt( ScreenTextEntry::s_sLastAnswer );
if ( iTick >= 0 && iTick <= ROWS_PER_BEAT ) if ( iTick >= 0 && iTick <= ROWS_PER_BEAT )
GetAppropriateTiming().AddSegment( TickcountSegment( GetRow(), iTick) ); GetAppropriateTimingForUpdate().AddSegment( TickcountSegment( GetRow(), iTick) );
SetDirty( true ); SetDirty( true );
} }
@@ -3362,7 +3362,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
int iCombo, iMiss; int iCombo, iMiss;
if (sscanf(ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iCombo, &iMiss) == 2) if (sscanf(ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iCombo, &iMiss) == 2)
GetAppropriateTiming().AddSegment( ComboSegment(GetRow(), iCombo, iMiss) ); GetAppropriateTimingForUpdate().AddSegment( ComboSegment(GetRow(), iCombo, iMiss) );
SetDirty( true ); SetDirty( true );
} }
@@ -3375,7 +3375,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
// XXX: these should be in the NotesWriters where they're needed. // XXX: these should be in the NotesWriters where they're needed.
sLabel.Replace("=", "_"); sLabel.Replace("=", "_");
sLabel.Replace(",", "_"); sLabel.Replace(",", "_");
GetAppropriateTiming().AddSegment( LabelSegment(GetRow(), sLabel) ); GetAppropriateTimingForUpdate().AddSegment( LabelSegment(GetRow(), sLabel) );
SetDirty( true ); SetDirty( true );
} }
} }
@@ -3384,14 +3384,14 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
float fWarp = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fWarp = StringToFloat( ScreenTextEntry::s_sLastAnswer );
if( fWarp >= 0 ) // allow 0 to kill a warp. if( fWarp >= 0 ) // allow 0 to kill a warp.
{ {
GetAppropriateTiming().SetWarpAtBeat( GetBeat(), fWarp ); GetAppropriateTimingForUpdate().SetWarpAtBeat( GetBeat(), fWarp );
SetDirty( true ); SetDirty( true );
} }
} }
else if( SM == SM_BackFromSpeedPercentChange && !ScreenTextEntry::s_bCancelledLast ) else if( SM == SM_BackFromSpeedPercentChange && !ScreenTextEntry::s_bCancelledLast )
{ {
float fNum = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fNum = StringToFloat( ScreenTextEntry::s_sLastAnswer );
GetAppropriateTiming().SetSpeedPercentAtBeat( GetBeat(), fNum ); GetAppropriateTimingForUpdate().SetSpeedPercentAtBeat( GetBeat(), fNum );
SetDirty( true ); SetDirty( true );
} }
else if ( SM == SM_BackFromSpeedWaitChange && !ScreenTextEntry::s_bCancelledLast ) else if ( SM == SM_BackFromSpeedWaitChange && !ScreenTextEntry::s_bCancelledLast )
@@ -3399,7 +3399,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
float fDen = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fDen = StringToFloat( ScreenTextEntry::s_sLastAnswer );
if( fDen >= 0) if( fDen >= 0)
{ {
GetAppropriateTiming().SetSpeedWaitAtBeat( GetBeat(), fDen ); GetAppropriateTimingForUpdate().SetSpeedWaitAtBeat( GetBeat(), fDen );
} }
SetDirty( true ); SetDirty( true );
} }
@@ -3407,11 +3407,11 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
{ {
if( ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "b" || ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "B" ) if( ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "b" || ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "B" )
{ {
GetAppropriateTiming().SetSpeedModeAtBeat( GetBeat(), SpeedSegment::UNIT_BEATS ); GetAppropriateTimingForUpdate().SetSpeedModeAtBeat( GetBeat(), SpeedSegment::UNIT_BEATS );
} }
else if( ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "s" || ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "S" ) else if( ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "s" || ScreenTextEntry::s_sLastAnswer.substr(0, 1) == "S" )
{ {
GetAppropriateTiming().SetSpeedModeAtBeat( GetBeat(), SpeedSegment::UNIT_SECONDS ); GetAppropriateTimingForUpdate().SetSpeedModeAtBeat( GetBeat(), SpeedSegment::UNIT_SECONDS );
} }
else else
{ {
@@ -3420,14 +3420,14 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
SpeedSegment::BaseUnit unit = (tmp == 0 ) ? SpeedSegment::BaseUnit unit = (tmp == 0 ) ?
SpeedSegment::UNIT_BEATS : SpeedSegment::UNIT_SECONDS; SpeedSegment::UNIT_BEATS : SpeedSegment::UNIT_SECONDS;
GetAppropriateTiming().SetSpeedModeAtBeat( GetBeat(), unit ); GetAppropriateTimingForUpdate().SetSpeedModeAtBeat( GetBeat(), unit );
} }
SetDirty( true ); SetDirty( true );
} }
else if( SM == SM_BackFromScrollChange && !ScreenTextEntry::s_bCancelledLast ) else if( SM == SM_BackFromScrollChange && !ScreenTextEntry::s_bCancelledLast )
{ {
float fNum = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fNum = StringToFloat( ScreenTextEntry::s_sLastAnswer );
GetAppropriateTiming().SetScrollAtBeat( GetBeat(), fNum ); GetAppropriateTimingForUpdate().SetScrollAtBeat( GetBeat(), fNum );
SetDirty( true ); SetDirty( true );
} }
else if ( SM == SM_BackFromFakeChange && !ScreenTextEntry::s_bCancelledLast ) else if ( SM == SM_BackFromFakeChange && !ScreenTextEntry::s_bCancelledLast )
@@ -3435,7 +3435,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
float fFake = StringToFloat( ScreenTextEntry::s_sLastAnswer ); float fFake = StringToFloat( ScreenTextEntry::s_sLastAnswer );
if( fFake >= 0 ) // allow 0 to kill a fake. if( fFake >= 0 ) // allow 0 to kill a fake.
{ {
GetAppropriateTiming().AddSegment( FakeSegment(GetRow(), fFake) ); GetAppropriateTimingForUpdate().AddSegment( FakeSegment(GetRow(), fFake) );
SetDirty( true ); SetDirty( true );
} }
} }
@@ -3708,7 +3708,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
{ {
int attackChoice = ScreenMiniMenu::s_iLastRowCode; int attackChoice = ScreenMiniMenu::s_iLastRowCode;
int attackDecision = ScreenMiniMenu::s_viLastAnswers[attackChoice]; int attackDecision = ScreenMiniMenu::s_viLastAnswers[attackChoice];
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
float startTime = timing.GetElapsedTimeFromBeat(GetBeat()); float startTime = timing.GetElapsedTimeFromBeat(GetBeat());
AttackArray &attacks = AttackArray &attacks =
(GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks); (GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks);
@@ -3784,7 +3784,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
else if (SM == SM_BackFromInsertStepAttack) else if (SM == SM_BackFromInsertStepAttack)
{ {
int iDurationChoice = ScreenMiniMenu::s_viLastAnswers[0]; int iDurationChoice = ScreenMiniMenu::s_viLastAnswers[0];
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
g_fLastInsertAttackPositionSeconds = timing.GetElapsedTimeFromBeat( GetBeat() ); g_fLastInsertAttackPositionSeconds = timing.GetElapsedTimeFromBeat( GetBeat() );
g_fLastInsertAttackDurationSeconds = StringToFloat( g_InsertStepAttack.rows[0].choices[iDurationChoice] ); g_fLastInsertAttackDurationSeconds = StringToFloat( g_InsertStepAttack.rows[0].choices[iDurationChoice] );
AttackArray &attacks = GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks; AttackArray &attacks = GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks;
@@ -4174,7 +4174,7 @@ static void ChangeStepsMaxBPM(const RString &sNew)
step->SetMaxBPM(StringToFloat(sNew)); step->SetMaxBPM(StringToFloat(sNew));
} }
TimingData & ScreenEdit::GetAppropriateTiming() const const TimingData & ScreenEdit::GetAppropriateTiming() const
{ {
if( GAMESTATE->m_bIsUsingStepTiming ) if( GAMESTATE->m_bIsUsingStepTiming )
{ {
@@ -4183,6 +4183,18 @@ TimingData & ScreenEdit::GetAppropriateTiming() const
return m_pSong->m_SongTiming; return m_pSong->m_SongTiming;
} }
TimingData & ScreenEdit::GetAppropriateTimingForUpdate()
{
if( GAMESTATE->m_bIsUsingStepTiming )
{
// Copy from song if there is no step timing
if( m_pSteps->m_Timing.empty() )
m_pSteps->m_Timing = m_pSong->m_SongTiming;
return m_pSteps->m_Timing;
}
return m_pSong->m_SongTiming;
}
SongPosition & ScreenEdit::GetAppropriatePosition() const SongPosition & ScreenEdit::GetAppropriatePosition() const
{ {
if (GAMESTATE->m_bIsUsingStepTiming) if (GAMESTATE->m_bIsUsingStepTiming)
@@ -4223,7 +4235,7 @@ inline int ScreenEdit::GetRow()
void ScreenEdit::DisplayTimingMenu() void ScreenEdit::DisplayTimingMenu()
{ {
int row = GetRow(); int row = GetRow();
TimingData &pTime = GetAppropriateTiming(); const TimingData &pTime = GetAppropriateTiming();
bool bHasSpeedOnThisRow = pTime.GetSpeedSegmentAtRow( row )->GetRow() == row; bool bHasSpeedOnThisRow = pTime.GetSpeedSegmentAtRow( row )->GetRow() == row;
// bool bIsSelecting = ( (m_NoteFieldEdit.m_iEndMarker != -1) && (m_NoteFieldEdit.m_iBeginMarker != -1) ); // bool bIsSelecting = ( (m_NoteFieldEdit.m_iEndMarker != -1) && (m_NoteFieldEdit.m_iBeginMarker != -1) );
@@ -4713,7 +4725,7 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
NoteDataUtil::ScaleRegion( m_NoteDataEdit, fScale, iStartIndex, iEndIndex ); NoteDataUtil::ScaleRegion( m_NoteDataEdit, fScale, iStartIndex, iEndIndex );
// scale timing data // scale timing data
GetAppropriateTiming().ScaleRegion(fScale, GetAppropriateTimingForUpdate().ScaleRegion(fScale,
m_NoteFieldEdit.m_iBeginMarker, m_NoteFieldEdit.m_iBeginMarker,
m_NoteFieldEdit.m_iEndMarker, true ); m_NoteFieldEdit.m_iEndMarker, true );
@@ -4755,9 +4767,9 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
m_NoteFieldEdit.m_iBeginMarker + 1, m_NoteFieldEdit.m_iBeginMarker + 1,
m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker
); );
GetAppropriateTiming().DeleteRows( m_NoteFieldEdit.m_iBeginMarker + 1, GetAppropriateTimingForUpdate().DeleteRows( m_NoteFieldEdit.m_iBeginMarker + 1,
m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker ); m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker );
GetAppropriateTiming().SetStopAtRow( m_NoteFieldEdit.m_iBeginMarker, fStopLength ); GetAppropriateTimingForUpdate().SetStopAtRow( m_NoteFieldEdit.m_iBeginMarker, fStopLength );
m_NoteFieldEdit.m_iBeginMarker = -1; m_NoteFieldEdit.m_iBeginMarker = -1;
m_NoteFieldEdit.m_iEndMarker = -1; m_NoteFieldEdit.m_iEndMarker = -1;
break; break;
@@ -4775,9 +4787,9 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
m_NoteFieldEdit.m_iBeginMarker, m_NoteFieldEdit.m_iBeginMarker,
m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker
); );
GetAppropriateTiming().DeleteRows( m_NoteFieldEdit.m_iBeginMarker, GetAppropriateTimingForUpdate().DeleteRows( m_NoteFieldEdit.m_iBeginMarker,
m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker ); m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker );
GetAppropriateTiming().SetDelayAtRow( m_NoteFieldEdit.m_iBeginMarker, fStopLength ); GetAppropriateTimingForUpdate().SetDelayAtRow( m_NoteFieldEdit.m_iBeginMarker, fStopLength );
m_NoteFieldEdit.m_iBeginMarker = -1; m_NoteFieldEdit.m_iBeginMarker = -1;
m_NoteFieldEdit.m_iEndMarker = -1; m_NoteFieldEdit.m_iEndMarker = -1;
break; break;
@@ -4786,7 +4798,7 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
{ {
float startBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker); float startBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker);
float lengthBeat = NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker) - startBeat; float lengthBeat = NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker) - startBeat;
GetAppropriateTiming().SetWarpAtBeat(startBeat,lengthBeat); GetAppropriateTimingForUpdate().SetWarpAtBeat(startBeat,lengthBeat);
SetDirty(true); SetDirty(true);
break; break;
} }
@@ -4794,7 +4806,7 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
{ {
float startBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker); float startBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker);
float endBeat = NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker); float endBeat = NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker);
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
float &start = g_fLastInsertAttackPositionSeconds; float &start = g_fLastInsertAttackPositionSeconds;
float &length = g_fLastInsertAttackDurationSeconds; float &length = g_fLastInsertAttackDurationSeconds;
start = timing.GetElapsedTimeFromBeat(startBeat); start = timing.GetElapsedTimeFromBeat(startBeat);
@@ -4819,7 +4831,7 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
{ {
int startRow = m_NoteFieldEdit.m_iBeginMarker; int startRow = m_NoteFieldEdit.m_iBeginMarker;
float lengthBeat = NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker) - NoteRowToBeat(startRow); float lengthBeat = NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker) - NoteRowToBeat(startRow);
GetAppropriateTiming().AddSegment( FakeSegment(startRow,lengthBeat) ); GetAppropriateTimingForUpdate().AddSegment( FakeSegment(startRow,lengthBeat) );
SetDirty(true); SetDirty(true);
break; break;
} }
@@ -4962,12 +4974,12 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector<int> &iAns
NoteTypeToRow((NoteType)iAnswers[c]) : 48); NoteTypeToRow((NoteType)iAnswers[c]) : 48);
break; break;
case shift_pauses_forward: case shift_pauses_forward:
GetAppropriateTiming().InsertRows( GetRow(), GetAppropriateTimingForUpdate().InsertRows( GetRow(),
iAnswers.size() > 0 ? iAnswers.size() > 0 ?
NoteTypeToRow((NoteType)iAnswers[c]) : 48); NoteTypeToRow((NoteType)iAnswers[c]) : 48);
break; break;
case shift_pauses_backward: case shift_pauses_backward:
GetAppropriateTiming().DeleteRows( GetRow() + 1, GetAppropriateTimingForUpdate().DeleteRows( GetRow() + 1,
iAnswers.size() > 0 ? iAnswers.size() > 0 ?
NoteTypeToRow((NoteType)iAnswers[c]) : 48); NoteTypeToRow((NoteType)iAnswers[c]) : 48);
break; break;
@@ -4975,18 +4987,18 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector<int> &iAns
case convert_pause_to_beat: case convert_pause_to_beat:
{ {
float fStopSeconds = GetAppropriateTiming().GetStopAtRow(GetRow()); float fStopSeconds = GetAppropriateTiming().GetStopAtRow(GetRow());
GetAppropriateTiming().SetStopAtBeat( GetBeat() , 0 ); GetAppropriateTimingForUpdate().SetStopAtBeat( GetBeat() , 0 );
float fStopBeats = fStopSeconds * GetAppropriateTiming().GetBPMAtBeat( GetBeat() ) / 60; float fStopBeats = fStopSeconds * GetAppropriateTiming().GetBPMAtBeat( GetBeat() ) / 60;
// don't move the step from where it is, just move everything later // don't move the step from where it is, just move everything later
NoteDataUtil::InsertRows( m_NoteDataEdit, GetRow() + 1, BeatToNoteRow(fStopBeats) ); NoteDataUtil::InsertRows( m_NoteDataEdit, GetRow() + 1, BeatToNoteRow(fStopBeats) );
GetAppropriateTiming().InsertRows( GetRow() + 1, BeatToNoteRow(fStopBeats) ); GetAppropriateTimingForUpdate().InsertRows( GetRow() + 1, BeatToNoteRow(fStopBeats) );
} }
break; break;
case convert_delay_to_beat: case convert_delay_to_beat:
{ {
TimingData &timing = GetAppropriateTiming(); TimingData &timing = GetAppropriateTimingForUpdate();
float pause = timing.GetDelayAtRow(GetRow()); float pause = timing.GetDelayAtRow(GetRow());
timing.SetDelayAtRow(GetRow(), 0); timing.SetDelayAtRow(GetRow(), 0);
@@ -4998,7 +5010,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector<int> &iAns
} }
case last_second_at_beat: case last_second_at_beat:
{ {
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
Song &s = *GAMESTATE->m_pCurSong; Song &s = *GAMESTATE->m_pCurSong;
s.SetSpecifiedLastSecond(timing.GetElapsedTimeFromBeat(GetBeat())); s.SetSpecifiedLastSecond(timing.GetElapsedTimeFromBeat(GetBeat()));
break; break;
@@ -5778,7 +5790,7 @@ static RString GetDeviceButtonsLocalized( const vector<EditButton> &veb, const M
void ScreenEdit::DoStepAttackMenu() void ScreenEdit::DoStepAttackMenu()
{ {
TimingData &timing = GetAppropriateTiming(); const TimingData &timing = GetAppropriateTiming();
float startTime = timing.GetElapsedTimeFromBeat(GetBeat()); float startTime = timing.GetElapsedTimeFromBeat(GetBeat());
AttackArray &attacks = AttackArray &attacks =
(GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks); (GAMESTATE->m_bIsUsingStepTiming ? m_pSteps->m_Attacks : m_pSong->m_Attacks);
src/ScreenEdit.h
+4 -1
View File
@@ -682,7 +682,10 @@ private:
/** /**
* @brief Retrieve the appropriate TimingData based on GAMESTATE. * @brief Retrieve the appropriate TimingData based on GAMESTATE.
* @return the proper TimingData. */ * @return the proper TimingData. */
TimingData & GetAppropriateTiming() const; const TimingData & GetAppropriateTiming() const;
/**
* @brief Retrieve the appropriate TimingData to use for updating. */
TimingData & GetAppropriateTimingForUpdate();
/** /**
* @brief Retrieve the appropriate SongPosition data based on GAMESTATE. * @brief Retrieve the appropriate SongPosition data based on GAMESTATE.
* @return the proper SongPosition. */ * @return the proper SongPosition. */