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

Another attempt at Mini <-> Tiny. This one should be much closer or working.

Browse Source
This commit is contained in:
Colby Klein
2011-07-05 11:17:12 -07:00
parent 4b092229de
commit ae8d923bec
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+2 -2
View File
@@ -200,8 +200,8 @@ DrunkOffsetFrequency=10
DrunkArrowMagnitude=0.5 DrunkArrowMagnitude=0.5
BeatOffsetHeight=15 BeatOffsetHeight=15
BeatPIHeight=2 BeatPIHeight=2
MiniPercentBase=0.5 TinyPercentBase=0.5
MiniPercentGate=1 TinyPercentGate=1
DizzyHoldHeads=false DizzyHoldHeads=false
QuantizeArrowYPosition=false QuantizeArrowYPosition=false
Themes/default/Graphics/CombinedLifeMeterTug separator.redir
+1 -1
View File
@@ -1 +1 @@
_blank _CombinedLifeMeterTug separator
src/ArrowEffects.cpp
+6 -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> DRUNK_ARROW_MAGNITUDE( "ArrowEffects", "DrunkArrowMagnitude" );
static ThemeMetric<float> BEAT_OFFSET_HEIGHT( "ArrowEffects", "BeatOffsetHeight" ); static ThemeMetric<float> BEAT_OFFSET_HEIGHT( "ArrowEffects", "BeatOffsetHeight" );
static ThemeMetric<float> BEAT_PI_HEIGHT( "ArrowEffects", "BeatPIHeight" ); static ThemeMetric<float> BEAT_PI_HEIGHT( "ArrowEffects", "BeatPIHeight" );
static ThemeMetric<float> MINI_PERCENT_BASE( "ArrowEffects", "MiniPercentBase" ); static ThemeMetric<float> TINY_PERCENT_BASE( "ArrowEffects", "TinyPercentBase" );
static ThemeMetric<float> MINI_PERCENT_GATE( "ArrowEffects", "MiniPercentGate" ); static ThemeMetric<float> TINY_PERCENT_GATE( "ArrowEffects", "TinyPercentGate" );
static ThemeMetric<bool> DIZZY_HOLD_HEADS( "ArrowEffects", "DizzyHoldHeads" ); static ThemeMetric<bool> DIZZY_HOLD_HEADS( "ArrowEffects", "DizzyHoldHeads" );
float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithoutReverse ); float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithoutReverse );
@@ -489,12 +489,12 @@ float ArrowEffects::GetXPos( const PlayerState* pPlayerState, int iColNum, float
fPixelOffsetFromCenter += pCols[iColNum].fXOffset; fPixelOffsetFromCenter += pCols[iColNum].fXOffset;
if( fEffects[PlayerOptions::EFFECT_MINI] != 0 ) if( fEffects[PlayerOptions::EFFECT_TINY] != 0 )
{ {
// Allow Mini to pull tracks together, but not to push them apart. // Allow Mini to pull tracks together, but not to push them apart.
float fMiniPercent = fEffects[PlayerOptions::EFFECT_MINI]; float fTinyPercent = fEffects[PlayerOptions::EFFECT_TINY];
fMiniPercent = min( powf(MINI_PERCENT_BASE, fMiniPercent), (float)MINI_PERCENT_GATE ); fTinyPercent = min( powf(TINY_PERCENT_BASE, fTinyPercent), (float)TINY_PERCENT_GATE );
fPixelOffsetFromCenter *= fMiniPercent; fPixelOffsetFromCenter *= fTinyPercent;
} }
return fPixelOffsetFromCenter; return fPixelOffsetFromCenter;
src/Player.cpp
+1 -1
View File
@@ -867,7 +867,7 @@ void Player::Update( float fDeltaTime )
Actor::TweenState::MakeWeightedAverage( m_pActorWithComboPosition->DestTweenState(), ts1, ts2, fPercentCentered ); Actor::TweenState::MakeWeightedAverage( m_pActorWithComboPosition->DestTweenState(), ts1, ts2, fPercentCentered );
} }
float fNoteFieldZoom = 1 - fTinyPercent*0.5f; float fNoteFieldZoom = 1 - fMiniPercent*0.5f;
if( m_pNoteField ) if( m_pNoteField )
m_pNoteField->SetZoom( fNoteFieldZoom ); m_pNoteField->SetZoom( fNoteFieldZoom );
if( m_pActorWithJudgmentPosition != NULL ) if( m_pActorWithJudgmentPosition != NULL )