comparison src/melodyTriangle.cpp @ 10:a8f71b5bdb0e

Toned down colours, increased buffer zone, added visual constraint feedback.

 #include "melodyTriangle.h"
 #include <GLUT/GLUT.h> 
 
+#define BUFFER_ZONE 50 // have to drag this far to snap out of triange.
 /*
  /birth id
  /death id
  /start id
  /stop id

 	
 }
 
 //--------------------------------------------------------------
 void melodyTriangle::draw(){
-
-	
-	//let's draw our triangle
-	ofSetColor(0,0,255);
-	
-	ofFill();		
-	ofTriangle(x1, y1, x2, y2, x3, y3);
+	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)){
 			    ///death id
 				
-				if (ofDist((*voices[voiceGrabbed]).posx, (*voices[voiceGrabbed]).posy, mouseX, mouseY) > (*voices[voiceGrabbed]).radius*2){ 
+				if (ofDist((*voices[voiceGrabbed]).posx, (*voices[voiceGrabbed]).posy, mouseX, mouseY)
+					> BUFFER_ZONE) { 
 				
 					
-				ofxOscMessage m;
-				///track id x y left right top bottom area  
-				m.setAddress( "/death" );
-				m.addIntArg( (*voices[voiceGrabbed]).id );
-				sender.sendMessage( m );
-				
-				printf("sent /death %i \n",(*voices[voiceGrabbed]).id);
-				(*voices[voiceGrabbed]).posx=mouseX;
-				(*voices[voiceGrabbed]).posy=mouseY;
-
+					ofxOscMessage m;
+					///track id x y left right top bottom area  
+					m.setAddress( "/death" );
+					m.addIntArg( (*voices[voiceGrabbed]).id );
+					sender.sendMessage( m );
+				
+					printf("sent /death %i \n",(*voices[voiceGrabbed]).id);
+					(*voices[voiceGrabbed]).posx=mouseX;
+					(*voices[voiceGrabbed]).posy=mouseY;
 				} else {
 					//printf("e");
 					//On Edge
+					constrained=true;
 				}
 
 			}else{
 				(*voices[voiceGrabbed]).posx=mouseX;
 				(*voices[voiceGrabbed]).posy=mouseY;

 				}
 			}
 			
 		}
 	};
+
+	//let's draw our triangle
+	ofSetColor(128,128,128);
+	ofFill();		
+	ofTriangle(x1, y1, x2, y2, x3, y3);
+	if (constrained) ofSetColor(255,128,128);
+
+	// draw smooth edge, brighter if a token is constrained
+	ofNoFill();		
+	ofTriangle(x1, y1, x2, y2, x3, y3);
+	
 	for (int i=0; i<numVoices; i++){
 		(*voices[i]).draw();
 	}