Mercurial > hg > screen-ui
comparison src/melodyTriangle.h @ 15:9d7e139cd0a3
Voices can now be dragged along the edges of the triangle.
Also added screenui.sh script to run executable.
author | samer |
---|---|
date | Tue, 31 Jan 2012 12:43:21 +0000 |
parents | 578c1acf1cc4 |
children | 4dcc4312b5fa |
comparison
equal
deleted
inserted
replaced
14:578c1acf1cc4 | 15:9d7e139cd0a3 |
---|---|
28 int numVoices; | 28 int numVoices; |
29 int voiceIdOffset; | 29 int voiceIdOffset; |
30 bool enableKeys; | 30 bool enableKeys; |
31 float counter; | 31 float counter; |
32 bool bSmooth; | 32 bool bSmooth; |
33 //Voice *voices[NUMVOICES]; | |
34 Voice *voices[10]; | 33 Voice *voices[10]; |
35 | 34 |
36 int x1,y1,x2,y2,x3,y3;//Triangle Coords | 35 int x1,y1,x2,y2,x3,y3;//Triangle Coords |
37 int triangleHeight; | 36 int triangleHeight; |
38 int voiceGrabbed; | 37 int voiceGrabbed; |
40 void sendCalibrate(); | 39 void sendCalibrate(); |
41 void sendPeriod(int id, int num, int den); | 40 void sendPeriod(int id, int num, int den); |
42 void sendShift(int id, int num, int den); | 41 void sendShift(int id, int num, int den); |
43 void sendOctave(int id, int oct); | 42 void sendOctave(int id, int oct); |
44 void sendAmplitude(int id, float amp); | 43 void sendAmplitude(int id, float amp); |
45 bool isInTriangle(int x, int y); | |
46 | 44 |
47 | 45 |
48 private: | 46 private: |
49 ofxOscSender sender; | 47 ofxOscSender sender; |
50 ofxOscReceiver receiver; | 48 ofxOscReceiver receiver; |
49 int DX13, DY13, SQLEN13; | |
50 | |
51 bool clipToTriangle(int *cx, int *cy); | |
51 }; | 52 }; |