[Performous-commit] Lasse Kärkkäinen : Fix pitch wave color ( colorMatrix not updated => use vertex colors instead).

[Lasse Kärkkäi. <tr...@us...>]

Author: Lasse Kärkkäinen <tronic+ndrm at trn.iki.fi>
Date:   Thu Feb 24 03:40:18 2011 +0100

Fix pitch wave color (colorMatrix not updated => use vertex colors instead).

---

 game/notegraph.cc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/notegraph.cc b/game/notegraph.cc
index 322025f..f012ea8 100644
--- a/game/notegraph.cc
+++ b/game/notegraph.cc
@@ -207,7 +207,7 @@ void NoteGraph::drawWaves(Database const& database) {
 		double oldval = getNaN();
 		glutil::VertexArray va;
 		Notes::const_iterator noteIt = m_vocal.notes.begin();
-		glutil::Color c(Color(p->m_color.r, p->m_color.g, p->m_color.b, m_notealpha));
+		Color c(p->m_color.r, p->m_color.g, p->m_color.b, m_notealpha);
 		for (; idx < endIdx; ++idx, t += Engine::TIMESTEP) {
 			double const freq = pitch[idx].first;
 			// If freq is NaN, we have nothing to process
@@ -235,10 +235,10 @@ void NoteGraph::drawWaves(Database const& database) {
 			// If there has been a break or if the pitch change is too fast, terminate and begin a new one
 			if (oldval != oldval || std::abs(oldval - val) > 1) strip(va);
 			// Add a point or a pair of points
-			if (!va.size()) va.TexCoord(tex, 0.5f).Vertex(x, y);
+			if (!va.size()) va.TexCoord(tex, 0.5f).Color(c).Vertex(x, y);
 			else {
-				va.TexCoord(tex, 0.0f).Vertex(x, y - thickness);
-				va.TexCoord(tex, 1.0f).Vertex(x, y + thickness);
+				va.TexCoord(tex, 0.0f).Color(c).Vertex(x, y - thickness);
+				va.TexCoord(tex, 1.0f).Color(c).Vertex(x, y + thickness);
 			}
 			oldval = val;
 		}