[Performous-commit] Lasse Karkkainen : Always draw cursor in 2D (even when using 3D notes)

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

Module: performous
Branch: dance
Commit: b0ef12406605b91caee8c2640a5e9e00230d3e07

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 11:20:22 2009 +0200

Always draw cursor in 2D (even when using 3D notes)

---

 game/guitargraph.cc |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index f0a9916..0b70d13 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -407,6 +407,21 @@ void GuitarGraph::draw(double time) {
 			glTexCoord2f(1.0f, texCoord); glVertex2f(w, time2y(tEnd));
 		}
 	}
+	// Draw the cursor
+	float level = m_hit[0].get();
+	glColor3f(level, level, level);
+	drawBar(0.0, 0.01f);
+	// Fret buttons on cursor
+	for (int fret = m_drums; fret < 5; ++fret) {
+		float x = -2.0f + fret - 0.5f * m_drums;
+		float l = m_hit[fret + !m_drums].get();
+		glColor4fv(color(fret));
+		m_button.dimensions.center(time2y(0.0)).middle(x);
+		m_button.draw();
+		glColor3f(l, l, l);
+		m_tap.dimensions = m_button.dimensions;
+		m_tap.draw();
+	}
 	// Draw the notes
 	glutil::UseLighting lighting(m_use3d);
 	for (Chords::const_iterator it = m_chords.begin(); it != m_chords.end(); ++it) {
@@ -447,25 +462,6 @@ void GuitarGraph::draw(double time) {
 			}
 		}
 	}
-	// Draw the cursor
-	float level = m_hit[0].get();
-	glColor3f(level, level, level);
-	drawBar(0.0, 0.01f);
-	// Fret buttons on cursor
-	for (int fret = m_drums; fret < 5; ++fret) {
-		float x = -2.0f + fret - 0.5f * m_drums;
-		float l = m_hit[fret + !m_drums].get();
-		glColor4fv(color(fret));
-		if (m_use3d) {
-			m_fretObj.draw(x, time2y(0.0), (1.0-l)/8.0);
-		} else {
-			m_button.dimensions.center(time2y(0.0)).middle(x);
-			m_button.draw();
-			glColor3f(l, l, l);
-			m_tap.dimensions = m_button.dimensions;
-			m_tap.draw();
-		}
-	}
 	glColor3f(1.0f, 1.0f, 1.0f);
 }