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

increase MusicWheel item max

Browse Source
This commit is contained in:
Chris Danford
2003-11-02 09:17:15 +00:00
parent f0b048626a
commit 4b3730cfc5
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+2 -5
View File
@@ -691,7 +691,7 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl
{ {
if( USE_3D ) if( USE_3D )
{ {
fRotationX_out = SCALE(fPosOffsetsFromMiddle,-7,+7,-PI/2.f,+PI/2.f); fRotationX_out = SCALE(fPosOffsetsFromMiddle,-NUM_WHEEL_ITEMS/2,+NUM_WHEEL_ITEMS/2,-PI/2.f,+PI/2.f);
// printf( "fRotationX_out = %f\n", fRotationX_out ); // printf( "fRotationX_out = %f\n", fRotationX_out );
@@ -703,9 +703,7 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl
fRotationX_out *= 180.f/PI; // to degrees fRotationX_out *= 180.f/PI; // to degrees
} }
else else if(!USE_LINEAR_WHEEL)
{
if(!USE_LINEAR_WHEEL)
{ {
fX_out = (1-cosf(fPosOffsetsFromMiddle/PI))*ITEM_CURVE_X; fX_out = (1-cosf(fPosOffsetsFromMiddle/PI))*ITEM_CURVE_X;
fY_out = fPosOffsetsFromMiddle*ITEM_SPACING_Y; fY_out = fPosOffsetsFromMiddle*ITEM_SPACING_Y;
@@ -728,7 +726,6 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl
fZ_out = roundf( fZ_out ); fZ_out = roundf( fZ_out );
} }
} }
}
void MusicWheel::RebuildMusicWheelItems() void MusicWheel::RebuildMusicWheelItems()
{ {
stepmania/src/MusicWheel.h
+1 -1
View File
@@ -26,7 +26,7 @@ class Course;
class Song; class Song;
const int MAX_WHEEL_ITEMS = 15; const int MAX_WHEEL_ITEMS = 25;
const ScreenMessage SM_SongChanged = ScreenMessage(SM_User+47); // this should be unique! const ScreenMessage SM_SongChanged = ScreenMessage(SM_User+47); // this should be unique!
const ScreenMessage SM_SortOrderChanging= ScreenMessage(SM_User+48); const ScreenMessage SM_SortOrderChanging= ScreenMessage(SM_User+48);