[Performous-commit] Lasse Karkkainen : Trying different effect for grading

[Tapio V. <aa...@us...>]

Module: performous
Branch: dance
Commit: 045d044735accbe35a66721022ad2d550e9519d5

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Oct 29 02:03:27 2009 +0200

Trying different effect for grading

---

 game/layout_singer.cc |    5 +++--
 game/player.hh        |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/game/layout_singer.cc b/game/layout_singer.cc
index 99c8bb9..980e091 100644
--- a/game/layout_singer.cc
+++ b/game/layout_singer.cc
@@ -9,7 +9,8 @@
 #include <list>
 #include <boost/format.hpp>
 
-LayoutSinger::LayoutSinger(Song &_song, Players& _players, boost::shared_ptr<ThemeSing> _theme): m_song(_song), m_noteGraph(_song),m_lyricit(_song.notes.begin()), m_lyrics(), m_players(_players), m_theme(_theme) {
+LayoutSinger::LayoutSinger(Song &_song, Players& _players, boost::shared_ptr<ThemeSing> _theme):
+  m_song(_song), m_noteGraph(_song),m_lyricit(_song.notes.begin()), m_lyrics(), m_players(_players), m_theme(_theme) {
 	m_score_text[0].reset(new SvgTxtThemeSimple(getThemePath("sing_score_text.svg"), config["graphic/text_lod"].f()));
 	m_score_text[1].reset(new SvgTxtThemeSimple(getThemePath("sing_score_text.svg"), config["graphic/text_lod"].f()));
 	m_score_text[2].reset(new SvgTxtThemeSimple(getThemePath("sing_score_text.svg"), config["graphic/text_lod"].f()));
@@ -57,7 +58,7 @@ void LayoutSinger::drawScore(Position position) {
 		float fact = p->m_feedbackFader.get();
 		if (p->m_prevLineScore > 0.5 && fact > 0) {
 			std::string prevLineRank;
-			float fzoom = fact / 2.0 + 0.5;
+			float fzoom = 2.0 / (1.0 + fact);
 			if (p->m_prevLineScore > 0.95) { prevLineRank = "Perfect"; glColor4f(0.5, 1.0, 0.0, fact); }
 			else if (p->m_prevLineScore > 0.9) { prevLineRank = "Super"; glColor4f(0.4, 0.9, 0.0, fact); }
 			else if (p->m_prevLineScore > 0.8) { prevLineRank = "Excellent"; glColor4f(0.2, 0.8, 0.2, fact); }
diff --git a/game/player.hh b/game/player.hh
index 5b75fd1..6e5d552 100644
--- a/game/player.hh
+++ b/game/player.hh
@@ -39,7 +39,7 @@ struct Player {
 	Player(Song& song, Analyzer& analyzer, size_t frames):
 	  m_song(song), m_analyzer(analyzer), m_pitch(frames, std::make_pair(getNaN(),
 	  -getInf())), m_pos(), m_score(), m_lineScore(), m_maxLineScore(), m_prevLineScore(-1),
-	  m_feedbackFader(0.0, 0.5), m_activitytimer(), m_scoreIt(m_song.notes.begin()) {}
+	  m_feedbackFader(0.0, 2.0), m_activitytimer(), m_scoreIt(m_song.notes.begin()) {}
 	/// prepares analyzer
 	void prepare() { m_analyzer.process(); }
 	/// updates player stats