summaryrefslogtreecommitdiff
path: root/vfg/src/music.h
diff options
context:
space:
mode:
Diffstat (limited to 'vfg/src/music.h')
-rwxr-xr-xvfg/src/music.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/vfg/src/music.h b/vfg/src/music.h
index f9317de..7e54292 100755
--- a/vfg/src/music.h
+++ b/vfg/src/music.h
@@ -4,6 +4,10 @@
#include "ofxXmlSettings.h"
#include "Puppet.h"
+//Grid for drawing
+static float gridX[3]={0.3,0.5,0.7};
+static float gridY[1]={0.8};
+
//event times are absolute integer milliseconds
//---------------------------------------------------------------------------------------------------------------------------------------------
class levelscore {
@@ -73,8 +77,8 @@ class flake: public note, public Puppet {
activated=true;
puppet.play("shatter");
}
- void draw(float x, float y) {
- if (!activated||puppet.isPlaying()) puppet.draw(x,y);
+ void draw(float x, float y,float scale) {
+ if (!activated||puppet.isPlaying()) puppet.draw(x,y,scale);
}
};
//---------------------------------------------------------------------------------------------------------------------------------------------
@@ -144,6 +148,7 @@ class musicscore: public score {
int missedFlakes;
int missedNote;
+ int hitNote;
bool missedLast;
bool perfect;
@@ -170,6 +175,7 @@ class song {
void drawNotes();
void draw();
int missedNote();
+ int hitNote();
bool isPlaying;
void playerControl(int key);
private: