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

revert changes, swap mini<->tiny when loading as a temp solution.

Browse Source
This commit is contained in:
Colby Klein
2011-07-05 12:22:23 -07:00
parent d45eb34823
commit e9c23c0b83
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ArrowEffects.cpp
+7 -6
View File
@@ -56,8 +56,8 @@ static ThemeMetric<float> DRUNK_OFFSET_FREQUENCY( "ArrowEffects", "DrunkOffsetFr
static ThemeMetric<float> DRUNK_ARROW_MAGNITUDE( "ArrowEffects", "DrunkArrowMagnitude" );
static ThemeMetric<float> BEAT_OFFSET_HEIGHT( "ArrowEffects", "BeatOffsetHeight" );
static ThemeMetric<float> BEAT_PI_HEIGHT( "ArrowEffects", "BeatPIHeight" );
static ThemeMetric<float> TINY_PERCENT_BASE( "ArrowEffects", "TinyPercentBase" );
static ThemeMetric<float> TINY_PERCENT_GATE( "ArrowEffects", "TinyPercentGate" );
static ThemeMetric<float> TINY_PERCENT_BASE( "ArrowEffects", "MiniPercentBase" );
static ThemeMetric<float> TINY_PERCENT_GATE( "ArrowEffects", "MiniPercentGate" );
static ThemeMetric<bool> DIZZY_HOLD_HEADS( "ArrowEffects", "DizzyHoldHeads" );
float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithoutReverse );
@@ -489,12 +489,13 @@ float ArrowEffects::GetXPos( const PlayerState* pPlayerState, int iColNum, float
fPixelOffsetFromCenter += pCols[iColNum].fXOffset;
if( fEffects[PlayerOptions::EFFECT_TINY] != 0 )
// XXX: Mini and tiny have names swapped! Fix this. -shakesoda
if( fEffects[PlayerOptions::EFFECT_MINI] != 0 )
{
// Allow Mini to pull tracks together, but not to push them apart.
float fTinyPercent = fEffects[PlayerOptions::EFFECT_TINY];
fTinyPercent = min( powf(TINY_PERCENT_BASE, fTinyPercent), (float)TINY_PERCENT_GATE );
fPixelOffsetFromCenter *= fTinyPercent;
float fMiniPercent = fEffects[PlayerOptions::EFFECT_MINI];
fMiniPercent = min( powf(TINY_PERCENT_BASE, fMiniPercent), (float)TINY_PERCENT_GATE );
fPixelOffsetFromCenter *= fMiniPercent;
}
return fPixelOffsetFromCenter;