From b40f81146cb77ef0ae0e1366364f52c53f9a342b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 17 Jan 2003 01:13:53 +0000 Subject: [PATCH] add ItemCurveX --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/MusicWheel.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 93b0b5be1e..699ab385c5 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -473,6 +473,7 @@ RouletteSlowDownSwitches=5 LockedInitialVelocity=7 ScrollBarX=148 ScrollBarHeight=368 +ItemCurveX=95 ItemSpacingY=46 NumSectionColors=7 SectionColor1=0.9, 0.0, 0.2, 1 diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 33f9fc2c3b..baa921e3ba 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -45,11 +45,12 @@ #define LOCKED_INITIAL_VELOCITY THEME->GetMetricF("MusicWheel","LockedInitialVelocity") #define SCROLL_BAR_X THEME->GetMetricF("MusicWheel","ScrollBarX") #define SCROLL_BAR_HEIGHT THEME->GetMetricI("MusicWheel","ScrollBarHeight") +#define ITEM_CURVE_X THEME->GetMetricF("MusicWheel","ItemCurveX") #define ITEM_SPACING_Y THEME->GetMetricF("MusicWheel","ItemSpacingY") #define NUM_SECTION_COLORS THEME->GetMetricI("MusicWheel","NumSectionColors") #define SECTION_COLORS( i ) THEME->GetMetricC("MusicWheel",ssprintf("SectionColor%d",i+1)) -float g_fItemSpacingY; // cache +float g_fItemSpacingY, g_fItemCurveX; // cache inline RageColor GetNextSectionColor() { static int i=0; @@ -308,7 +309,7 @@ MusicWheel::MusicWheel() // update theme metric cache g_fItemSpacingY = ITEM_SPACING_Y; - + g_fItemCurveX = ITEM_CURVE_X; // for debugging if( GAMESTATE->m_CurStyle == STYLE_NONE ) @@ -701,7 +702,7 @@ float MusicWheel::GetBannerY( float fPosOffsetsFromMiddle ) float MusicWheel::GetBannerX( float fPosOffsetsFromMiddle ) { - float fX = (1-cosf((fPosOffsetsFromMiddle)/3))*95.0f; + float fX = (1-cosf(fPosOffsetsFromMiddle/PI))*g_fItemCurveX; return roundf( fX ); }