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

add ItemCurveX

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-17 01:13:53 +00:00
parent c00fbf8151
commit b40f81146c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -473,6 +473,7 @@ RouletteSlowDownSwitches=5
LockedInitialVelocity=7 LockedInitialVelocity=7
ScrollBarX=148 ScrollBarX=148
ScrollBarHeight=368 ScrollBarHeight=368
ItemCurveX=95
ItemSpacingY=46 ItemSpacingY=46
NumSectionColors=7 NumSectionColors=7
SectionColor1=0.9, 0.0, 0.2, 1 SectionColor1=0.9, 0.0, 0.2, 1
stepmania/src/MusicWheel.cpp
+4 -3
View File
@@ -45,11 +45,12 @@
#define LOCKED_INITIAL_VELOCITY THEME->GetMetricF("MusicWheel","LockedInitialVelocity") #define LOCKED_INITIAL_VELOCITY THEME->GetMetricF("MusicWheel","LockedInitialVelocity")
#define SCROLL_BAR_X THEME->GetMetricF("MusicWheel","ScrollBarX") #define SCROLL_BAR_X THEME->GetMetricF("MusicWheel","ScrollBarX")
#define SCROLL_BAR_HEIGHT THEME->GetMetricI("MusicWheel","ScrollBarHeight") #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 ITEM_SPACING_Y THEME->GetMetricF("MusicWheel","ItemSpacingY")
#define NUM_SECTION_COLORS THEME->GetMetricI("MusicWheel","NumSectionColors") #define NUM_SECTION_COLORS THEME->GetMetricI("MusicWheel","NumSectionColors")
#define SECTION_COLORS( i ) THEME->GetMetricC("MusicWheel",ssprintf("SectionColor%d",i+1)) #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() { inline RageColor GetNextSectionColor() {
static int i=0; static int i=0;
@@ -308,7 +309,7 @@ MusicWheel::MusicWheel()
// update theme metric cache // update theme metric cache
g_fItemSpacingY = ITEM_SPACING_Y; g_fItemSpacingY = ITEM_SPACING_Y;
g_fItemCurveX = ITEM_CURVE_X;
// for debugging // for debugging
if( GAMESTATE->m_CurStyle == STYLE_NONE ) if( GAMESTATE->m_CurStyle == STYLE_NONE )
@@ -701,7 +702,7 @@ float MusicWheel::GetBannerY( float fPosOffsetsFromMiddle )
float MusicWheel::GetBannerX( 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 ); return roundf( fX );
} }