Mercurial > hg > screen-ui

diff src/melodyTriangle.h @ 15:9d7e139cd0a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/melodyTriangle.h	Mon Jan 30 23:31:39 2012 +0000
+++ b/src/melodyTriangle.h	Tue Jan 31 12:43:21 2012 +0000
@@ -30,7 +30,6 @@
 		bool enableKeys;
 		float 	counter;
 		bool	bSmooth;
-		//Voice *voices[NUMVOICES];
 		Voice *voices[10];
 	
 		int x1,y1,x2,y2,x3,y3;//Triangle Coords
@@ -42,10 +41,12 @@
 		void sendShift(int id, int num, int den);
 		void sendOctave(int id, int oct);
 		void sendAmplitude(int id, float amp);
-	    bool isInTriangle(int x, int y);
 		
 	
 	private:
 		ofxOscSender sender;
 		ofxOscReceiver	receiver;
+		int DX13, DY13, SQLEN13;
+	
+		bool clipToTriangle(int *cx, int *cy);
 };