From 4b3730cfc585cb993a30c9ff074a5dd4a2ae05c3 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 2 Nov 2003 09:17:15 +0000 Subject: [PATCH] increase MusicWheel item max --- stepmania/src/MusicWheel.cpp | 41 +++++++++++++++++------------------- stepmania/src/MusicWheel.h | 2 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 62e84faec5..2ca7e54250 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -691,7 +691,7 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl { 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 ); @@ -703,30 +703,27 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl fRotationX_out *= 180.f/PI; // to degrees } + else if(!USE_LINEAR_WHEEL) + { + fX_out = (1-cosf(fPosOffsetsFromMiddle/PI))*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 ); + } else { - if(!USE_LINEAR_WHEEL) - { - fX_out = (1-cosf(fPosOffsetsFromMiddle/PI))*ITEM_CURVE_X; - fY_out = fPosOffsetsFromMiddle*ITEM_SPACING_Y; - fZ_out = 0; - fRotationX_out = 0; + 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 ); - } - 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 ); - } + fX_out = roundf( fX_out ); + fY_out = roundf( fY_out ); + fZ_out = roundf( fZ_out ); } } diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index 2a74c78e9e..a9435e0fa0 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -26,7 +26,7 @@ class Course; 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_SortOrderChanging= ScreenMessage(SM_User+48);