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

rename: Converge -> Centered

Browse Source
This commit is contained in:
Chris Danford
2004-08-29 07:12:37 +00:00
parent 4c09e63ec4
commit 5430ecb232
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ArrowEffects.cpp
+2 -2
View File
@@ -109,8 +109,8 @@ static void ArrowGetReverseShiftAndScale( PlayerNumber pn, int iCol, float fYRev
float fPercentReverse = GAMESTATE->m_CurrentPlayerOptions[pn].GetReversePercentForColumn(iCol); float fPercentReverse = GAMESTATE->m_CurrentPlayerOptions[pn].GetReversePercentForColumn(iCol);
fShiftOut = SCALE( fPercentReverse, 0.f, 1.f, -fYReverseOffsetPixels/fZoom/2, fYReverseOffsetPixels/fZoom/2 ); fShiftOut = SCALE( fPercentReverse, 0.f, 1.f, -fYReverseOffsetPixels/fZoom/2, fYReverseOffsetPixels/fZoom/2 );
float fPercentConverge = GAMESTATE->m_CurrentPlayerOptions[pn].m_fScrolls[PlayerOptions::SCROLL_CONVERGE]; float fPercentCentered = GAMESTATE->m_CurrentPlayerOptions[pn].m_fScrolls[PlayerOptions::SCROLL_CENTERED];
fShiftOut = SCALE( fPercentConverge, 0.f, 1.f, fShiftOut, 0.5f ); fShiftOut = SCALE( fPercentCentered, 0.f, 1.f, fShiftOut, 0.5f );
fScaleOut = SCALE( fPercentReverse, 0.f, 1.f, 1.f, -1.f); fScaleOut = SCALE( fPercentReverse, 0.f, 1.f, 1.f, -1.f);
} }
stepmania/src/NoteField.cpp
+4 -4
View File
@@ -407,12 +407,12 @@ void NoteField::DrawPrimitives()
// Adjust draw range depending on some effects // Adjust draw range depending on some effects
// //
int iFirstPixelToDraw = m_iStartDrawingPixel; int iFirstPixelToDraw = m_iStartDrawingPixel;
// HACK: if boomerang and converge are on, then we want to draw much // HACK: if boomerang and centered are on, then we want to draw much
// earlier to that the notes don't pop on screen. // earlier to that the notes don't pop on screen.
float fConvergeTimesBoomerang = float fCenteredTimesBoomerang =
current_po.m_fScrolls[PlayerOptions::SCROLL_CONVERGE] * current_po.m_fScrolls[PlayerOptions::SCROLL_CENTERED] *
current_po.m_fAccels[PlayerOptions::ACCEL_BOOMERANG]; current_po.m_fAccels[PlayerOptions::ACCEL_BOOMERANG];
iFirstPixelToDraw += SCALE( fConvergeTimesBoomerang, 0.f, 1.f, 0.f, -SCREEN_HEIGHT/2 ); iFirstPixelToDraw += SCALE( fCenteredTimesBoomerang, 0.f, 1.f, 0.f, -SCREEN_HEIGHT/2 );
int iLastPixelToDraw = m_iEndDrawingPixel; int iLastPixelToDraw = m_iEndDrawingPixel;
float fDrawScale = 1; float fDrawScale = 1;
stepmania/src/OptionIconRow.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ const OptionColumnEntry g_OptionColumnEntries[] =
{"Split", 5}, {"Split", 5},
{"Alternate", 5}, {"Alternate", 5},
{"Cross", 5}, {"Cross", 5},
{"Converge", 5}, {"Centered", 5},
{"Incoming", 6}, {"Incoming", 6},
{"Space", 6}, {"Space", 6},
{"Hallway", 6}, {"Hallway", 6},
stepmania/src/PlayerOptions.cpp
+2 -2
View File
@@ -122,7 +122,7 @@ CString PlayerOptions::GetString() const
sReturn += AddPart( m_fScrolls[SCROLL_SPLIT], "Split" ); sReturn += AddPart( m_fScrolls[SCROLL_SPLIT], "Split" );
sReturn += AddPart( m_fScrolls[SCROLL_ALTERNATE], "Alternate" ); sReturn += AddPart( m_fScrolls[SCROLL_ALTERNATE], "Alternate" );
sReturn += AddPart( m_fScrolls[SCROLL_CROSS], "Cross" ); sReturn += AddPart( m_fScrolls[SCROLL_CROSS], "Cross" );
sReturn += AddPart( m_fScrolls[SCROLL_CONVERGE], "Converge" ); sReturn += AddPart( m_fScrolls[SCROLL_CENTERED], "Centered" );
sReturn += AddPart( m_fDark, "Dark"); sReturn += AddPart( m_fDark, "Dark");
@@ -285,7 +285,7 @@ void PlayerOptions::FromString( CString sOptions )
else if( sBit == "split" ) SET_FLOAT( fScrolls[SCROLL_SPLIT] ) else if( sBit == "split" ) SET_FLOAT( fScrolls[SCROLL_SPLIT] )
else if( sBit == "alternate" ) SET_FLOAT( fScrolls[SCROLL_ALTERNATE] ) else if( sBit == "alternate" ) SET_FLOAT( fScrolls[SCROLL_ALTERNATE] )
else if( sBit == "cross" ) SET_FLOAT( fScrolls[SCROLL_CROSS] ) else if( sBit == "cross" ) SET_FLOAT( fScrolls[SCROLL_CROSS] )
else if( sBit == "converge" ) SET_FLOAT( fScrolls[SCROLL_CONVERGE] ) else if( sBit == "centered" || sBit == "converge" ) SET_FLOAT( fScrolls[SCROLL_CENTERED] )
else if( sBit == "noholds" || sBit == "nofreeze" ) m_bTransforms[TRANSFORM_NOHOLDS] = on; else if( sBit == "noholds" || sBit == "nofreeze" ) m_bTransforms[TRANSFORM_NOHOLDS] = on;
else if( sBit == "nomines" ) m_bTransforms[TRANSFORM_NOMINES] = on; else if( sBit == "nomines" ) m_bTransforms[TRANSFORM_NOMINES] = on;
else if( sBit == "dark" ) SET_FLOAT( fDark ) else if( sBit == "dark" ) SET_FLOAT( fDark )
stepmania/src/PlayerOptions.h
+1 -1
View File
@@ -86,7 +86,7 @@ struct PlayerOptions
SCROLL_SPLIT, SCROLL_SPLIT,
SCROLL_ALTERNATE, SCROLL_ALTERNATE,
SCROLL_CROSS, SCROLL_CROSS,
SCROLL_CONVERGE, SCROLL_CENTERED,
NUM_SCROLLS NUM_SCROLLS
}; };
float GetReversePercentForColumn( int iCol ); // accounts for all Directions float GetReversePercentForColumn( int iCol ); // accounts for all Directions