comparison src/melodyTriangle.cpp @ 31:417deb31dd4e

Added a switch to control snap-to-true-position behaviour of tokens;
reduced default amplitude of voices.

 
 static int tempi[]={20,30,45,60,90,120,150,180};
 
 melodyTriangle::melodyTriangle(const char *host, int port, int numVoices, 
 							   bool enableKeys,int voiceIdOffset,int receivePort): 
-	numVoices(numVoices), receivePort(receivePort),
+	numVoices(numVoices), receivePort(receivePort), snapTruePos(enableKeys),
 	enableKeys(enableKeys), allowExit(true), ratio(2), tempoIndex(4),
 	display_msg(""), display_frames(0)
 {
 	for (int i=0;i<numVoices;i++) voices[i]=new Voice(i+1+voiceIdOffset);
 	

 					send("/tempo",tempi[tempoIndex]); 
 					break;
 					
 				case ' ': send("/marker"); break;
 				case 'S': send("/save"); break;
+				case 'r': send("/report"); break;
 				case 'C': sendReplyTo(); sendCalibrate(); break;
 				case 'F': ofToggleFullscreen(); break;
 				case 'R': reset(); break;
 				case 'Q': ofAppGlutWindow::exitApp();
 				case OF_KEY_ESC: setKeyboardEnable(false); break;

 }
 
 void melodyTriangle::mouseReleased(int x, int y, int button){ 
 	if (voiceGrabbed!=NULL) {
 		Voice *v=voiceGrabbed;
-		if (v->status==Voice::clear) {
+		if (v->status==Voice::clear && v->truex>=0) {
 			v->posx=v->truex;
 			v->posy=v->truey;
 			v->truex=v->truey=-1;
 		}
 		voiceGrabbed=NULL; 

 			else if (msg=="pending") v->status=Voice::pending;
 			else if (msg=="received") {
 				float x=m.getArgAsFloat(1);
 				float y=m.getArgAsFloat(2);
 				v->status=Voice::clear;
-				if (voiceGrabbed==v) {
-					v->truex=x;
-					v->truey=y;
-				} else {
-					v->posx=x;
-					v->posy=y;
-					v->truex=v->truey=-1;
+				if (snapTruePos) {
+					if (voiceGrabbed==v) {
+						v->truex=x;
+						v->truey=y;
+					} else {
+						v->posx=x;
+						v->posy=y;
+						v->truex=v->truey=-1;
+					}
 				}
-				printf("True position of %d: %4.1f, %4.1f\n",v->id,v->truex,v->truey);
+				printf("True position of %d: %4.1f, %4.1f\n",v->id,x,y);
 			} else if (msg=="position") {
 				int x=(int)m.getArgAsFloat(1);
 				int y=(int)m.getArgAsFloat(2);
 				v->posx=x;
 				v->posy=y;
 				v->inTriangle=!clipToTriangle(&x,&y);
+				v->status=Voice::clear;
 				if (voiceGrabbed==v) voiceGrabbed=NULL;
 			} else if (msg=="running") {
 				v->isActive  = m.getArgAsInt32(1) ? true : false;
 			} else if (msg=="params") {
 				v->octave    = m.getArgAsInt32(1);

 	}
 }
 
 void melodyTriangle::setKeyboardEnable(bool en) {
 	enableKeys=en;
+	snapTruePos=en;
 	display_msg=en ? "Keyboard enabled" : "Keybard disabled";
 	display_frames=40;
 }
 
 // OSC Message sending -----------------------------------------