diff -r 6c08d4d7219e -r 9ccef81f02ab front_idill/extern/fajran-npTuioClient/TuioClient/TuioObject.h --- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioObject.h Thu Apr 12 13:09:46 2012 +0200 +++ b/front_idill/extern/fajran-npTuioClient/TuioClient/TuioObject.h Thu Apr 12 15:33:25 2012 +0200 @@ -1,9 +1,9 @@ /* - TUIO C++ Library - part of the reacTIVision project - http://reactivision.sourceforge.net/ + TUIO C++ Library - part of the reacTIVision project + http://reactivision.sourceforge.net/ - Copyright (c) 2005-2008 Martin Kaltenbrunner - + Copyright (c) 2005-2008 Martin Kaltenbrunner + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -23,7 +23,7 @@ #define INCLUDED_TUIOOBJECT_H #ifndef M_PI -#define M_PI 3.14159265358979323846 +#define M_PI 3.14159265358979323846 #endif #include @@ -31,54 +31,54 @@ #include "TuioContainer.h" class TuioObject: public TuioContainer { - - protected: - long session_id; - int fiducial_id; - float xpos, ypos, angle; - float x_speed, y_speed, motion_speed, motion_accel; - float rotation_speed, rotation_accel; - std::list path; + + protected: + long session_id; + int fiducial_id; + float xpos, ypos, angle; + float x_speed, y_speed, motion_speed, motion_accel; + float rotation_speed, rotation_accel; + std::list path; - public: - TuioObject (long s_id, int f_id, float xpos, float ypos, float angle):TuioContainer(s_id, xpos, ypos) { - this->fiducial_id = f_id; - this->angle = angle; - this->rotation_speed = 0.0f; - this->rotation_accel = 0.0f; - }; + public: + TuioObject (long s_id, int f_id, float xpos, float ypos, float angle):TuioContainer(s_id, xpos, ypos) { + this->fiducial_id = f_id; + this->angle = angle; + this->rotation_speed = 0.0f; + this->rotation_accel = 0.0f; + }; - TuioObject (TuioObject *tuioObject):TuioContainer(tuioObject) { - this->fiducial_id = tuioObject->getFiducialID(); - this->angle = angle; - this->rotation_speed = 0.0f; - this->rotation_accel = 0.0f; - }; - - ~TuioObject() {}; - - void update (float xpos, float ypos, float angle, float xspeed, float yspeed, float rspeed, float maccel, float raccel) { - TuioContainer::update(xpos,ypos,xspeed,yspeed,maccel); - this->angle = angle; - this->rotation_speed = rspeed; - this->rotation_accel = raccel; - }; + TuioObject (TuioObject *tuioObject):TuioContainer(tuioObject) { + this->fiducial_id = tuioObject->getFiducialID(); + this->angle = angle; + this->rotation_speed = 0.0f; + this->rotation_accel = 0.0f; + }; + + ~TuioObject() {}; + + void update (float xpos, float ypos, float angle, float xspeed, float yspeed, float rspeed, float maccel, float raccel) { + TuioContainer::update(xpos,ypos,xspeed,yspeed,maccel); + this->angle = angle; + this->rotation_speed = rspeed; + this->rotation_accel = raccel; + }; - void update (TuioObject *tuioObject) { - TuioContainer::update(tuioObject); - this->angle = tuioObject->getAngle(); - this->rotation_speed = tuioObject->getRotationSpeed(); - this->rotation_accel = tuioObject->getRotationAccel(); - }; - - int getFiducialID() { return fiducial_id; }; + void update (TuioObject *tuioObject) { + TuioContainer::update(tuioObject); + this->angle = tuioObject->getAngle(); + this->rotation_speed = tuioObject->getRotationSpeed(); + this->rotation_accel = tuioObject->getRotationAccel(); + }; + + int getFiducialID() { return fiducial_id; }; - float getAngle() { return angle; } - float getAngleDegrees() { return (float)(angle/M_PI*180); } + float getAngle() { return angle; } + float getAngleDegrees() { return (float)(angle/M_PI*180); } - float getRotationSpeed() { return rotation_speed; }; - float getRotationAccel() { return rotation_accel; }; - + float getRotationSpeed() { return rotation_speed; }; + float getRotationAccel() { return rotation_accel; }; + }; #endif