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

Minor tweaks in gameman (pump stuff) and notesloaderksf

Browse Source
This commit is contained in:
Alberto Ramos
2010-07-21 14:08:48 -06:00
parent 2296ff6b25
commit 9cab120e24
2 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameManager.cpp
+62 -62
View File
@@ -647,20 +647,20 @@ static const Style g_Style_Pump_HalfDouble =
6, // m_iColsPerPlayer 6, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1 { // PLAYER_1
{ TRACK_1, -PUMP_COL_SPACING*2.5f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*2.5f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*1.5f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*1.5f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*0.5f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*0.5f-5, NULL },
{ TRACK_4, +PUMP_COL_SPACING*0.5f+4, NULL }, { TRACK_4, +PUMP_COL_SPACING*0.5f+5, NULL },
{ TRACK_5, +PUMP_COL_SPACING*1.5f+4, NULL }, { TRACK_5, +PUMP_COL_SPACING*1.5f+5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*2.5f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*2.5f+5, NULL },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, -PUMP_COL_SPACING*2.5f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*2.5f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*1.5f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*1.5f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*0.5f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*0.5f-5, NULL },
{ TRACK_4, +PUMP_COL_SPACING*0.5f+4, NULL }, { TRACK_4, +PUMP_COL_SPACING*0.5f+5, NULL },
{ TRACK_5, +PUMP_COL_SPACING*1.5f+4, NULL }, { TRACK_5, +PUMP_COL_SPACING*1.5f+5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*2.5f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*2.5f+5, NULL },
}, },
}, },
{ // m_iInputColumn[NUM_GameController][NUM_GameButton] { // m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -687,28 +687,28 @@ static const Style g_Style_Pump_Double =
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1 { // PLAYER_1
{ TRACK_1, -PUMP_COL_SPACING*4.5f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*4.5f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*3.5f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*3.5f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*2.5f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*2.5f-5, NULL },
{ TRACK_4, -PUMP_COL_SPACING*1.5f-4, NULL }, { TRACK_4, -PUMP_COL_SPACING*1.5f-5, NULL },
{ TRACK_5, -PUMP_COL_SPACING*0.5f-4, NULL }, { TRACK_5, -PUMP_COL_SPACING*0.5f-5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*0.5f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*0.5f+5, NULL },
{ TRACK_7, +PUMP_COL_SPACING*1.5f+4, NULL }, { TRACK_7, +PUMP_COL_SPACING*1.5f+5, NULL },
{ TRACK_8, +PUMP_COL_SPACING*2.5f+4, NULL }, { TRACK_8, +PUMP_COL_SPACING*2.5f+5, NULL },
{ TRACK_9, +PUMP_COL_SPACING*3.5f+4, NULL }, { TRACK_9, +PUMP_COL_SPACING*3.5f+5, NULL },
{ TRACK_10, +PUMP_COL_SPACING*4.5f+4, NULL }, { TRACK_10, +PUMP_COL_SPACING*4.5f+5, NULL },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, -PUMP_COL_SPACING*4.5f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*4.5f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*3.5f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*3.5f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*2.5f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*2.5f-5, NULL },
{ TRACK_4, -PUMP_COL_SPACING*1.5f-4, NULL }, { TRACK_4, -PUMP_COL_SPACING*1.5f-5, NULL },
{ TRACK_5, -PUMP_COL_SPACING*0.5f-4, NULL }, { TRACK_5, -PUMP_COL_SPACING*0.5f-5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*0.5f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*0.5f+5, NULL },
{ TRACK_7, +PUMP_COL_SPACING*1.5f+4, NULL }, { TRACK_7, +PUMP_COL_SPACING*1.5f+5, NULL },
{ TRACK_8, +PUMP_COL_SPACING*2.5f+4, NULL }, { TRACK_8, +PUMP_COL_SPACING*2.5f+5, NULL },
{ TRACK_9, +PUMP_COL_SPACING*3.5f+4, NULL }, { TRACK_9, +PUMP_COL_SPACING*3.5f+5, NULL },
{ TRACK_10, +PUMP_COL_SPACING*4.5f+4, NULL }, { TRACK_10, +PUMP_COL_SPACING*4.5f+5, NULL },
}, },
}, },
{ // m_iInputColumn[NUM_GameController][NUM_GameButton] { // m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -773,16 +773,16 @@ static const Style g_Style_Pump_Couple_Edit =
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1 { // PLAYER_1
{ TRACK_1, -PUMP_COL_SPACING*5.0f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*5.0f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*4.0f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*4.0f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*3.0f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*3.0f-5, NULL },
{ TRACK_4, -PUMP_COL_SPACING*2.0f-4, NULL }, { TRACK_4, -PUMP_COL_SPACING*2.0f-5, NULL },
{ TRACK_5, -PUMP_COL_SPACING*1.0f-4, NULL }, { TRACK_5, -PUMP_COL_SPACING*1.0f-5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*1.0f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*1.0f+5, NULL },
{ TRACK_7, +PUMP_COL_SPACING*2.0f+4, NULL }, { TRACK_7, +PUMP_COL_SPACING*2.0f+5, NULL },
{ TRACK_8, +PUMP_COL_SPACING*3.0f+4, NULL }, { TRACK_8, +PUMP_COL_SPACING*3.0f+5, NULL },
{ TRACK_9, +PUMP_COL_SPACING*4.0f+4, NULL }, { TRACK_9, +PUMP_COL_SPACING*4.0f+5, NULL },
{ TRACK_10, +PUMP_COL_SPACING*5.0f+4, NULL }, { TRACK_10, +PUMP_COL_SPACING*5.0f+5, NULL },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, -PUMP_COL_SPACING*2.0f, NULL }, { TRACK_1, -PUMP_COL_SPACING*2.0f, NULL },
@@ -816,28 +816,28 @@ static const Style g_Style_Pump_Routine =
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1 { // PLAYER_1
{ TRACK_1, -PUMP_COL_SPACING*4.6f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*4.6f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*3.6f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*3.6f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*2.6f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*2.6f-5, NULL },
{ TRACK_4, -PUMP_COL_SPACING*1.6f-4, NULL }, { TRACK_4, -PUMP_COL_SPACING*1.6f-5, NULL },
{ TRACK_5, -PUMP_COL_SPACING*0.6f-4, NULL }, { TRACK_5, -PUMP_COL_SPACING*0.6f-5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*0.6f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*0.6f+5, NULL },
{ TRACK_7, +PUMP_COL_SPACING*1.6f+4, NULL }, { TRACK_7, +PUMP_COL_SPACING*1.6f+5, NULL },
{ TRACK_8, +PUMP_COL_SPACING*2.6f+4, NULL }, { TRACK_8, +PUMP_COL_SPACING*2.6f+5, NULL },
{ TRACK_9, +PUMP_COL_SPACING*3.6f+4, NULL }, { TRACK_9, +PUMP_COL_SPACING*3.6f+5, NULL },
{ TRACK_10, +PUMP_COL_SPACING*4.6f+4, NULL }, { TRACK_10, +PUMP_COL_SPACING*4.6f+5, NULL },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_1, -PUMP_COL_SPACING*4.6f-4, NULL }, { TRACK_1, -PUMP_COL_SPACING*4.6f-5, NULL },
{ TRACK_2, -PUMP_COL_SPACING*3.6f-4, NULL }, { TRACK_2, -PUMP_COL_SPACING*3.6f-5, NULL },
{ TRACK_3, -PUMP_COL_SPACING*2.6f-4, NULL }, { TRACK_3, -PUMP_COL_SPACING*2.6f-5, NULL },
{ TRACK_4, -PUMP_COL_SPACING*1.6f-4, NULL }, { TRACK_4, -PUMP_COL_SPACING*1.6f-5, NULL },
{ TRACK_5, -PUMP_COL_SPACING*0.6f-4, NULL }, { TRACK_5, -PUMP_COL_SPACING*0.6f-5, NULL },
{ TRACK_6, +PUMP_COL_SPACING*0.6f+4, NULL }, { TRACK_6, +PUMP_COL_SPACING*0.6f+5, NULL },
{ TRACK_7, +PUMP_COL_SPACING*1.6f+4, NULL }, { TRACK_7, +PUMP_COL_SPACING*1.6f+5, NULL },
{ TRACK_8, +PUMP_COL_SPACING*2.6f+4, NULL }, { TRACK_8, +PUMP_COL_SPACING*2.6f+5, NULL },
{ TRACK_9, +PUMP_COL_SPACING*3.6f+4, NULL }, { TRACK_9, +PUMP_COL_SPACING*3.6f+5, NULL },
{ TRACK_10, +PUMP_COL_SPACING*4.6f+4, NULL }, { TRACK_10, +PUMP_COL_SPACING*4.6f+5, NULL },
}, },
}, },
{ // m_iInputColumn[NUM_GameController][NUM_GameButton] { // m_iInputColumn[NUM_GameController][NUM_GameButton]
src/NotesLoaderKSF.cpp
+2 -2
View File
@@ -456,7 +456,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
// CheckpointsUseTimeSignatures metric. -aj // CheckpointsUseTimeSignatures metric. -aj
TimeSignatureSegment seg; TimeSignatureSegment seg;
seg.m_iStartRow = BeatToNoteRow(0.0f); seg.m_iStartRow = BeatToNoteRow(0.0f);
seg.m_iNumerator = CLAMP( iTickCount, 0, ROWS_PER_BEAT ); seg.m_iNumerator = iTickCount > ROWS_PER_BEAT ? ROWS_PER_BEAT : iTickCount;
seg.m_iDenominator = 4; seg.m_iDenominator = 4;
out.m_Timing.AddTimeSignatureSegment( seg ); out.m_Timing.AddTimeSignatureSegment( seg );
} }
@@ -565,7 +565,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
iTickCount = (int)numTemp; iTickCount = (int)numTemp;
TimeSignatureSegment seg; TimeSignatureSegment seg;
seg.m_iStartRow = BeatToNoteRow(fCurBeat); seg.m_iStartRow = BeatToNoteRow(fCurBeat);
seg.m_iNumerator = CLAMP( iTickCount, 0, ROWS_PER_BEAT); seg.m_iNumerator = iTickCount > ROWS_PER_BEAT ? ROWS_PER_BEAT : iTickCount;
seg.m_iDenominator = 4; seg.m_iDenominator = 4;
out.m_Timing.AddTimeSignatureSegment( seg ); out.m_Timing.AddTimeSignatureSegment( seg );