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

Pop'n Music Update

Browse Source 
- Theme
- Noteskin

You can now make the music wheel into a 'staircase'
This commit is contained in:
Andrew Livy
2003-10-08 00:17:17 +00:00
parent 276a051904
commit 37ef50d849
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -1670,6 +1670,7 @@ ScrollBarX=148
ScrollBarHeight=368 ScrollBarHeight=368
ItemCurveX=85 ItemCurveX=85
ItemSpacingY=46 ItemSpacingY=46
NoCurving=0
NumWheelItems=13 NumWheelItems=13
NumSectionColors=7 NumSectionColors=7
SectionColor1=0.8,0.1,0.6,1 // pink SectionColor1=0.8,0.1,0.6,1 // pink
stepmania/src/MusicWheel.cpp
+22 -7
View File
@@ -42,6 +42,7 @@
#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")
CachedThemeMetricF ITEM_CURVE_X ("MusicWheel","ItemCurveX"); CachedThemeMetricF ITEM_CURVE_X ("MusicWheel","ItemCurveX");
#define USE_LINEAR_WHEEL THEME->GetMetricB("MusicWheel","NoCurving")
CachedThemeMetricF ITEM_SPACING_Y ("MusicWheel","ItemSpacingY"); CachedThemeMetricF ITEM_SPACING_Y ("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))
@@ -707,14 +708,28 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl
} }
else else
{ {
fX_out = (1-cosf(fPosOffsetsFromMiddle/PI))*ITEM_CURVE_X; if(!USE_LINEAR_WHEEL)
fY_out = fPosOffsetsFromMiddle*ITEM_SPACING_Y; {
fZ_out = 0; fX_out = (1-cosf(fPosOffsetsFromMiddle/PI))*ITEM_CURVE_X;
fRotationX_out = 0; fY_out = fPosOffsetsFromMiddle*ITEM_SPACING_Y;
fZ_out = 0;
fRotationX_out = 0;
fX_out = roundf( fX_out ); fX_out = roundf( fX_out );
fY_out = roundf( fY_out ); fY_out = roundf( fY_out );
fZ_out = roundf( fZ_out ); fZ_out = roundf( fZ_out );
}
else
{
fX_out = fPosOffsetsFromMiddle*ITEM_CURVE_X;
fY_out = fPosOffsetsFromMiddle*ITEM_SPACING_Y;
fZ_out = 0;
fRotationX_out = 0;
fX_out = roundf( fX_out );
fY_out = roundf( fY_out );
fZ_out = roundf( fZ_out );
}
} }
} }