From 5b46bdbae04a53bcc3de4edbb3c226323f4045df Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 18 Nov 2003 18:47:17 +0000
Subject: [PATCH] wheel tweening metrics

---
 stepmania/Themes/default/metrics.ini |  8 ++++++++
 stepmania/src/MusicWheel.cpp         | 28 ++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index d7c03fbc58..08a50b37df 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1724,6 +1724,14 @@ ItemCurveX=85
 ItemSpacingY=46
 NoCurving=0
 NumWheelItems=13
+MusicWheelItemStartOnCommand=addx,320
+MusicWheelItemFinishOnCommand=accelerate,0.2;addx,-320
+MusicWheelItemStartOffCommand=
+MusicWheelItemFinishOffCommand=decelerate,0.2;addx,320
+WheelItemOnDelayCenter=0
+WheelItemOnDelayOffset=0.04
+WheelItemOffDelayCenter=0
+WheelItemOffDelayOffset=0.04
 NumSectionColors=7
 SectionColor1=0.8,0.1,0.6,1	// pink
 SectionColor2=0.6,0.4,0.8,1	// purple
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index a7cc736c1b..46611ca1ef 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -58,7 +58,10 @@ CachedThemeMetricI  NUM_WHEEL_ITEMS_METRIC	("MusicWheel","NumWheelItems");
 #define NUM_WHEEL_ITEMS				min( MAX_WHEEL_ITEMS, (int) NUM_WHEEL_ITEMS_METRIC )
 #define MENU_NAMES					THEME->GetMetric ("MusicWheel","MenuNames")
 #define MENU_ACTIONS				THEME->GetMetric ("MusicWheel","MenuActions")
-
+#define WHEEL_ITEM_ON_DELAY_CENTER	THEME->GetMetricF("MusicWheel","WheelItemOnDelayCenter")
+#define WHEEL_ITEM_ON_DELAY_OFFSET	THEME->GetMetricF("MusicWheel","WheelItemOnDelayOffset")
+#define WHEEL_ITEM_OFF_DELAY_CENTER	THEME->GetMetricF("MusicWheel","WheelItemOffDelayCenter")
+#define WHEEL_ITEM_OFF_DELAY_OFFSET	THEME->GetMetricF("MusicWheel","WheelItemOffDelayOffset")
 // leaving this one under ScreenSelectMusic because that is the only place it takes effect anyway.
 #define DEFAULT_SORT				THEME->GetMetric ("ScreenSelectMusic","DefaultSort")
 
@@ -1334,25 +1337,25 @@ void MusicWheel::TweenOnScreen(bool changing_sort)
 	}
 	m_sprSelectionOverlay.Command( "addx,-320" );
 
-	m_ScrollBar.SetX( SCROLL_BAR_X+30 );
+	m_ScrollBar.SetX( SCROLL_BAR_X );
+	m_ScrollBar.Command( "addx,+30" );
 	if(changing_sort)
 		m_ScrollBar.BeginTweening( 0.2f );	// sleep
 	else
 		m_ScrollBar.BeginTweening( 0.7f );	// sleep
 	m_ScrollBar.BeginTweening( 0.2f , Actor::TWEEN_ACCELERATE );
-	m_ScrollBar.SetX( SCROLL_BAR_X );	
+	m_ScrollBar.Command( "addx,-30" );
 
 	for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
 	{
 		MusicWheelItem& display = m_MusicWheelItems[i];
 		float fThisBannerPositionOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection;
-
 		SetItemPosition( display, fThisBannerPositionOffsetFromSelection );
 
-		display.Command( "addx,320" );
-		display.BeginTweening( 0.04f*i );	// sleep
-		display.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE );
-		display.Command( "addx,-320" );
+		COMMAND( display, "StartOn");
+		const float delay = fabsf(i-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET;
+		display.BeginTweening( delay ); //0.04f*i /*atof(delays[i])*/ );	// sleep
+		COMMAND( display, "FinishOn"); // accelerate,0.2
 		if( changing_sort )
 			display.HurryTweening( 0.25f );
 	}
@@ -1388,11 +1391,12 @@ void MusicWheel::TweenOffScreen(bool changing_sort)
 	{
 		MusicWheelItem& display = m_MusicWheelItems[i];
 		float fThisBannerPositionOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection;
-
 		SetItemPosition( display, fThisBannerPositionOffsetFromSelection );
-		display.BeginTweening( 0.04f*i );	// sleep
-		display.BeginTweening( 0.2f, Actor::TWEEN_DECELERATE );
-		display.Command( "addx,320" );
+
+		COMMAND( display, "StartOff");
+		const float delay = fabsf(i-WHEEL_ITEM_OFF_DELAY_CENTER) * WHEEL_ITEM_OFF_DELAY_OFFSET;
+		display.BeginTweening( delay );	// sleep
+		COMMAND( display, "FinishOff");
 		if( changing_sort )
 			display.HurryTweening( 0.25f );
 	}