Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Shift the rainbow back into the right place again

This commit is contained in:
David Sansome 2011-06-23 22:49:33 +00:00
parent b2418fd3ee
commit 7d6aa42ba3
2 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/analyzers/nyancatanalyzer.cpp
View File

@ -32,6 +32,9 @@ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
cat_(":/nyancat.png"), cat_(":/nyancat.png"),
timer_id_(startTimer(kFrameIntervalMs)), timer_id_(startTimer(kFrameIntervalMs)),
frame_(0), frame_(0),
available_rainbow_width_(0),
px_per_frame_(0),
x_offset_(0),
background_brush_(QColor(0x0f, 0x43, 0x73)) background_brush_(QColor(0x0f, 0x43, 0x73))
{ {
memset(history_, 0, sizeof(history_)); memset(history_, 0, sizeof(history_));
@ -63,6 +66,10 @@ void NyanCatAnalyzer::resizeEvent(QResizeEvent* e) {
// Invalidate the buffer so it's recreated from scratch in the next paint // Invalidate the buffer so it's recreated from scratch in the next paint
// event. // event.
buffer_ = QPixmap(); buffer_ = QPixmap();
available_rainbow_width_ = width() - kCatWidth + kRainbowOverlap;
px_per_frame_ = float(available_rainbow_width_) / (kHistorySize-1) + 1;
x_offset_ = px_per_frame_ * (kHistorySize-1) - available_rainbow_width_;
} }
void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_frame) { void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_frame) {
@ -91,10 +98,8 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_fr
history_[(band+1) * kHistorySize - 1] = accumulator * band_scale_[band]; history_[(band+1) * kHistorySize - 1] = accumulator * band_scale_[band];
} }
}
// Create polylines for the rainbows. // Create polylines for the rainbows.
const int px_per_frame = float(width() - kCatWidth + kRainbowOverlap) / kHistorySize;
QPointF polyline[kRainbowBands * kHistorySize]; QPointF polyline[kRainbowBands * kHistorySize];
QPointF* dest = polyline; QPointF* dest = polyline;
float* source = history_; float* source = history_;
@ -106,7 +111,7 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_fr
// Add each point in the line. // Add each point in the line.
for (int x=0 ; x<kHistorySize; ++x) { for (int x=0 ; x<kHistorySize; ++x) {
*dest = QPointF(px_per_frame * x, y + *source * kPixelScale); *dest = QPointF(px_per_frame_ * x, y + *source * kPixelScale);
++ dest; ++ dest;
++ source; ++ source;
} }
@ -114,7 +119,7 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_fr
// Do we have to draw the whole rainbow into the buffer? // Do we have to draw the whole rainbow into the buffer?
if (buffer_.isNull()) { if (buffer_.isNull()) {
buffer_ = QPixmap(size()); buffer_ = QPixmap(QSize(width() + x_offset_, height()));
buffer_.fill(background_brush_.color()); buffer_.fill(background_brush_.color());
QPainter buffer_painter(&buffer_); QPainter buffer_painter(&buffer_);
@ -129,9 +134,10 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_fr
buffer_painter.setRenderHint(QPainter::Antialiasing); buffer_painter.setRenderHint(QPainter::Antialiasing);
buffer_painter.drawPixmap(0, 0, buffer_, buffer_painter.drawPixmap(0, 0, buffer_,
px_per_frame, 0, px_per_frame_, 0,
buffer_.width() - px_per_frame, -1); x_offset_ + available_rainbow_width_ - px_per_frame_, 0);
buffer_painter.fillRect(buffer_.width() - px_per_frame, 0, px_per_frame, height(), buffer_painter.fillRect(x_offset_ + available_rainbow_width_ - px_per_frame_, 0,
kCatWidth - kRainbowOverlap + px_per_frame_, height(),
background_brush_); background_brush_);
for (int band=kRainbowBands-1 ; band>=0 ; --band) { for (int band=kRainbowBands-1 ; band>=0 ; --band) {
@ -139,11 +145,12 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_fr
buffer_painter.drawPolyline(&polyline[(band+1)*kHistorySize - 2], 2); buffer_painter.drawPolyline(&polyline[(band+1)*kHistorySize - 2], 2);
} }
} }
}
// Draw the buffer on to the widget // Draw the buffer on to the widget
p.drawPixmap(0, 0, buffer_); p.drawPixmap(0, 0, buffer_, x_offset_, 0, 0, 0);
// Draw nyan cat (he's been waiting for this for 50 lines). // Draw nyan cat (he's been waiting for this for 75 lines).
// Nyan nyan nyan nyan. // Nyan nyan nyan nyan.
QRect cat_dest(width() - kCatWidth, (height() - kCatHeight) / 2, QRect cat_dest(width() - kCatWidth, (height() - kCatHeight) / 2,
kCatWidth, kCatHeight); kCatWidth, kCatHeight);

11
src/analyzers/nyancatanalyzer.h
View File

@ -72,6 +72,17 @@ private:
// A cache of the last frame's rainbow, so it can be used in the next frame. // A cache of the last frame's rainbow, so it can be used in the next frame.
QPixmap buffer_; QPixmap buffer_;
// Geometry information that's updated on resize:
// The width of the widget minus the space for the cat
int available_rainbow_width_;
// X spacing between each point in the polyline.
int px_per_frame_;
// Amount the buffer_ is shifted to the left (off the edge of the widget) to
// make the rainbow extend from 0 to available_rainbow_width_.
int x_offset_;
QBrush background_brush_; QBrush background_brush_;
}; };