summaryrefslogtreecommitdiff
path: root/vfg/src/music.h
diff options
context:
space:
mode:
Diffstat (limited to 'vfg/src/music.h')
-rwxr-xr-xvfg/src/music.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/vfg/src/music.h b/vfg/src/music.h
index f20838f..aaec003 100755
--- a/vfg/src/music.h
+++ b/vfg/src/music.h
@@ -92,7 +92,7 @@ class lyricscore: public score {
font.loadFont("verdana.ttf", 30, true, true);
font.setLineHeight(34.0f);
font.setLetterSpacing(1.035);
- ypos=(int)(((float)ofGetHeight())*0.9f); //set lyric position
+ ypos=(int)(((float)ofGetHeight())*0.97f); //set lyric position
fadeout=500; //ms
}
void load(string filename) {
@@ -123,8 +123,10 @@ class musicscore: public score {
public:
musicscore();
void parseMidi(string filename);
- void setTimeframe(int millis);
- void draw(levelscore *levels);
+ void setTimeframe(int millis);
+ void setNowpoint(float pct);
+ void drawNotes(levelscore *levels);
+ void drawFlakes(levelscore *levels);
void playerControl(int key,int threshold);
void makeFlakes(int threshStart,int threshEnd);
@@ -136,7 +138,8 @@ class musicscore: public score {
map<int,note*> notes;
map<int,note*> flakes;
int timeframe;
- ofImage flake;
+ ofImage flake;
+ float nowpoint;
};
//---------------------------------------------------------------------------------------------------------------------------------------------
class song {
@@ -148,6 +151,7 @@ class song {
void setTimeframe(int millis);
void setFlakeThresh(int tS,int tE);
void setKeythresh(int millis);
+ void drawNotes();
void draw();
bool isPlaying;
void playerControl(int key);