Menu
▾
▴
[Performous-commit] Tapio Vierros : Some notes are actually drawn to the screen.
|
From: Tapio V. <aa...@us...> - 2009-11-15 16:57:37
|
Module: performous
Branch: dance
Commit: 28ea30d2f41805f50041d1bb420e934a919c3113
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 15 18:55:20 2009 +0200
Some notes are actually drawn to the screen.
Works only on some songs (and needs loads of tweaking).
---
game/dancegraph.cc | 36 ++++++++++++++++++++++++++----------
game/screen_sing.cc | 2 +-
game/songparser-sm.cc | 9 +++++----
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 66438b1..aea2657 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -63,6 +63,13 @@ DanceGraph::DanceGraph(Audio& audio, Song const& song):
DanceTrack dt = it2->second;
m_chords = dt.chords;
std::cout << "DANCE-TRACK FOUND" << std::endl;
+ for (DanceChords::iterator it3 = m_chords.begin(); it3 != m_chords.end(); it3++) {
+ DanceChord dc = *it3;
+ for (int i = 0; i < 4; i++) {
+ if (dc.find(i) != dc.end())
+ std::cout << "NOTE begin: " << dc[i].begin << std::endl;
+ }
+ }
}
}
}
@@ -96,7 +103,6 @@ void DanceGraph::dance(double time, input::Event const& ev) {
glutil::Color const& DanceGraph::color(int arrow_i) const {
- // TODO: Hack.. Needs animation through events.
static glutil::Color arrowColors[4] = {
glutil::Color(0.0f, 0.9f, 0.0f),
glutil::Color(0.9f, 0.0f, 0.0f),
@@ -130,14 +136,14 @@ void DanceGraph::draw(double time) {
dimensions.screenCenter().middle(m_cx.get()).stretch(m_width.get(), 0.9);
double offsetX = 0.5 * (dimensions.x1() + dimensions.x2());
double frac = 0.75; // Adjustable: 1.0 means fully separated, 0.0 means fully attached
-/* // Draw scores
+ // Draw scores
if (time >= -0.5) {
m_text.dimensions.screenBottom(-0.30).middle(0.32 * dimensions.w() + offsetX);
m_text.draw(boost::lexical_cast<std::string>(unsigned(getScore())));
m_text.dimensions.screenBottom(-0.27).middle(0.32 * dimensions.w() + offsetX);
m_text.draw(boost::lexical_cast<std::string>(unsigned(m_streak)) + "/"
+ boost::lexical_cast<std::string>(unsigned(m_longestStreak)));
- }*/
+ }
//std::cout << "m" << dimensions.x1() << " " << dimensions.x2() << std::endl;
//std::cout << dimensions.y1() << " " << dimensions.y2() << std::endl;
glutil::PushMatrixMode pmm(GL_PROJECTION);
@@ -148,13 +154,15 @@ void DanceGraph::draw(double time) {
{ float s = dimensions.w() / 5.0f; glScalef(s, s, s); }
// Draw the notes
// TODO: iteration needs rewrite to the dancenotes structure
-/* float tBeg, tEnd = 0.0f;
+ float tBeg, tEnd = 0.0f;
+
for (DanceChords::const_iterator it = m_chords.begin(); it != m_chords.end(); ++it) {
- // TODO: rewrite for guitargraph's Chord
+ // TODO: rewrite for guitargraph's Chord??
DanceChord chord = *it;
for (int arrow_i = 0; arrow_i < 4; arrow_i++) {
if (chord.find(arrow_i) != chord.end()) {
- tBeg = chord[arrow_i].begin; tEnd = chord[arrow_i].end;
+ tBeg = chord[arrow_i].begin - time;
+ tEnd = chord[arrow_i].end - time;
if (tEnd < past) continue;
if (tBeg > future) break;
//unsigned event = m_notes[it->dur[fret]];
@@ -168,7 +176,14 @@ void DanceGraph::draw(double time) {
drawNote(arrow_i, c, tBeg, tEnd);
}
}
- }*/
+ }
+
+ // To test arrow coordinate positioning
+ //for (int i = 0; i < 10; ++i) {
+ //std::cout << time2y(i*0.1f) << std::endl;
+ //drawArrow(1, 0, time2y(i*0.1f), 0.6);
+ //}
+
// Arrows on cursor
// TODO: suitable effect for pressing the arrows?
// TODO: effect possibilities: zooming, whitening, external glow
@@ -178,7 +193,7 @@ void DanceGraph::draw(double time) {
if (m_holds[arrow_i]) glColor3f(1.0f, 1.0f, 1.0f);
drawArrow(arrow_i, x, time2y(0.0), 0.6);
}
- glColor3f(1.0f, 1.0f, 1.0f);
+ glColor3f(1.0f, 1.0f, 1.0f);
}
@@ -187,6 +202,7 @@ void DanceGraph::drawNote(int arrow_i, glutil::Color c, float tBeg, float tEnd)
float x = -1.5f + arrow_i;
float yBeg = time2y(tBeg);
float yEnd = time2y(tEnd);
- c.a = time2a(tBeg); glColor4fv(c);
- drawArrow(arrow_i, x, yBeg);
+ //c.a = time2a(tBeg);
+ glColor4fv(c);
+ drawArrow(arrow_i, x, yBeg, 0.6);
}
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index db6fd34..8a5ae2b 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -304,7 +304,7 @@ void ScreenSing::draw() {
unsigned t = clamp(time, 0.0, length);
m_progress->draw(songPercent);
std::string statustxt = (boost::format("%02u:%02u") % (t / 60) % (t % 60)).str();
- if (!m_score_window.get() && m_song->track_map.empty()) {
+ if (!m_score_window.get() && m_song->track_map.empty() && m_song->danceTracks.empty()) {
if (status == Song::INSTRUMENTAL_BREAK) statustxt += " ENTER to skip instrumental break";
if (status == Song::FINISHED && !config["game/karaoke_mode"].b()) statustxt += " Remember to wait for grading!";
}
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index 7b7688a..960e7aa 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -53,8 +53,8 @@ void SongParser::smParse() {
int lcount = 0; //line counter for note duration
int count = 0; //total lines counter
bool readable = false; //makes sure that other values are read before notes
- int tm = 0; //time counter
- int dur; //note duration
+ double tm = 0; //time counter
+ double dur; //note duration
std::string notestype;
std::string description;
DanceDifficulty danceDifficulty = DIFFICULTYCOUNT;
@@ -86,10 +86,11 @@ void SongParser::smParse() {
if (!readable && isNote(line[0]) ) throw std::runtime_error("Notes outside NoteData");
if (line[0] == ',') {
/*Counting the timestamp of each note*/
- dur = 4 * ( 1/(m_bpm/60) ) / lcount; //counts one note duration in seconds;
+ dur = 4.0 * ( 1.0/(m_bpm/60.0) ) / lcount; //counts one note duration in seconds;
+ //std::cout << "DUR: " << dur << "TM: " << tm << std::endl;
for(int j = count - lcount; j<count ; j++) {
for(int i = 0; i<4; i++) {
- DanceChord _chord = chords.at(j);
+ DanceChord& _chord = chords.at(j);
if(_chord.find(i) != _chord.end()) {
_chord[i].begin = tm;
_chord[i].end = tm;
|
