changeset 16:add71da95cb4

Reduced buffer zone a bit, minor code simplification.
author samer
date Tue, 31 Jan 2012 12:51:35 +0000
parents 9d7e139cd0a3
children 21eb7b7a5dc0
files release/MelodyTriangle.app.tar.gz src/melodyTriangle.cpp
diffstat 2 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
Binary file release/MelodyTriangle.app.tar.gz has changed
--- a/src/melodyTriangle.cpp	Tue Jan 31 12:43:21 2012 +0000
+++ b/src/melodyTriangle.cpp	Tue Jan 31 12:51:35 2012 +0000
@@ -1,7 +1,7 @@
 #include "melodyTriangle.h"
 #include <GLUT/GLUT.h> 
 
-#define BUFFER_ZONE 80 // have to drag this far to snap out of triange.
+#define BUFFER_ZONE 64 // have to drag this far to snap out of triange.
 /*
  /birth id
  /death id
@@ -339,15 +339,8 @@
 //--------------------------------------------------------------
 void melodyTriangle::mouseMoved(int x, int y ){
 	for (int i=0; i<numVoices;i++){
-		if ((*voices[i]).isInVoice(x,y)){
-			(*voices[i]).highlight=true;
-		}else {
-			(*voices[i]).highlight=false;
-		}
-
+		voices[i]->highlight = voices[i]->isInVoice(x,y);
 	}
-	
-	
 }
 
 //--------------------------------------------------------------
@@ -359,7 +352,7 @@
 void melodyTriangle::mousePressed(int x, int y, int button){
 	
 	for (int i=0; i<numVoices;i++){
-		if ((*voices[i]).isInVoice(x,y)){
+		if (voices[i]->isInVoice(x,y)){
 			voiceGrabbed=i;
 			//printf("grabbed %i",voiceGrabbed);
 		}else{