add course meter

stepmania/src/DifficultyMeter.cpp

@@ -13,9 +13,11 @@
 #include "DifficultyMeter.h"
 #include "RageUtil.h"
 #include "GameConstantsAndTypes.h"
+#include "GameState.h"
 #include "PrefsManager.h"
 #include "ThemeManager.h"
 #include "Notes.h"
+#include "Course.h"
 #include "SongManager.h"
 
 
@@ -28,28 +30,60 @@ DifficultyMeter::DifficultyMeter()
 {
 	BitmapText::LoadFromTextureAndChars( THEME->GetPathToG("DifficultyMeter bar 2x1"), "10" );
 
-	SetFromNotes( NULL );
+	Unset();
 }
 
 void DifficultyMeter::SetFromNotes( Notes* pNotes )
 {
-	if( pNotes != NULL )
+	if( pNotes == NULL )
 	{
-		SetDiffuse( RageColor(1,1,1,1) );
+		Unset();
-		SetMeter( pNotes->GetMeter() );
+		return;
-		if( pNotes->GetMeter() > GLOW_IF_METER_GREATER_THAN )
-			this->SetEffectGlowShift();
-		else
-			this->SetEffectNone();
-
-		SetDiffuse( SONGMAN->GetDifficultyColor(pNotes->GetDifficulty()) );
 	}
-	else
+
+	SetMeter( pNotes->GetMeter() );
+	SetDiffuse( SONGMAN->GetDifficultyColor(pNotes->GetDifficulty()) );
+}
+
+void DifficultyMeter::SetFromCourse( Course* pCourse )
+{
+	if( pCourse == NULL )
 	{
+		Unset();
+		return;
+	}
+
+	int meter = pCourse->GetMeter();
+	SetMeter( meter );
+	
+	// XXX
+	if(meter <= 1 )
+		SetDiffuse( SONGMAN->GetDifficultyColor(DIFFICULTY_BEGINNER) );
+	else if(meter <= 2 )
+		SetDiffuse( SONGMAN->GetDifficultyColor(DIFFICULTY_EASY) );
+	else if(meter <= 5 )
+		SetDiffuse( SONGMAN->GetDifficultyColor(DIFFICULTY_MEDIUM) );
+	else if(meter <= 7 )
+		SetDiffuse( SONGMAN->GetDifficultyColor(DIFFICULTY_HARD) );
+	else
+		SetDiffuse( SONGMAN->GetDifficultyColor(DIFFICULTY_CHALLENGE) );
+}
+
+void DifficultyMeter::Unset()
+{
 	this->SetEffectNone();
 	SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) );
 	SetMeter( 0 );
-	}
+}
+
+void DifficultyMeter::SetFromGameState( PlayerNumber pn )
+{
+	if( GAMESTATE->m_pCurNotes[pn] )
+		SetFromNotes( GAMESTATE->m_pCurNotes[pn] );
+	else if( GAMESTATE->m_pCurCourse )
+		SetFromCourse( GAMESTATE->m_pCurCourse );
+	else
+		Unset();
 }
 
 void DifficultyMeter::SetMeter( int iMeter )
@@ -63,4 +97,9 @@ void DifficultyMeter::SetMeter( int iMeter )
 			sNewText += "1";
 
 	SetText( sNewText );
+
+	if( iMeter > GLOW_IF_METER_GREATER_THAN )
+		this->SetEffectGlowShift();
+	else
+		this->SetEffectNone();
 }

stepmania/src/DifficultyMeter.h

@@ -12,7 +12,9 @@
 */
 
 #include "BitmapText.h"
+#include "PlayerNumber.h"
 class Notes;
+class Course;
 
 
 class DifficultyMeter : public BitmapText
@@ -20,10 +22,13 @@ class DifficultyMeter : public BitmapText
 public:
 	DifficultyMeter();
 
+	void SetFromGameState( PlayerNumber pn );
 	void SetFromNotes( Notes* pNotes );
-	void SetMeter( int iMeter );
+	void SetFromCourse( Course* pCourse );
+	void Unset();
 
 private:
+	void SetMeter( int iMeter );
 };
 
 #endif

stepmania/src/ScreenSelectMusic.cpp

@@ -908,7 +908,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
 		m_AutoGenIcon[pn].SetEffectNone();
 		m_AutoGenIcon[pn].SetDiffuse( RageColor(1,1,1,0) );
 	}
-	m_DifficultyMeter[pn].SetFromNotes( pNotes );
+	m_DifficultyMeter[pn].SetFromGameState( pn );
 	m_GrooveRadar.SetFromNotes( pn, pNotes );
 	m_MusicWheel.NotesChanged( pn );
 }