comparison src/testApp.cpp @ 8:584ef20184f6

FIX: segv when too many users present - added test on user id;
increased MAX_USERS to 16; changed window title to 'Melody Triangle Tracker';
ADDED: full screen option (key 'F');
ADDED: /randinit message between /birth and /start

 
 //--------------------------------------------------------------
 
 testApp::testApp(const char *host, int port, int FPS) {
 	ofSetupOpenGL(&window, IMGWIDTH,IMGHEIGHT, OF_WINDOW);
-	ofSetWindowTitle("Idyom Installation Tracker");
+	ofSetWindowTitle("Melody Triangle Tracker");
 	ofSetFrameRate(FPS);
 
 	// initialise OSC sender
 	printf("OSC target: %s:%d.\n",host,port);
 	printf("Will run at %d frames per second.\n",FPS);

 		
 		if (draw_image==1) {
 			for (int i=0, y=0; y<IMGHEIGHT; y++) {
 				for (int x=0; x<IMGWIDTH; x++, i++) {
 					int id=userRawPixels[i];
-					if (id>0) {
+					if (id>0 && id<=MAX_USERS) {
 						stats[id-1].accum(x,y,depthMap[i]);
 						imagePixels[i]=(128/MAX_USERS)*id;
 					} else imagePixels[i] = 255;
 				}
 			}
 		} else {
 			for (int i=0, y=0; y<IMGHEIGHT; y++) {
 				for (int x=0; x<IMGWIDTH; x++, i++) {
 					int id=userRawPixels[i];
-					if (id>0) stats[id-1].accum(x,y,depthMap[i]);
+					if (id>0 && id<=MAX_USERS) {
+						stats[id-1].accum(x,y,depthMap[i]);
+					}
 				}
 			}
 		}
 
 		for (int id0=0; id0<MAX_USERS; id0++) {
 			if (stats[id0].area()>0) {
 				if (!users[id0].present) {
 					send_osc_i(sender,"/birth",id0+1);
+					send_osc_i(sender,"/randinit",id0+1);
 					send_osc_i(sender,"/start",id0+1);
 					users[id0].present=true;
 				}
 				update_user(id0+1,stats[id0],&users[id0]);
 			} else {

 
 
 void testApp::draw(){
 	char buf[64];
 	ofSetColor(255,255,255);
+	ofScale(ofGetWidth()/(float)IMGWIDTH,ofGetHeight()/(float)IMGHEIGHT);
 	
     if (draw_image) userImage.draw(0, 0, IMGWIDTH, IMGHEIGHT);
 	// ofSetColor(0);
 	// ofLine(IMGWIDTH,0,IMGWIDTH,IMGHEIGHT);
 

 			font.drawString(ofToString(k+1), coors[0]-10, coors[1]-10);
 			draw_rect(coors[3],coors[4],coors[5],coors[6]);
 			// ofRect(coors[0]+IMGWIDTH, (IMGHEIGHT*coors[2])/max_depth, 10, 10);
 		}
 	}
-	if (!got_floor) { //ofSetColor(0,200,0);
+	if (!got_floor) {
 		ofSetColor(255,0,0);
 		ofRect(16,16,16,16);
 	}
 }
 

 			printf("floor plane: (%f,%f,%f), <%f,%f,%f>\n",
 				floor_pie.ptPoint.X, floor_pie.ptPoint.Y, floor_pie.ptPoint.Z,
 				floor_pie.vNormal.X, floor_pie.vNormal.Y, floor_pie.vNormal.Z);
 			break;
 		case 't': draw_time = !draw_time; break;
+		case 'F': ofToggleFullscreen(); break;
 	}
 }
 
 void testApp::keyReleased(int key) {}
 void testApp::mouseMoved(int x, int y ) {}