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

move autogen into NoteDataUtil

Browse Source
This commit is contained in:
Glenn Maynard
2004-07-17 05:10:11 +00:00
parent 7f2a2c7e44
commit b7799ccd0a
5 changed files with 131 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
-128
View File
@@ -758,134 +758,6 @@ void NoteData::LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, co
m_AttackMap = Original.GetAttackMap();
}
void NoteData::LoadOverlapped( const NoteData* pOriginal, int iNewNumTracks )
{
SetNumTracks( iNewNumTracks );
NoteData in;
in.To4s( *pOriginal );
/* Keep track of the last source track that put a tap into each destination track,
* and the row of that tap. Then, if two rows are trying to put taps into the
* same row within the shift threshold, shift the newcomer source row. */
int LastSourceTrack[MAX_NOTE_TRACKS];
int LastSourceRow[MAX_NOTE_TRACKS];
int DestRow[MAX_NOTE_TRACKS];
for( unsigned tr = 0; tr < MAX_NOTE_TRACKS; ++tr )
{
LastSourceTrack[tr] = -1;
LastSourceRow[tr] = -9999;
DestRow[tr] = tr;
wrap( DestRow[tr], iNewNumTracks );
}
const int ShiftThreshold = BeatToNoteRow(1);
const int iLastRow = in.GetMaxRow();
for( int row = 0; row < iLastRow; ++row )
{
for ( int i = 0; i < in.GetNumTracks(); i++ )
{
const int iTrackFrom = i;
int &iTrackTo = DestRow[i];
const TapNote iStepFrom = in.m_TapNotes[iTrackFrom][row];
if( iStepFrom == TAP_EMPTY )
continue;
if( LastSourceTrack[iTrackTo] != iTrackFrom &&
row - LastSourceRow[iTrackTo] < ShiftThreshold )
{
/* This destination track is in use by a different source track. Use the
* least-recently-used track. */
for( int DestTrack = 0; DestTrack < iNewNumTracks; ++DestTrack )
if( LastSourceRow[DestTrack] < LastSourceRow[iTrackTo] )
iTrackTo = DestTrack;
}
/* If it's still in use, then we just don't have an available track. */
if( LastSourceTrack[iTrackTo] != iTrackFrom &&
row - LastSourceRow[iTrackTo] < ShiftThreshold )
continue;
LastSourceTrack[iTrackTo] = iTrackFrom;
LastSourceRow[iTrackTo] = row;
SetTapNote( iTrackTo, row, iStepFrom );
}
}
Convert4sToHoldNotes();
}
void NoteData::LoadTransformedSlidingWindow( const NoteData* pOriginal, int iNewNumTracks )
{
// reset all notes
Init();
if( pOriginal->GetNumTracks() > iNewNumTracks )
{
/* Use a different algorithm for reducing tracks. */
LoadOverlapped( pOriginal, iNewNumTracks );
return;
}
NoteData Original;
Original.To4s( *pOriginal );
Config(*pOriginal);
m_iNumTracks = iNewNumTracks;
int iCurTrackOffset = 0;
int iTrackOffsetMin = 0;
int iTrackOffsetMax = abs( iNewNumTracks - Original.m_iNumTracks );
int bOffsetIncreasing = true;
int iLastRow = Original.GetLastRow();
for( int r=0; r<=iLastRow; )
{
// copy notes in this measure
for( int t=0; t<Original.m_iNumTracks; t++ )
{
int iOldTrack = t;
int iNewTrack = (iOldTrack + iCurTrackOffset) % iNewNumTracks;
this->SetTapNote(iNewTrack, r, Original.GetTapNote(iOldTrack, r));
}
r++;
if( r % (ROWS_PER_MEASURE*4) == 0 ) // adjust sliding window every 4 measures
{
// See if there is a hold crossing the beginning of this measure
bool bHoldCrossesThisMeasure = false;
if( r )
for( int t=0; t<=Original.m_iNumTracks; t++ )
{
if( Original.GetTapNote(t, r) == TAP_HOLD &&
Original.GetTapNote(t, r-1) == TAP_HOLD)
{
bHoldCrossesThisMeasure = true;
break;
}
}
// adjust offset
if( !bHoldCrossesThisMeasure )
{
iCurTrackOffset += bOffsetIncreasing ? 1 : -1;
if( iCurTrackOffset == iTrackOffsetMin || iCurTrackOffset == iTrackOffsetMax )
bOffsetIncreasing ^= true;
CLAMP( iCurTrackOffset, iTrackOffsetMin, iTrackOffsetMax );
}
}
}
Convert4sToHoldNotes();
m_AttackMap = Original.GetAttackMap();
}
void NoteData::PadTapNotes(int rows)
{
int needed = rows - m_TapNotes[0].size() + 1;
stepmania/src/NoteData.h
-3
View File
@@ -22,8 +22,6 @@ class NoteData
/* Pad m_TapNotes so it includes the row "rows". */
void PadTapNotes(int rows);
void LoadOverlapped( const NoteData* pOriginal, int iNewNumTracks );
public:
/* Set up to hold the data in From; same number of tracks, same
@@ -126,7 +124,6 @@ public:
// Transformations
void LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, const int iOriginalTrackToTakeFrom[] ); // -1 for iOriginalTracksToTakeFrom means no track
void LoadTransformedSlidingWindow( const NoteData* pOriginal, int iNewNumTracks ); // used by autogen
// Convert between HoldNote representation and '2' and '3' markers in TapNotes
void Convert2sAnd3sToHoldNotes();
stepmania/src/NoteDataUtil.cpp
+128
View File
@@ -253,6 +253,134 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in_, CString &notes_out,
}
}
void NoteDataUtil::LoadTransformedSlidingWindow( const NoteData &in, NoteData &out, int iNewNumTracks )
{
// reset all notes
out.Init();
if( in.GetNumTracks() > iNewNumTracks )
{
/* Use a different algorithm for reducing tracks. */
LoadOverlapped( in, out, iNewNumTracks );
return;
}
NoteData Original;
Original.To4s( in );
out.Config( in );
out.SetNumTracks( iNewNumTracks );
int iCurTrackOffset = 0;
int iTrackOffsetMin = 0;
int iTrackOffsetMax = abs( iNewNumTracks - Original.GetNumTracks() );
int bOffsetIncreasing = true;
int iLastRow = Original.GetLastRow();
for( int r=0; r<=iLastRow; )
{
// copy notes in this measure
for( int t=0; t<Original.GetNumTracks(); t++ )
{
int iOldTrack = t;
int iNewTrack = (iOldTrack + iCurTrackOffset) % iNewNumTracks;
out.SetTapNote(iNewTrack, r, Original.GetTapNote(iOldTrack, r));
}
r++;
if( r % (ROWS_PER_MEASURE*4) == 0 ) // adjust sliding window every 4 measures
{
// See if there is a hold crossing the beginning of this measure
bool bHoldCrossesThisMeasure = false;
if( r )
for( int t=0; t<=Original.GetNumTracks(); t++ )
{
if( Original.GetTapNote(t, r) == TAP_HOLD &&
Original.GetTapNote(t, r-1) == TAP_HOLD)
{
bHoldCrossesThisMeasure = true;
break;
}
}
// adjust offset
if( !bHoldCrossesThisMeasure )
{
iCurTrackOffset += bOffsetIncreasing ? 1 : -1;
if( iCurTrackOffset == iTrackOffsetMin || iCurTrackOffset == iTrackOffsetMax )
bOffsetIncreasing ^= true;
CLAMP( iCurTrackOffset, iTrackOffsetMin, iTrackOffsetMax );
}
}
}
out.Convert4sToHoldNotes();
out.GetAttackMap() = Original.GetAttackMap();
}
void NoteDataUtil::LoadOverlapped( const NoteData &input, NoteData &out, int iNewNumTracks )
{
out.SetNumTracks( iNewNumTracks );
NoteData in;
in.To4s( input );
/* Keep track of the last source track that put a tap into each destination track,
* and the row of that tap. Then, if two rows are trying to put taps into the
* same row within the shift threshold, shift the newcomer source row. */
int LastSourceTrack[MAX_NOTE_TRACKS];
int LastSourceRow[MAX_NOTE_TRACKS];
int DestRow[MAX_NOTE_TRACKS];
for( unsigned tr = 0; tr < MAX_NOTE_TRACKS; ++tr )
{
LastSourceTrack[tr] = -1;
LastSourceRow[tr] = -9999;
DestRow[tr] = tr;
wrap( DestRow[tr], iNewNumTracks );
}
const int ShiftThreshold = BeatToNoteRow(1);
const int iLastRow = in.GetMaxRow();
for( int row = 0; row < iLastRow; ++row )
{
for ( int i = 0; i < in.GetNumTracks(); i++ )
{
const int iTrackFrom = i;
int &iTrackTo = DestRow[i];
const TapNote iStepFrom = in.GetTapNote( iTrackFrom, row );
if( iStepFrom == TAP_EMPTY )
continue;
if( LastSourceTrack[iTrackTo] != iTrackFrom &&
row - LastSourceRow[iTrackTo] < ShiftThreshold )
{
/* This destination track is in use by a different source track. Use the
* least-recently-used track. */
for( int DestTrack = 0; DestTrack < iNewNumTracks; ++DestTrack )
if( LastSourceRow[DestTrack] < LastSourceRow[iTrackTo] )
iTrackTo = DestTrack;
}
/* If it's still in use, then we just don't have an available track. */
if( LastSourceTrack[iTrackTo] != iTrackFrom &&
row - LastSourceRow[iTrackTo] < ShiftThreshold )
continue;
LastSourceTrack[iTrackTo] = iTrackFrom;
LastSourceRow[iTrackTo] = row;
out.SetTapNote( iTrackTo, row, iStepFrom );
}
}
out.Convert4sToHoldNotes();
}
void NoteDataUtil::LoadTransformedLights( const NoteData &in, NoteData &out, int iNewNumTracks )
{
// reset all notes
stepmania/src/NoteDataUtil.h
+2
View File
@@ -19,6 +19,8 @@ namespace NoteDataUtil
NoteType GetSmallestNoteTypeForMeasure( const NoteData &n, int iMeasureIndex );
void LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData, CString sSMAttackData );
void GetSMNoteDataString( const NoteData &in, CString &notes_out, CString &attacks_out );
void LoadTransformedSlidingWindow( const NoteData &in, NoteData &out, int iNewNumTracks );
void LoadOverlapped( const NoteData &in, NoteData &out, int iNewNumTracks );
void LoadTransformedLights( const NoteData &in, NoteData &out, int iNewNumTracks );
// radar values - return between 0.0 and 1.2
stepmania/src/Steps.cpp
+1 -1
View File
@@ -179,7 +179,7 @@ void Steps::Decompress() const
{
NoteDataUtil::LoadTransformedLights( pdata, *notes, iNewTracks );
} else {
notes->LoadTransformedSlidingWindow( &pdata, iNewTracks );
NoteDataUtil::LoadTransformedSlidingWindow( pdata, *notes, iNewTracks );
NoteDataUtil::FixImpossibleRows( *notes, m_StepsType );
}