187 f_id = (*closestCursor)->getFingerID(); |
187 f_id = (*closestCursor)->getFingerID(); |
188 freeCursorList.erase(closestCursor); |
188 freeCursorList.erase(closestCursor); |
189 delete *closestCursor; |
189 delete *closestCursor; |
190 } else maxFingerID = f_id; |
190 } else maxFingerID = f_id; |
191 //Modifié par alexandre.bastien@iri.centrepompidou.fr |
191 //Modifié par alexandre.bastien@iri.centrepompidou.fr |
192 TuioCursor *addCursor = new TuioCursor((long)s_id,f_id,xpos,ypos); |
192 TuioCursor *addCursor = new TuioCursor((long)s_id,f_id,xpos,ypos,zpos); |
193 cursorList.push_back(addCursor); |
193 cursorList.push_back(addCursor); |
194 |
194 |
195 for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++) |
195 for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++) |
196 (*listener)->addTuioCursor(addCursor); |
196 (*listener)->addTuioCursor(addCursor); |
197 |
197 |
198 //Modifié par alexandre.bastien@iri.centrepompidou.fr |
198 //Modifié par alexandre.bastien@iri.centrepompidou.fr |
199 } else if ( ((*tcur)->getX()!=xpos) || ((*tcur)->getY()!=ypos) || ((*tcur)->getZ()!=zpos) || ((*tcur)->getXSpeed()!=xspeed) || ((*tcur)->getYSpeed()!=yspeed) || ((*tcur)->getMotionAccel()!=maccel) ) { |
199 } else if ( ((*tcur)->getX()!=xpos) || ((*tcur)->getY()!=ypos) || ((*tcur)->getZ()!=zpos) || ((*tcur)->getXSpeed()!=xspeed) || ((*tcur)->getYSpeed()!=yspeed) || ((*tcur)->getMotionAccel()!=maccel) ) { |
200 (*tcur)->update(xpos,ypos,xspeed,yspeed,maccel); |
200 (*tcur)->update(xpos,ypos,zpos,xspeed,yspeed,maccel); |
201 for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++) |
201 for (std::list<TuioListener*>::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++) |
202 (*listener)->updateTuioCursor((*tcur)); |
202 (*listener)->updateTuioCursor((*tcur)); |
203 } |
203 } |
204 |
204 |
205 } else if( strcmp( cmd, "alive" ) == 0 ){ |
205 } else if( strcmp( cmd, "alive" ) == 0 ){ |