Menu
▾
▴
[Performous-commit] Lasse Karkkainen : Refactoring/cleanup for song browser draw function.
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-06 14:30:59
|
Module: performous
Branch: master
Commit: 8258ae1f182df8fec6a194df2bdd0bff60b03f0b
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Sep 6 16:58:30 2010 +0300
Refactoring/cleanup for song browser draw function.
---
game/screen_songs.cc | 86 ++++++++++++++++++++++++++------------------------
game/screen_songs.hh | 2 +
2 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 69b95c1..fad69b3 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -214,47 +214,7 @@ void ScreenSongs::draw() {
// Get hiscores from database
m_database.queryPerSongHiscore_HiscoreDisplay(oss_order, m_songs.currentPtr(), hiscore_start_pos, 5);
}
- double spos = m_songs.currentPosition(); // This needs to be polled to run the animation
- if (!m_jukebox) {
- // Draw the covers
- std::size_t ss = m_songs.size();
- int baseidx = spos + 1.5; --baseidx; // Round correctly
- double shift = spos - baseidx;
- for (int i = -2; i < 5; ++i) {
- if (baseidx + i < 0 || baseidx + i >= int(ss)) continue;
- Song& song_display = m_songs[baseidx + i];
- Surface* cover = NULL;
- // Fetch cover image from cache or try loading it
- if (!song_display.cover.empty()) try { cover = &m_covers[song_display.path + song_display.cover]; } catch (std::exception const&) {cover = NULL;}
- if (!cover) {
- if(song_display.hasDance()) {
- cover = m_danceCover.get();
- } else if(song_display.hasDrums()) {
- cover = m_bandCover.get();
- } else {
- size_t tracks = song_display.instrumentTracks.size();
- if (tracks == 0) cover = m_singCover.get();
- else cover = m_instrumentCover.get();
- }
- }
- Surface& s = *cover;
- // Calculate dimensions for cover and instrument markers
- double diff = (i == 0 ? (0.5 - fabs(shift)) * 0.07 : 0.0);
- double y = 0.27 + 0.5 * diff;
- s.dimensions.middle(-0.2 + 0.17 * (i - shift)).bottom(y - 0.2 * diff).fitInside(0.14 + diff, 0.14 + diff);
- // Draw the cover normally
- s.draw();
- // Draw the reflection
- {
- glutil::PushMatrix m;
- glTranslatef(0.0f, 2.0 * y, 0.0f);
- glScalef(1.0f, -1.0f, 1.0f);
- glColor4f(1.0f, 1.0f, 1.0f, 0.4f);
- s.draw();
- glColor3f(1.0f, 1.0f, 1.0f);
- }
- }
- }
+ if (!m_jukebox) drawCovers();
updateMultimedia(song, info);
}
if (m_jukebox) drawJukebox();
@@ -278,6 +238,50 @@ void ScreenSongs::draw() {
} else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.advance(1); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
}
+void ScreenSongs::drawCovers() {
+ double spos = m_songs.currentPosition(); // This needs to be polled to run the animation
+ std::size_t ss = m_songs.size();
+ int baseidx = spos + 1.5; --baseidx; // Round correctly
+ double shift = spos - baseidx;
+ for (int i = -2; i < 5; ++i) {
+ if (baseidx + i < 0 || baseidx + i >= int(ss)) continue;
+ Song& song = m_songs[baseidx + i];
+ Surface& s = getCover(song);
+ // Calculate dimensions for cover and instrument markers
+ double diff = (i == 0 ? (0.5 - fabs(shift)) * 0.07 : 0.0);
+ double y = 0.27 + 0.5 * diff;
+ s.dimensions.middle(-0.2 + 0.17 * (i - shift)).bottom(y - 0.2 * diff).fitInside(0.14 + diff, 0.14 + diff);
+ // Draw the cover normally
+ s.draw();
+ // Draw the reflection
+ glutil::PushMatrix m;
+ glTranslatef(0.0f, 2.0 * y, 0.0f);
+ glScalef(1.0f, -1.0f, 1.0f);
+ glColor4f(1.0f, 1.0f, 1.0f, 0.4f);
+ s.draw();
+ glColor3f(1.0f, 1.0f, 1.0f);
+ }
+}
+
+Surface& ScreenSongs::getCover(Song const& song) {
+ Surface* cover = NULL;
+ // Fetch cover image from cache or try loading it
+ if (!song.cover.empty()) try { cover = &m_covers[song.path + song.cover]; } catch (std::exception const&) {cover = NULL;}
+ // Use empty cover
+ if (!cover) {
+ if(song.hasDance()) {
+ cover = m_danceCover.get();
+ } else if(song.hasDrums()) {
+ cover = m_bandCover.get();
+ } else {
+ size_t tracks = song.instrumentTracks.size();
+ if (tracks == 0) cover = m_singCover.get();
+ else cover = m_instrumentCover.get();
+ }
+ }
+ return *cover;
+}
+
void ScreenSongs::drawInstruments(Dimensions const& dim, float alpha) const {
bool have_vocals = false;
diff --git a/game/screen_songs.hh b/game/screen_songs.hh
index ed00a63..7a4a0e5 100644
--- a/game/screen_songs.hh
+++ b/game/screen_songs.hh
@@ -33,6 +33,8 @@ public:
void manageSharedKey(input::NavButton nav); ///< same behaviour for jukebox and normal mode
void manageEvent(SDL_Event event);
void draw();
+ void drawCovers(); ///< draw the cover browser
+ Surface& getCover(Song const& song); ///< get appropriate cover image for the song (incl. no cover)
void drawJukebox(); ///< draw the songbrowser in jukebox mode (fullscreen, full previews, ...)
protected:
|
