--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.cpp	Fri Apr 06 11:08:26 2012 +0200
+++ b/front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.cpp	Fri Apr 06 11:48:00 2012 +0200
@@ -83,7 +83,7 @@
 
 				int32 s_id, f_id;
 				float xpos, ypos, angle, xspeed, yspeed, rspeed, maccel, raccel;
-					
+
 				args >> s_id >> f_id >> xpos >> ypos >> angle >> xspeed >> yspeed >> rspeed >> maccel >> raccel >> EndMessage;
 
 				std::list<TuioObject*>::iterator tobj;
@@ -98,7 +98,6 @@
 					for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
 						(*listener)->addTuioObject(addObject);
 
-
 				} else if ( ((*tobj)->getX()!=xpos) || ((*tobj)->getY()!=ypos) || ((*tobj)->getAngle()!=angle) || ((*tobj)->getXSpeed()!=xspeed) || ((*tobj)->getYSpeed()!=yspeed) || ((*tobj)->getRotationSpeed()!=rspeed) || ((*tobj)->getMotionAccel()!=maccel) || ((*tobj)->getRotationAccel()!=raccel) ) {
 					(*tobj)->update(xpos,ypos,angle,xspeed,yspeed,rspeed,maccel,raccel);
 
@@ -159,7 +158,7 @@
 						(*listener)->refresh(currentTime);
 				}
 			}
-		} else if( strcmp( msg.AddressPattern(), "/tuio/2Dcur" ) == 0 ) {
+		} else if( strcmp( msg.AddressPattern(), "/tuio/3Dcur" ) == 0 ) {
 			const char* cmd;
 			args >> cmd;
 			
@@ -167,9 +166,9 @@
 				if ((currentFrame<lastFrame) && (currentFrame>0)) return;
 
 				int32 s_id;
-				float xpos, ypos, xspeed, yspeed, maccel;
-					
-				args >> s_id >> xpos >> ypos >> xspeed >> yspeed >> maccel >> EndMessage;
+				float xpos, ypos, zpos, xspeed, yspeed, maccel;
+				//Modifié par alexandre.bastien@iri.centrepompidou.fr
+				args >> s_id >> xpos >> ypos >> zpos >> xspeed >> yspeed >> maccel >> EndMessage;
 
 				std::list<TuioCursor*>::iterator tcur;
 				for (tcur=cursorList.begin(); tcur != cursorList.end(); tcur++)
@@ -180,24 +179,24 @@
 					int f_id = (int)cursorList.size();
 					if ((int)(cursorList.size())<=maxFingerID) {
 						std::list<TuioCursor*>::iterator closestCursor = freeCursorList.begin();
-						
+						//Modifié par alexandre.bastien@iri.centrepompidou.fr
 						for(std::list<TuioCursor*>::iterator testCursor = freeCursorList.begin();testCursor!= freeCursorList.end(); testCursor++) {
-							if((*testCursor)->getDistance(xpos,ypos)<(*closestCursor)->getDistance(xpos,ypos)) closestCursor = testCursor;
+							if((*testCursor)->getDistance(xpos,ypos,zpos)<(*closestCursor)->getDistance(xpos,ypos,zpos)) closestCursor = testCursor;
 						}
 						
 						f_id = (*closestCursor)->getFingerID();
 						freeCursorList.erase(closestCursor);
 						delete *closestCursor;
 					} else maxFingerID = f_id;	
-
+					//Modifié par alexandre.bastien@iri.centrepompidou.fr
 					TuioCursor *addCursor = new TuioCursor((long)s_id,f_id,xpos,ypos);
 					cursorList.push_back(addCursor);
 					
 					for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
 						(*listener)->addTuioCursor(addCursor);
 					
-
-				} else if ( ((*tcur)->getX()!=xpos) || ((*tcur)->getY()!=ypos) || ((*tcur)->getXSpeed()!=xspeed) || ((*tcur)->getYSpeed()!=yspeed) || ((*tcur)->getMotionAccel()!=maccel) ) {
+				//Modifié par alexandre.bastien@iri.centrepompidou.fr
+				} else if ( ((*tcur)->getX()!=xpos) || ((*tcur)->getY()!=ypos) || ((*tcur)->getZ()!=zpos) || ((*tcur)->getXSpeed()!=xspeed) || ((*tcur)->getYSpeed()!=yspeed) || ((*tcur)->getMotionAccel()!=maccel) ) {
 					(*tcur)->update(xpos,ypos,xspeed,yspeed,maccel);
 					for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
 						(*listener)->updateTuioCursor((*tcur));