From 670a788897d1102ee52fcee3af31bcc3cfd70a82 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 12 Feb 2011 01:57:40 -0500 Subject: [PATCH] Mini can be adjusted. Had to force a cast. --- Themes/_fallback/metrics.ini | 2 ++ src/ArrowEffects.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 83910c2916..c93357f68f 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -161,6 +161,8 @@ DrunkOffsetFrequency=10 DrunkArrowMagnitude=0.5 BeatOffsetHeight=15 BeatPIHeight=2 +MiniPercentBase=0.5 +MiniPercentGate=1 QuantizeArrowYPosition=false [Background] diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 182b6bcfa2..f19cf6f40f 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -48,6 +48,8 @@ static ThemeMetric DRUNK_OFFSET_FREQUENCY( "ArrowEffects", "DrunkOffsetFr static ThemeMetric DRUNK_ARROW_MAGNITUDE( "ArrowEffects", "DrunkArrowMagnitude" ); static ThemeMetric BEAT_OFFSET_HEIGHT( "ArrowEffects", "BeatOffsetHeight" ); static ThemeMetric BEAT_PI_HEIGHT( "ArrowEffects", "BeatPIHeight" ); +static ThemeMetric MINI_PERCENT_BASE( "ArrowEffects", "MiniPercentBase" ); +static ThemeMetric MINI_PERCENT_GATE( "ArrowEffects", "MiniPercentGate" ); static ThemeMetric QUANTIZE_ARROW_Y( "ArrowEffects", "QuantizeArrowYPosition"); static float GetNoteFieldHeight( const PlayerState* pPlayerState ) @@ -460,7 +462,7 @@ float ArrowEffects::GetXPos( const PlayerState* pPlayerState, int iColNum, float { // Allow Mini to pull tracks together, but not to push them apart. float fMiniPercent = fEffects[PlayerOptions::EFFECT_MINI]; - fMiniPercent = min( powf(0.5f, fMiniPercent), 1.0f ); + fMiniPercent = min( powf(MINI_PERCENT_BASE, fMiniPercent), (float)MINI_PERCENT_GATE ); fPixelOffsetFromCenter *= fMiniPercent; }