From 12b80a8022a1c770815a13350aa7a58f9ee7b96b Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 12 Feb 2011 01:45:20 -0500 Subject: [PATCH] Beat's turn. --- 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 414af5c471..83910c2916 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -159,6 +159,8 @@ TornadoOffsetScaleFromHigh=1 DrunkColumnFrequency=0.2 DrunkOffsetFrequency=10 DrunkArrowMagnitude=0.5 +BeatOffsetHeight=15 +BeatPIHeight=2 QuantizeArrowYPosition=false [Background] diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 5a771472da..182b6bcfa2 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -46,6 +46,8 @@ static ThemeMetric TORNADO_OFFSET_SCALE_FROM_HIGH( "ArrowEffects", "Torna static ThemeMetric DRUNK_COLUMN_FREQUENCY( "ArrowEffects", "DrunkColumnFrequency" ); static ThemeMetric DRUNK_OFFSET_FREQUENCY( "ArrowEffects", "DrunkOffsetFrequency" ); static ThemeMetric DRUNK_ARROW_MAGNITUDE( "ArrowEffects", "DrunkArrowMagnitude" ); +static ThemeMetric BEAT_OFFSET_HEIGHT( "ArrowEffects", "BeatOffsetHeight" ); +static ThemeMetric BEAT_PI_HEIGHT( "ArrowEffects", "BeatPIHeight" ); static ThemeMetric QUANTIZE_ARROW_Y( "ArrowEffects", "QuantizeArrowYPosition"); static float GetNoteFieldHeight( const PlayerState* pPlayerState ) @@ -416,7 +418,7 @@ float ArrowEffects::GetXPos( const PlayerState* pPlayerState, int iColNum, float if( fEffects[PlayerOptions::EFFECT_BEAT] != 0 ) { - const float fShift = data.m_fBeatFactor*RageFastSin( fYOffset / 15.0f + PI/2.0f ); + const float fShift = data.m_fBeatFactor*RageFastSin( fYOffset / BEAT_OFFSET_HEIGHT + PI/BEAT_PI_HEIGHT ); fPixelOffsetFromCenter += fEffects[PlayerOptions::EFFECT_BEAT] * fShift; }