comparison src/melodyTriangle.cpp @ 14:578c1acf1cc4

Octave and amplitude now initialised correctly on birth; added binary app.

 		//printf("not in bounding box \n");
 		return false;
 	}
 }
 
-void melodyTriangle::sendStatus(Voice v){
+void melodyTriangle::sendPosition(Voice v){
 	
 	ofxOscMessage m;
 	///track id x y left right top bottom area  
 	m.setAddress( "/track2d" );
 	m.addIntArg( v.id );

 void melodyTriangle::draw(){
 	bool constrained=false;
 	
 	bool sendStart=false;
 	if (voiceGrabbed!=-1){
-		if (mouseX!=(*voices[voiceGrabbed]).posx || mouseY!=(*voices[voiceGrabbed]).posy){
-			//(*voices[voiceGrabbed]).posx=mouseX;
-			//(*voices[voiceGrabbed]).posy=mouseY;
-			if ((*voices[voiceGrabbed]).inTriangle && !isInTriangle(mouseX,mouseY)){
+		Voice *vg=voices[voiceGrabbed];
+		if (mouseX!=vg->posx || mouseY!=vg->posy){
+			//vg->posx=mouseX;
+			//vg->posy=mouseY;
+			if (vg->inTriangle && !isInTriangle(mouseX,mouseY)){
 			    ///death id
 				
-				if (ofDist((*voices[voiceGrabbed]).posx, (*voices[voiceGrabbed]).posy, mouseX, mouseY)
+				if (ofDist(vg->posx, vg->posy, mouseX, mouseY)
 					> BUFFER_ZONE) { 
 				
 					
 					ofxOscMessage m;
 					///track id x y left right top bottom area  
 					m.setAddress( "/death" );
-					m.addIntArg( (*voices[voiceGrabbed]).id );
+					m.addIntArg( vg->id );
 					sender.sendMessage( m );
 				
-					printf("sent /death %i \n",(*voices[voiceGrabbed]).id);
-					(*voices[voiceGrabbed]).posx=mouseX;
-					(*voices[voiceGrabbed]).posy=mouseY;
+					printf("sent /death %i \n",vg->id);
+					vg->posx=mouseX;
+					vg->posy=mouseY;
 				} else {
 					//printf("e");
 					//On Edge
 					constrained=true;
 				}
 
 			}else{
-				(*voices[voiceGrabbed]).posx=mouseX;
-				(*voices[voiceGrabbed]).posy=mouseY;
-				//(*voices[voiceGrabbed]).posx=(*voices[voiceGrabbed]).posx*0.9+mouseX*0.1;
-				//(*voices[voiceGrabbed]).posy=(*voices[voiceGrabbed]).posy*0.9+mouseY*0.1;
-				
-				
-			}
-			if (!(*voices[voiceGrabbed]).inTriangle && isInTriangle(mouseX,mouseY)){
+				vg->posx=mouseX;
+				vg->posy=mouseY;
+				//vg->posx=vg->posx*0.9+mouseX*0.1;
+				//vg->posy=vg->posy*0.9+mouseY*0.1;
+				
+				
+			}
+			if (!vg->inTriangle && isInTriangle(mouseX,mouseY)){
 				//birth id
 				
 				ofxOscMessage m;
 				///track id x y left right top bottom area  
 				m.setAddress( "/birth" );
-				m.addIntArg( (*voices[voiceGrabbed]).id );
+				m.addIntArg( vg->id );
 				sender.sendMessage( m );
 				
-				printf("sent /birth %i \n",(*voices[voiceGrabbed]).id);
+				printf("sent /birth %i \n",vg->id);
+				sendOctave(vg->id,vg->octave);
+				sendAmplitude(vg->id,vg->amplitude);
 				sendStart=true;
 			}
 			
 			
-			//(*voices[voiceGrabbed]).inTriangle = isInTriangle(mouseX,mouseY);
-			
-			(*voices[voiceGrabbed]).inTriangle = isInTriangle((*voices[voiceGrabbed]).posx,(*voices[voiceGrabbed]).posy);
-			
-			if ((*voices[voiceGrabbed]).inTriangle){
-				sendStatus(*voices[voiceGrabbed]);
+			//vg->inTriangle = isInTriangle(mouseX,mouseY);
+			
+			vg->inTriangle = isInTriangle(vg->posx,vg->posy);
+			
+			if (vg->inTriangle){
+				sendPosition(*vg);
 				if (sendStart){
-					if ((*voices[voiceGrabbed]).isActive){
+					if (vg->isActive){
 						ofxOscMessage m;
 						///track id x y left right top bottom area  
 						m.setAddress( "/start" );
-						m.addIntArg( (*voices[voiceGrabbed]).id );
+						m.addIntArg( vg->id );
 						sender.sendMessage( m );
-						printf("sent /start %i \n",(*voices[voiceGrabbed]).id);
+						printf("sent /start %i \n",vg->id);
 					}
 				}
 			}
 			
 		}