-
-namespace TUIO {
-
- class OscReceiver; // Forward declaration
-
- /**
- * The TuioClient class is the central TUIO protocol decoder component. It provides a simple callback infrastructure using the {@link TuioListener} interface.
- * In order to receive and decode TUIO messages an instance of TuioClient needs to be created. The TuioClient instance then generates TUIO events
- * which are broadcasted to all registered classes that implement the {@link TuioListener} interface.
- *
- * TuioClient *client = new TuioClient();
- * client->addTuioListener(myTuioListener);
- * client->connect();
- *
- *
- * @author Martin Kaltenbrunner
- * @version 1.5
- */
- class LIBDECL TuioClient : public TuioDispatcher {
-
- public:
- /**
- * This constructor creates a TuioClient that uses an internal UdpReceiver listening to the default UDP port 3333
- *
- */
- TuioClient();
-
- /**
- * This constructor creates a TuioClient that uses an internal UdpReceiver listening to the provided UDP port
- *
- * @param port the UDP port the internal UdpReceiver is listening to
- */
- TuioClient(int port);
-
- /**
- * This constructor creates a TuioClient that uses the provided OscReceiver for the incoming OSC data
- *
- * @param oscreceiver the OscReceiver implementation for the chosen transport method (UDP, TCP ...)
- */
- TuioClient(OscReceiver *oscreceiver);
-
- /**
- * The destructor is doing nothing in particular.
- */
- ~TuioClient();
-
- /**
- * The TuioClient connects and starts receiving TUIO messages from its associated OscReceiver
- *
- * @param lock running in the background if set to false (default)
- */
- void connect(bool lock=false);
-
- /**
- * The TuioClient disconnects and stops receiving TUIO messages from its associated OscReceiver
- */
- void disconnect();
-
- /**
- * Returns true if this TuioClient is currently connected.
- * @return true if this TuioClient is currently connected
- */
- bool isConnected();
-
- /**
- * Returns a List of all currently active TuioObjects
- *
- * @return a List of TuioObjects
- */
- std::list getTuioObjects() {
- return TuioDispatcher::getTuioObjects();
- }
-
- /**
- * Returns a List of all currently active TuioObjects
- * which are associated to the given Source ID
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @return a List of TuioObjects
- */
- std::list getTuioObjects(int source_id);
-
- /**
- * Returns a List with a copy of all currently active TuioObjects
- * which are associated to the given Source ID
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @return a List with a copy of TuioObjects
- */
- std::list copyTuioObjects(int source_id);
-
-
- /**
- * Returns a List with a copy of all currently active TuioObjects
- *
- * @return a List with a copy of TuioObjects
- */
- std::list copyTuioObjects() {
- return TuioDispatcher::copyTuioObjects();
- }
-
- /**
- * Returns the TuioObject corresponding to the provided Session ID
- * or NULL if the Session ID does not refer to an active TuioObject
- *
- * @param s_id the session ID of the corresponding TuioObject
- * @return an active TuioObject corresponding to the provided Session ID or NULL
- */
- TuioObject* getTuioObject(long s_id) {
- return getTuioObject(0,s_id);
- };
-
- /**
- * Returns the TuioObject corresponding to the provided Session ID
- * which is associated to the given Source ID
- * or NULL if the Session ID does not refer to an active TuioObject
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @param s_id the session ID of the corresponding TuioObject
- * @return an active TuioObject corresponding to the provided Session ID or NULL
- */
- TuioObject* getTuioObject(int src_id, long s_id);
-
- /**
- * Returns a List of all currently active TuioCursors
- *
- * @return a List of TuioCursors
- */
- std::list getTuioCursors() {
- return TuioDispatcher::getTuioCursors();
- }
-
- /**
- * Returns a List of all currently active TuioCursors
- * which are associated to the given Source ID
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @return a List of TuioCursors
- */
- std::list getTuioCursors(int source_id);
-
- /**
- * Returns a List with a copy of all currently active TuioCursors
- *
- * @return a List with a copy of TuioCursors
- */
- std::list copyTuioCursors() {
- return TuioDispatcher::copyTuioCursors();
- }
-
- /**
- * Returns a List with a copy of all currently active TuioCursors
- * which are associated to the given Source ID
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @return a List with a copy of TuioCursors
- */
- std::list copyTuioCursors(int source_id);
-
- /**
- * Returns the TuioCursor corresponding to the provided Session ID
- * or NULL if the Session ID does not refer to an active TuioCursor
- *
- * @param s_id the session ID of the corresponding TuioCursor
- * @return an active TuioCursor corresponding to the provided Session ID or NULL
- */
- TuioCursor* getTuioCursor(long s_id) {
- return getTuioCursor(0,s_id);
- };
-
- /**
- * Returns the TuioCursor corresponding to the provided Session ID
- * which is associated to the given Source ID
- * or NULL if the Session ID does not refer to an active TuioCursor
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @param s_id the session ID of the corresponding TuioCursor
- * @return an active TuioCursor corresponding to the provided Session ID or NULL
- */
- TuioCursor* getTuioCursor(int src_id, long s_id);
-
- /**
- * Returns a List of all currently active TuioBlobs
- *
- * @return a List of TuioBlobs
- */
- std::list getTuioBlobs() {
- return TuioDispatcher::getTuioBlobs();
- }
-
- /**
- * Returns a List of all currently active TuioBlobs
- * which are associated to the given Source ID
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @return a List of TuioBlobs
- */
- std::list getTuioBlobs(int source_id);
-
- /**
- * Returns a List with a copy of all currently active TuioBlobs
- *
- * @return a List with a copy of TuioBlobs
- */
- std::list copyTuioBlobs() {
- return TuioDispatcher::copyTuioBlobs();
- }
-
- /**
- * Returns a List with a copy of all currently active TuioBlobs
- * which are associated to the given Source ID
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @return a List with a copy of TuioBlobs
- */
- std::list copyTuioBlobs(int source_id);
-
- /**
- * Returns the TuioBlob corresponding to the provided Session ID
- * or NULL if the Session ID does not refer to an active TuioBlob
- *
- * @param s_id the session ID of the corresponding TuioBlob
- * @return an active TuioBlob corresponding to the provided Session ID or NULL
- */
- TuioBlob* getTuioBlob(long s_id) {
- return getTuioBlob(0,s_id);
- };
-
- /**
- * Returns the TuioBlob corresponding to the provided Session ID
- * which is associated to the given Source ID
- * or NULL if the Session ID does not refer to an active TuioBlob
- *
- * @param src_id the source ID of the corresponding TUIO source
- * @param s_id the session ID of the corresponding TuioBlob
- * @return an active TuioBlob corresponding to the provided Session ID or NULL
- */
- TuioBlob* getTuioBlob(int src_id, long s_id);
-
- void processOSC( const osc::ReceivedMessage& message);
-
- private:
- void initialize();
-
- std::list frameObjects;
- std::list aliveObjectList;
- std::list frameCursors;
- std::list aliveCursorList;
- std::list frameBlobs;
- std::list aliveBlobList;
-
- osc::int32 currentFrame;
- TuioTime currentTime;
-
- std::list freeCursorList, freeCursorBuffer;
- std::map maxCursorID;
-
- std::list freeBlobList, freeBlobBuffer;
- std::map maxBlobID;
-
- std::map sourceList;
- int source_id;
- char *source_name;
- char *source_addr;
-
- OscReceiver *receiver;
- bool local_receiver;
- };
-};
-#endif /* INCLUDED_TUIOCLIENT_H */
diff --git a/TUIO/TuioContainer.cpp b/TUIO/TuioContainer.cpp
index 83aef7a..ba85fb6 100644
--- a/TUIO/TuioContainer.cpp
+++ b/TUIO/TuioContainer.cpp
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "TuioContainer.h"
using namespace TUIO;
@@ -32,40 +29,49 @@ TuioContainer::TuioContainer (TuioTime ttime, long si, float xp, float yp):TuioP
x_speed = 0.0f;
y_speed = 0.0f;
motion_speed = 0.0f;
- motion_accel = 0.0f;
+ motion_accel = 0.0f;
+ x_accel = 0.0f;
+ y_accel = 0.0f;
TuioPoint p(currentTime,xpos,ypos);
path.push_back(p);
-
+ lastPoint = &path.back();
}
TuioContainer::TuioContainer (long si, float xp, float yp):TuioPoint(xp,yp)
,state(TUIO_ADDED)
,source_id(0)
,source_name("undefined")
-,source_addr("localhost")
+,source_addr("localhost")
{
session_id = si;
x_speed = 0.0f;
y_speed = 0.0f;
motion_speed = 0.0f;
- motion_accel = 0.0f;
+ motion_accel = 0.0f;
+ x_accel = 0.0f;
+ y_accel = 0.0f;
TuioPoint p(currentTime,xpos,ypos);
path.push_back(p);
+ lastPoint = &path.back();
}
TuioContainer::TuioContainer (TuioContainer *tcon):TuioPoint(tcon)
,state(TUIO_ADDED)
,source_id(0)
,source_name("undefined")
-,source_addr("localhost")
+,source_addr("localhost")
{
session_id = tcon->getSessionID();
x_speed = 0.0f;
y_speed = 0.0f;
motion_speed = 0.0f;
motion_accel = 0.0f;
+ x_accel = 0.0f;
+ y_accel = 0.0f;
+
TuioPoint p(currentTime,xpos,ypos);
path.push_back(p);
+ lastPoint = &path.back();
}
void TuioContainer::setTuioSource(int src_id, const char *src_name, const char *src_addr) {
@@ -87,31 +93,37 @@ int TuioContainer::getTuioSourceID() const{
}
void TuioContainer::update (TuioTime ttime, float xp, float yp) {
- TuioPoint lastPoint = path.back();
+ lastPoint = &path.back();
TuioPoint::update(ttime,xp, yp);
-
- TuioTime diffTime = currentTime - lastPoint.getTuioTime();
+
+ TuioTime diffTime = currentTime - lastPoint->getTuioTime();
float dt = diffTime.getTotalMilliseconds()/1000.0f;
- float dx = xpos - lastPoint.getX();
- float dy = ypos - lastPoint.getY();
+ float dx = xpos - lastPoint->getX();
+ float dy = ypos - lastPoint->getY();
float dist = sqrt(dx*dx+dy*dy);
float last_motion_speed = motion_speed;
-
+ float last_x_speed = x_speed;
+ float last_y_speed = y_speed;
+
x_speed = dx/dt;
y_speed = dy/dt;
motion_speed = dist/dt;
motion_accel = (motion_speed - last_motion_speed)/dt;
-
+ x_accel = (x_speed - last_x_speed)/dt;
+ y_accel = (y_speed - last_y_speed)/dt;
+
TuioPoint p(currentTime,xpos,ypos);
path.push_back(p);
-
+ if (path.size()>MAX_PATH_SIZE) path.pop_front();
+
if (motion_accel>0) state = TUIO_ACCELERATING;
else if (motion_accel<0) state = TUIO_DECELERATING;
else state = TUIO_STOPPED;
}
void TuioContainer::stop(TuioTime ttime) {
- update(ttime,xpos,ypos);
+ if ( state==TUIO_IDLE )update(ttime,xpos,ypos);
+ else state=TUIO_IDLE;
}
void TuioContainer::update (TuioTime ttime, float xp, float yp, float xs, float ys, float ma) {
@@ -120,10 +132,14 @@ void TuioContainer::update (TuioTime ttime, float xp, float yp, float xs, float
y_speed = ys;
motion_speed = (float)sqrt(x_speed*x_speed+y_speed*y_speed);
motion_accel = ma;
-
+ x_accel = ma;
+ y_accel = ma;
+
+ lastPoint = &path.back();
TuioPoint p(currentTime,xpos,ypos);
path.push_back(p);
-
+ if (path.size()>MAX_PATH_SIZE) path.pop_front();
+
if (motion_accel>0) state = TUIO_ACCELERATING;
else if (motion_accel<0) state = TUIO_DECELERATING;
else state = TUIO_STOPPED;
@@ -135,11 +151,14 @@ void TuioContainer::update (float xp, float yp, float xs, float ys, float ma) {
y_speed = ys;
motion_speed = (float)sqrt(x_speed*x_speed+y_speed*y_speed);
motion_accel = ma;
-
- path.pop_back();
+ x_accel = ma;
+ y_accel = ma;
+
+ lastPoint = &path.back();
TuioPoint p(currentTime,xpos,ypos);
path.push_back(p);
-
+ if (path.size()>MAX_PATH_SIZE) path.pop_front();
+
if (motion_accel>0) state = TUIO_ACCELERATING;
else if (motion_accel<0) state = TUIO_DECELERATING;
else state = TUIO_STOPPED;
@@ -151,10 +170,14 @@ void TuioContainer::update (TuioContainer *tcon) {
y_speed = tcon->getYSpeed();
motion_speed = tcon->getMotionSpeed();
motion_accel = tcon->getMotionAccel();
-
+ x_accel = motion_accel;
+ y_accel = motion_accel;
+
+ lastPoint = &path.back();
TuioPoint p(tcon->getTuioTime(),xpos,ypos);
path.push_back(p);
-
+ if (path.size()>MAX_PATH_SIZE) path.pop_front();
+
if (motion_accel>0) state = TUIO_ACCELERATING;
else if (motion_accel<0) state = TUIO_DECELERATING;
else state = TUIO_STOPPED;
@@ -165,19 +188,19 @@ void TuioContainer::remove(TuioTime ttime) {
state = TUIO_REMOVED;
}
-long TuioContainer::getSessionID() const{
+long TuioContainer::getSessionID() const{
return session_id;
}
-void TuioContainer::setSessionID(long s_id) {
+void TuioContainer::setSessionID(long s_id) {
session_id = s_id;
}
-float TuioContainer::getXSpeed() const{
+float TuioContainer::getXSpeed() const{
return x_speed;
}
-float TuioContainer::getYSpeed() const{
+float TuioContainer::getYSpeed() const{
return y_speed;
}
@@ -198,12 +221,57 @@ float TuioContainer::getMotionAccel() const{
return motion_accel;
}
-int TuioContainer::getTuioState() const{
+int TuioContainer::getTuioState() const{
return state;
-}
+}
-bool TuioContainer::isMoving() const{
+bool TuioContainer::isMoving() const{
if ((state==TUIO_ACCELERATING) || (state==TUIO_DECELERATING)) return true;
else return false;
}
+TuioPoint TuioContainer::predictPosition() {
+ /*if (path.size()>1) {
+ std::list::iterator iter = path.end();
+ std::advance(iter, -2);
+
+ TuioTime diffTime = currentTime - (*iter).getTuioTime();
+ float dt = diffTime.getTotalMilliseconds()/1000.0f;
+
+ float tx = x_speed * dt;
+ float ty = y_speed * dt;
+
+ float nx = xpos+tx-tx*x_accel*dt;
+ float ny = ypos+ty-ty*y_accel*dt;
+
+ //if (xposFilter && yposFilter) {
+ // nx = xposFilter->filter(nx,dt);
+ // ny = yposFilter->filter(ny,dt);
+ // //std::cout << dt << " " << xp << " " << xpos << " " << yp << " " << ypos << std::endl;
+ //}
+
+ //std::cout << nx << " " << ny << std::endl;
+ return TuioPoint(nx,ny);
+ } else return TuioPoint(xpos,ypos);*/
+
+ TuioTime diffTime = currentTime - lastPoint->getTuioTime();
+ float dt = diffTime.getTotalMilliseconds()/1000.0f;
+
+ float tx = x_speed * dt;
+ float ty = y_speed * dt;
+
+ float nx = xpos+tx-tx*x_accel*dt;
+ float ny = ypos+ty-ty*y_accel*dt;
+
+ //if (xposFilter && yposFilter) {
+ // nx = xposFilter->filter(nx,dt);
+ // ny = yposFilter->filter(ny,dt);
+ // //std::cout << dt << " " << xp << " " << xpos << " " << yp << " " << ypos << std::endl;
+ //}
+
+ //std::cout << nx << " " << ny << std::endl;
+ return TuioPoint(nx,ny);
+
+
+}
+
diff --git a/TUIO/TuioContainer.h b/TUIO/TuioContainer.h
index 6a23595..c25a0b2 100644
--- a/TUIO/TuioContainer.h
+++ b/TUIO/TuioContainer.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOCONTAINER_H
#define INCLUDED_TUIOCONTAINER_H
@@ -34,16 +31,23 @@
#define TUIO_STOPPED 5
#define TUIO_REMOVED 6
+#define MAX_PATH_SIZE 128
+
namespace TUIO {
/**
* The abstract TuioContainer class defines common attributes that apply to both subclasses {@link TuioObject} and {@link TuioCursor}.
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioContainer: public TuioPoint {
+
+ private:
+
+ TuioPoint *lastPoint;
+
protected:
/**
* The unique session ID number that is assigned to each TUIO object or cursor.
@@ -65,6 +69,8 @@ namespace TUIO {
* The motion acceleration value.
*/
float motion_accel;
+ float x_accel;
+ float y_accel;
/**
* A List of TuioPoints containing all the previous positions of the TUIO component.
*/
@@ -266,6 +272,8 @@ namespace TUIO {
* @return true of this TuioContainer is moving
*/
virtual bool isMoving() const;
+
+ virtual TuioPoint predictPosition();
};
}
#endif
diff --git a/TUIO/TuioCursor.cpp b/TUIO/TuioCursor.cpp
index 4d5fdb4..4df31cd 100644
--- a/TUIO/TuioCursor.cpp
+++ b/TUIO/TuioCursor.cpp
@@ -1,29 +1,25 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "TuioCursor.h"
using namespace TUIO;
-
TuioCursor::TuioCursor (TuioTime ttime, long si, int ci, float xp, float yp):TuioContainer(ttime,si,xp,yp) {
cursor_id = ci;
}
@@ -36,7 +32,6 @@ TuioCursor::TuioCursor (TuioCursor *tcur):TuioContainer(tcur) {
cursor_id = tcur->getCursorID();
}
-
int TuioCursor::getCursorID() const{
return cursor_id;
};
diff --git a/TUIO/TuioCursor.h b/TUIO/TuioCursor.h
index 9e8ce48..43d345d 100644
--- a/TUIO/TuioCursor.h
+++ b/TUIO/TuioCursor.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOCURSOR_H
#define INCLUDED_TUIOCURSOR_H
@@ -30,7 +27,7 @@ namespace TUIO {
* The TuioCursor class encapsulates /tuio/2Dcur TUIO cursors.
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioCursor: public TuioContainer {
@@ -77,7 +74,7 @@ namespace TUIO {
/**
* The destructor is doing nothing in particular.
*/
- ~TuioCursor(){};
+ virtual ~TuioCursor(){};
/**
* Returns the Cursor ID of this TuioCursor.
diff --git a/TUIO/TuioDispatcher.cpp b/TUIO/TuioDispatcher.cpp
index a1b4274..c36d59e 100644
--- a/TUIO/TuioDispatcher.cpp
+++ b/TUIO/TuioDispatcher.cpp
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (C) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "TuioDispatcher.h"
@@ -34,9 +31,9 @@ TuioDispatcher::TuioDispatcher() {
pthread_mutex_init(&objectMutex,NULL);
pthread_mutex_init(&blobMutex,NULL);
#else
- cursorMutex = CreateMutex(NULL,FALSE,"cursorMutex");
- objectMutex = CreateMutex(NULL,FALSE,"objectMutex");
- blobMutex = CreateMutex(NULL,FALSE,"blobMutex");
+ cursorMutex = CreateMutex(NULL,FALSE,TEXT("cursorMutex"));
+ objectMutex = CreateMutex(NULL,FALSE,TEXT("objectMutex"));
+ blobMutex = CreateMutex(NULL,FALSE,TEXT("blobMutex"));
#endif
}
@@ -151,21 +148,27 @@ TuioBlob* TuioDispatcher::getTuioBlob(long s_id) {
std::list TuioDispatcher::getTuioObjects() {
lockObjectList();
- std::list listBuffer = objectList;
+ std::list listBuffer;
+ listBuffer.insert(listBuffer.end(), objectList.begin(), objectList.end());
+ //std::list listBuffer = objectList;
unlockObjectList();
return listBuffer;
}
std::list TuioDispatcher::getTuioCursors() {
lockCursorList();
- std::list listBuffer = cursorList;
+ std::list listBuffer;
+ listBuffer.insert(listBuffer.end(), cursorList.begin(), cursorList.end());
+ //std::list listBuffer = cursorList;
unlockCursorList();
return listBuffer;
}
std::list TuioDispatcher::getTuioBlobs() {
lockBlobList();
- std::list listBuffer = blobList;
+ std::list listBuffer;
+ listBuffer.insert(listBuffer.end(), blobList.begin(), blobList.end());
+ //std::list listBuffer = blobList;
unlockBlobList();
return listBuffer;
}
diff --git a/TUIO/TuioDispatcher.h b/TUIO/TuioDispatcher.h
index 8553c03..0b8fc79 100644
--- a/TUIO/TuioDispatcher.h
+++ b/TUIO/TuioDispatcher.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (C) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIODISPATCHER_H
#define INCLUDED_TUIODISPATCHER_H
@@ -37,7 +34,7 @@ namespace TUIO {
* registered classes that implement the {@link TuioListener} interface.
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioDispatcher {
diff --git a/TUIO/TuioListener.h b/TUIO/TuioListener.h
index d70592d..099f880 100644
--- a/TUIO/TuioListener.h
+++ b/TUIO/TuioListener.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOLISTENER_H
#define INCLUDED_TUIOLISTENER_H
@@ -43,7 +40,7 @@ namespace TUIO {
*
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioListener {
diff --git a/TUIO/TuioManager.cpp b/TUIO/TuioManager.cpp
index 9053c08..db16a61 100644
--- a/TUIO/TuioManager.cpp
+++ b/TUIO/TuioManager.cpp
@@ -1,22 +1,19 @@
/*
- TUIO Server Component - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (C) 2005-2009 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
*/
#include "TuioManager.h"
@@ -61,6 +58,7 @@ TuioObject* TuioManager::addTuioObject(int f_id, float x, float y, float a) {
void TuioManager::addExternalTuioObject(TuioObject *tobj) {
if (tobj==NULL) return;
+ tobj->setSessionID(sessionID++);
objectList.push_back(tobj);
updateObject = true;
@@ -103,15 +101,16 @@ void TuioManager::updateExternalTuioObject(TuioObject *tobj) {
void TuioManager::removeTuioObject(TuioObject *tobj) {
if (tobj==NULL) return;
- objectList.remove(tobj);
- delete tobj;
- updateObject = true;
for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
(*listener)->removeTuioObject(tobj);
if (verbose)
std::cout << "del obj " << tobj->getSymbolID() << " (" << tobj->getSessionID() << ")" << std::endl;
+
+ objectList.remove(tobj);
+ delete tobj;
+ updateObject = true;
}
void TuioManager::removeExternalTuioObject(TuioObject *tobj) {
@@ -158,6 +157,7 @@ TuioCursor* TuioManager::addTuioCursor(float x, float y) {
void TuioManager::addExternalTuioCursor(TuioCursor *tcur) {
if (tcur==NULL) return;
+ tcur->setSessionID(sessionID++);
cursorList.push_back(tcur);
updateCursor = true;
@@ -170,7 +170,7 @@ void TuioManager::addExternalTuioCursor(TuioCursor *tcur) {
void TuioManager::updateTuioCursor(TuioCursor *tcur,float x, float y) {
if (tcur==NULL) return;
- if (tcur->getTuioTime()==currentFrameTime) return;
+ //if (tcur->getTuioTime()==currentFrameTime) return;
tcur->update(currentFrameTime,x,y);
updateCursor = true;
@@ -280,13 +280,31 @@ TuioBlob* TuioManager::addTuioBlob(float x, float y, float a, float w, float h,
(*listener)->addTuioBlob(tblb);
if (verbose)
- std::cout << "add blb " << tblb->getBlobID() << " (" << tblb->getSessionID() << ") " << tblb->getX() << " " << tblb->getY() << tblb->getAngle() << " " << tblb->getWidth() << tblb->getHeight() << " " << tblb->getArea() << std::endl;
+ std::cout << "add blb " << tblb->getBlobID() << " (" << tblb->getSessionID() << ") " << tblb->getX() << " " << tblb->getY() << " " << tblb->getAngle() << " " << tblb->getWidth() << " " << tblb->getHeight() << " " << tblb->getArea() << std::endl;
return tblb;
}
void TuioManager::addExternalTuioBlob(TuioBlob *tblb) {
if (tblb==NULL) return;
+
+ int blobID = (int)blobList.size();
+ if (blobID <= maxBlobID) {
+ std::list::iterator closestBlob = freeBlobList.begin();
+
+ for(std::list::iterator iter = freeBlobList.begin();iter!= freeBlobList.end(); iter++) {
+ if((*iter)->getDistance(tblb->getX(),tblb->getY())<(*closestBlob)->getDistance(tblb->getX(),tblb->getY())) closestBlob = iter;
+ }
+
+ TuioBlob *freeBlob = (*closestBlob);
+ blobID = (*closestBlob)->getBlobID();
+ freeBlobList.erase(closestBlob);
+ delete freeBlob;
+ } else maxBlobID = blobID;
+
+ tblb->setSessionID(sessionID++);
+ tblb->setBlobID(blobID);
+
blobList.push_back(tblb);
updateBlob = true;
@@ -294,7 +312,7 @@ void TuioManager::addExternalTuioBlob(TuioBlob *tblb) {
(*listener)->addTuioBlob(tblb);
if (verbose)
- std::cout << "add blb " << tblb->getBlobID() << " (" << tblb->getSessionID() << ") " << tblb->getX() << " " << tblb->getY() << tblb->getAngle() << " " << tblb->getWidth() << tblb->getHeight() << " " << tblb->getArea() << std::endl;
+ std::cout << "add blb " << tblb->getBlobID() << " (" << tblb->getSessionID() << ") " << tblb->getX() << " " << tblb->getY() << " " << tblb->getAngle() << " " << tblb->getWidth() << " " << tblb->getHeight() << " " << tblb->getArea() << std::endl;
}
void TuioManager::updateTuioBlob(TuioBlob *tblb,float x, float y, float a, float w, float h, float f) {
@@ -569,8 +587,8 @@ void TuioManager::stopUntouchedMovingBlobs() {
tblb->stop(currentFrameTime);
updateBlob = true;
if (verbose)
- std::cout << "set blb " << tblb->getSessionID() << tblb->getX() << " " << tblb->getY() << " " << tblb->getWidth() << " " << tblb->getHeight() << " " << tblb->getAngle()
- << " " << tblb->getXSpeed() << " " << tblb->getYSpeed()<< " " << tblb->getMotionAccel() << " " << std::endl;
+ std::cout << "set blb " << tblb->getBlobID() << " (" << tblb->getSessionID() << ") " << tblb->getX() << " " << tblb->getY() << " " << tblb->getAngle() << " " << tblb->getWidth() << " " << tblb->getHeight() << " " << tblb->getArea()
+ << " " << tblb->getXSpeed() << " " << tblb->getYSpeed() << " " << tblb->getRotationSpeed() << " " << tblb->getMotionAccel()<< " " << tblb->getRotationAccel() << " " << std::endl;
}
}
}
diff --git a/TUIO/TuioManager.h b/TUIO/TuioManager.h
index 10fe477..3eabbde 100644
--- a/TUIO/TuioManager.h
+++ b/TUIO/TuioManager.h
@@ -1,23 +1,20 @@
/*
- TUIO Server Component - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (C) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOMANAGER_H
#define INCLUDED_TUIOMANAGER_H
@@ -60,7 +57,7 @@ namespace TUIO {
*
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioManager : public TuioDispatcher {
@@ -348,6 +345,7 @@ namespace TUIO {
* @param verbose print verbose messages if set to true
*/
void setVerbose(bool verbose) { this->verbose=verbose; }
+ bool isVerbose() { return verbose; }
void setInversion(bool ix, bool iy, bool ia) {
invert_x = ix;
diff --git a/TUIO/TuioObject.cpp b/TUIO/TuioObject.cpp
index de9090a..9c818ca 100644
--- a/TUIO/TuioObject.cpp
+++ b/TUIO/TuioObject.cpp
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "TuioObject.h"
@@ -26,27 +23,40 @@ using namespace TUIO;
TuioObject::TuioObject (TuioTime ttime, long si, int sym, float xp, float yp, float a):TuioContainer(ttime, si, xp, yp) {
symbol_id = sym;
angle = a;
+ angle_sum = a;
rotation_speed = 0.0f;
rotation_accel = 0.0f;
+
+ angleFilter = NULL;
+ angleThreshold = 0.0f;
}
TuioObject::TuioObject (long si, int sym, float xp, float yp, float a):TuioContainer(si, xp, yp) {
symbol_id = sym;
angle = a;
+ angle_sum = a;
rotation_speed = 0.0f;
rotation_accel = 0.0f;
+
+ angleFilter = NULL;
+ angleThreshold = 0.0f;
}
TuioObject::TuioObject (TuioObject *tobj):TuioContainer(tobj) {
symbol_id = tobj->getSymbolID();
angle = tobj->getAngle();
+ angle_sum = tobj->getAngleSum();
rotation_speed = 0.0f;
rotation_accel = 0.0f;
+
+ angleFilter = NULL;
+ angleThreshold = 0.0f;
}
void TuioObject::update (TuioTime ttime, float xp, float yp, float a, float xs, float ys, float rs, float ma, float ra) {
TuioContainer::update(ttime,xp,yp,xs,ys,ma);
angle = a;
+ angle_sum = a;
rotation_speed = rs;
rotation_accel = ra;
if ((rotation_accel!=0) && (state==TUIO_STOPPED)) state = TUIO_ROTATING;
@@ -56,6 +66,7 @@ void TuioObject::update (TuioTime ttime, float xp, float yp, float a, float xs,
void TuioObject::update (float xp, float yp, float a, float xs, float ys, float rs, float ma, float ra) {
TuioContainer::update(xp,yp,xs,ys,ma);
angle = a;
+ angle_sum = a;
rotation_speed = rs;
rotation_accel = ra;
if ((rotation_accel!=0) && (state==TUIO_STOPPED)) state = TUIO_ROTATING;
@@ -67,11 +78,21 @@ void TuioObject::update (TuioTime ttime, float xp, float yp, float a) {
TuioTime diffTime = currentTime - lastPoint.getTuioTime();
float dt = diffTime.getTotalMilliseconds()/1000.0f;
- float last_angle = angle;
float last_rotation_speed = rotation_speed;
- angle = a;
- double da = (angle-last_angle)/(2*M_PI);
+ float prev_angle = angle_sum;
+ float da = a-angle;
+ if (da > M_PI/2.0f) angle_sum += (da-2*M_PI);
+ else if (da < M_PI/-2.0f) angle_sum += (da+2*M_PI);
+ else angle_sum += da;
+
+ if (angleFilter) angle_sum = angleFilter->filter(angle_sum,dt);
+ if (fabs(angle_sum-prev_angle) 0.75f) da-=1.0f;
else if (da < -0.75f) da+=1.0f;
@@ -88,6 +109,7 @@ void TuioObject::stop (TuioTime ttime) {
void TuioObject::update (TuioObject *tobj) {
TuioContainer::update(tobj);
angle = tobj->getAngle();
+ angle_sum = tobj->getAngleSum();
rotation_speed = tobj->getRotationSpeed();
rotation_accel = tobj->getRotationAccel();
if ((rotation_accel!=0) && (state==TUIO_STOPPED)) state = TUIO_ROTATING;
@@ -101,6 +123,10 @@ float TuioObject::getAngle() const{
return angle;
}
+float TuioObject::getAngleSum() const{
+ return angle_sum;
+}
+
float TuioObject::getAngleDegrees() const{
return (float)(angle/M_PI*180);
}
@@ -117,3 +143,23 @@ bool TuioObject::isMoving() const{
if ((state==TUIO_ACCELERATING) || (state==TUIO_DECELERATING) || (state==TUIO_ROTATING)) return true;
else return false;
}
+
+void TuioObject::addAngleThreshold(float thresh) {
+ angleThreshold = thresh;
+}
+
+void TuioObject::removeAngleThreshold() {
+ angleThreshold = 0.0f;
+}
+
+void TuioObject::addAngleFilter(float mcut, float beta) {
+
+ if (angleFilter) delete angleFilter;
+ angleFilter = new OneEuroFilter(60.0f, mcut, beta, 1.0f);
+}
+
+void TuioObject::removeAngleFilter() {
+
+ if (angleFilter) delete angleFilter;
+ angleFilter = NULL;
+}
diff --git a/TUIO/TuioObject.h b/TUIO/TuioObject.h
index 183c6f2..b027c79 100644
--- a/TUIO/TuioObject.h
+++ b/TUIO/TuioObject.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOOBJECT_H
#define INCLUDED_TUIOOBJECT_H
@@ -30,7 +27,7 @@ namespace TUIO {
* The TuioObject class encapsulates /tuio/2Dobj TUIO objects.
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioObject: public TuioContainer {
@@ -43,6 +40,10 @@ namespace TUIO {
* The rotation angle value.
*/
float angle;
+ /**
+ * The accumulated angle value.
+ */
+ float angle_sum;
/**
* The rotation speed value.
*/
@@ -52,6 +53,9 @@ namespace TUIO {
*/
float rotation_accel;
+ float angleThreshold;
+ OneEuroFilter *angleFilter;
+
public:
using TuioContainer::update;
@@ -91,7 +95,9 @@ namespace TUIO {
/**
* The destructor is doing nothing in particular.
*/
- ~TuioObject() {};
+ virtual ~TuioObject() {
+ if (angleFilter) delete angleFilter;
+ };
/**
* Takes a TuioTime argument and assigns it along with the provided
@@ -165,6 +171,12 @@ namespace TUIO {
*/
float getAngle() const;
+ /**
+ * Returns the accumulated rotation angle of this TuioObject.
+ * @return the accumulated rotation angle of this TuioObject
+ */
+ float getAngleSum() const;
+
/**
* Returns the rotation angle in degrees of this TuioObject.
* @return the rotation angle in degrees of this TuioObject
@@ -188,6 +200,14 @@ namespace TUIO {
* @return true of this TuioObject is moving
*/
bool isMoving() const;
+
+ void addAngleThreshold(float thresh);
+
+ void removeAngleThreshold();
+
+ void addAngleFilter(float mcut, float beta);
+
+ void removeAngleFilter();
};
}
#endif
diff --git a/TUIO/TuioPoint.cpp b/TUIO/TuioPoint.cpp
index 42f58a8..0b0761c 100644
--- a/TUIO/TuioPoint.cpp
+++ b/TUIO/TuioPoint.cpp
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "TuioPoint.h"
@@ -28,6 +25,11 @@ TuioPoint::TuioPoint (float xp, float yp) {
ypos = yp;
currentTime = TuioTime::getSessionTime();
startTime = currentTime;
+
+ xposFilter = NULL;
+ yposFilter = NULL;
+
+ posThreshold = 0.0f;
}
TuioPoint::TuioPoint (TuioTime ttime, float xp, float yp) {
@@ -35,6 +37,11 @@ TuioPoint::TuioPoint (TuioTime ttime, float xp, float yp) {
ypos = yp;
currentTime = ttime;
startTime = currentTime;
+
+ xposFilter = NULL;
+ yposFilter = NULL;
+
+ posThreshold = 0.0f;
}
TuioPoint::TuioPoint (TuioPoint *tpoint) {
@@ -42,6 +49,11 @@ TuioPoint::TuioPoint (TuioPoint *tpoint) {
ypos = tpoint->getY();
currentTime = TuioTime::getSessionTime();
startTime = currentTime;
+
+ xposFilter = NULL;
+ yposFilter = NULL;
+
+ posThreshold = 0.0f;
}
void TuioPoint::update (TuioPoint *tpoint) {
@@ -52,16 +64,30 @@ void TuioPoint::update (TuioPoint *tpoint) {
void TuioPoint::update (float xp, float yp) {
xpos = xp;
ypos = yp;
-}
+}
void TuioPoint::update (TuioTime ttime, float xp, float yp) {
- xpos = xp;
- ypos = yp;
+
+ if (xposFilter && yposFilter) {
+ TuioTime diffTime = ttime - startTime;
+ float dt = diffTime.getTotalMilliseconds()/1000.0f;
+ xp = xposFilter->filter(xp,dt);
+ yp = yposFilter->filter(yp,dt);
+ //std::cout << dt << " " << xp << " " << xpos << " " << yp << " " << ypos << std::endl;
+ }
+
+ float dx = fabs(xpos - xp);
+ float dy = fabs(ypos - yp);
+ if ((dx>posThreshold) || (dy>posThreshold)) {
+ xpos = xp;
+ ypos = yp;
+ }
+
currentTime = ttime;
}
-float TuioPoint::getX() const{
+float TuioPoint::getX() const{
return xpos;
}
@@ -90,10 +116,10 @@ float TuioPoint::getAngle(float xp, float yp) const{
float side = xpos-xp;
float height = ypos-yp;
float distance = getDistance(xp,yp);
-
+
float angle = (float)(asin(side/distance)+M_PI/2);
if (height<0) angle = 2.0f*(float)M_PI-angle;
-
+
return angle;
}
@@ -109,7 +135,7 @@ float TuioPoint::getAngleDegrees(TuioPoint *tpoint) const{
return ((getAngle(tpoint)/(float)M_PI)*180.0f);
}
-int TuioPoint::getScreenX(int width) const{
+int TuioPoint::getScreenX(int width) const{
return (int)floor(xpos*width+0.5f);
}
@@ -117,7 +143,7 @@ int TuioPoint::getScreenY(int height) const{
return (int)floor(ypos*height+0.5f);
}
-TuioTime TuioPoint::getTuioTime() const{
+TuioTime TuioPoint::getTuioTime() const{
return currentTime;
}
@@ -125,3 +151,26 @@ TuioTime TuioPoint::getStartTime() const{
return startTime;
}
+void TuioPoint::addPositionThreshold(float thresh) {
+ posThreshold = thresh;
+}
+
+void TuioPoint::removePositionThreshold() {
+ posThreshold = 0.0f;
+}
+
+void TuioPoint::addPositionFilter(float mcut, float beta) {
+
+ if (xposFilter) delete xposFilter;
+ xposFilter = new OneEuroFilter(60.0f, mcut, beta, 1.0f);
+ if (yposFilter) delete yposFilter;
+ yposFilter = new OneEuroFilter(60.0f, mcut, beta, 1.0f);
+}
+
+void TuioPoint::removePositionFilter() {
+
+ if (xposFilter) delete xposFilter;
+ xposFilter = NULL;
+ if (yposFilter) delete yposFilter;
+ yposFilter = NULL;
+}
diff --git a/TUIO/TuioPoint.h b/TUIO/TuioPoint.h
index 9a5ec93..3415f07 100644
--- a/TUIO/TuioPoint.h
+++ b/TUIO/TuioPoint.h
@@ -1,28 +1,26 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOPOINT_H
#define INCLUDED_TUIOPOINT_H
#include "TuioTime.h"
+#include "OneEuroFilter.h"
#include
#ifndef M_PI
@@ -30,16 +28,16 @@
#endif
namespace TUIO {
-
+
/**
* The TuioPoint class on the one hand is a simple container and utility class to handle TUIO positions in general,
* on the other hand the TuioPoint is the base class for the TuioCursor and TuioObject classes.
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioPoint {
-
+
protected:
/**
* X coordinate, representated as a floating point value in a range of 0..1
@@ -57,16 +55,20 @@ namespace TUIO {
* The creation time of this TuioPoint represented as TuioTime (time since session start)
*/
TuioTime startTime;
-
+
+ OneEuroFilter *xposFilter;
+ OneEuroFilter *yposFilter;
+ float posThreshold;
+
public:
/**
- * The default constructor takes no arguments and sets
+ * The default constructor takes no arguments and sets
* its coordinate attributes to zero and its time stamp to the current session time.
*/
TuioPoint (float xp, float yp);
-
+
/**
- * This constructor takes a TuioTime object and two floating point coordinate arguments and sets
+ * This constructor takes a TuioTime object and two floating point coordinate arguments and sets
* its coordinate attributes to these values and its time stamp to the provided TUIO time object.
*
* @param ttime the TuioTime to assign
@@ -74,37 +76,40 @@ namespace TUIO {
* @param yp the Y coordinate to assign
*/
TuioPoint (TuioTime ttime, float xp, float yp);
-
+
/**
- * This constructor takes a TuioPoint argument and sets its coordinate attributes
+ * This constructor takes a TuioPoint argument and sets its coordinate attributes
* to the coordinates of the provided TuioPoint and its time stamp to the current session time.
*
* @param tpoint the TuioPoint to assign
*/
TuioPoint (TuioPoint *tpoint);
-
+
/**
- * The destructor is doing nothing in particular.
+ * The destructor is doing nothing in particular.
*/
- ~TuioPoint(){};
-
+ virtual ~TuioPoint(){
+ if (xposFilter) delete xposFilter;
+ if (yposFilter) delete yposFilter;
+ };
+
/**
- * Takes a TuioPoint argument and updates its coordinate attributes
+ * Takes a TuioPoint argument and updates its coordinate attributes
* to the coordinates of the provided TuioPoint and leaves its time stamp unchanged.
*
* @param tpoint the TuioPoint to assign
*/
void update (TuioPoint *tpoint);
-
+
/**
* Takes two floating point coordinate arguments and updates its coordinate attributes
* to the coordinates of the provided TuioPoint and leaves its time stamp unchanged.
*
* @param xp the X coordinate to assign
* @param yp the Y coordinate to assign
- */
- void update (float xp, float yp);
-
+ */
+ void update (float xp, float yp);
+
/**
* Takes a TuioTime object and two floating point coordinate arguments and updates its coordinate attributes
* to the coordinates of the provided TuioPoint and its time stamp to the provided TUIO time object.
@@ -208,6 +213,14 @@ namespace TUIO {
* @return the start time of this TuioPoint as TuioTime
*/
TuioTime getStartTime() const;
+
+ void addPositionThreshold(float thresh);
+
+ void removePositionThreshold();
+
+ void addPositionFilter(float mcut, float beta);
+
+ void removePositionFilter();
};
}
#endif
diff --git a/TUIO/TuioServer.cpp b/TUIO/TuioServer.cpp
index 4220237..c157e7d 100644
--- a/TUIO/TuioServer.cpp
+++ b/TUIO/TuioServer.cpp
@@ -1,22 +1,19 @@
/*
- TUIO Server Component - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (C) 2005-2009 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
*/
#include "TuioServer.h"
@@ -26,48 +23,44 @@ using namespace TUIO;
using namespace osc;
TuioServer::TuioServer()
- :local_sender (true)
- ,full_update (false)
+ :full_update (false)
,periodic_update (false)
,objectProfileEnabled (true)
,cursorProfileEnabled (true)
,blobProfileEnabled (true)
,source_name (NULL)
{
- primary_sender = new UdpSender();
- initialize();
+ OscSender *oscsend = new UdpSender();
+ initialize(oscsend);
}
TuioServer::TuioServer(const char *host, int port)
-:local_sender (true)
-,full_update (false)
+:full_update (false)
,periodic_update (false)
,objectProfileEnabled (true)
,cursorProfileEnabled (true)
,blobProfileEnabled (true)
,source_name (NULL)
{
- primary_sender = new UdpSender(host,port);
- initialize();
+ OscSender *oscsend = new UdpSender(host,port);
+ initialize(oscsend);
}
TuioServer::TuioServer(OscSender *oscsend)
- :primary_sender (oscsend)
- ,local_sender (false)
- ,full_update (false)
+ :full_update (false)
,periodic_update (false)
,objectProfileEnabled (true)
,cursorProfileEnabled (true)
,blobProfileEnabled (true)
,source_name (NULL)
{
- initialize();
+ initialize(oscsend);
}
-void TuioServer::initialize() {
+void TuioServer::initialize(OscSender *oscsend) {
- senderList.push_back(primary_sender);
- int size = primary_sender->getBufferSize();
+ senderList.push_back(oscsend);
+ int size = oscsend->getBufferSize();
oscBuffer = new char[size];
oscPacket = new osc::OutboundPacketStream(oscBuffer,size);
fullBuffer = new char[size];
@@ -77,9 +70,9 @@ void TuioServer::initialize() {
cursorUpdateTime = TuioTime(currentFrameTime);
blobUpdateTime = TuioTime(currentFrameTime);
- sendEmptyCursorBundle();
- sendEmptyObjectBundle();
- sendEmptyBlobBundle();
+ if (cursorProfileEnabled) sendEmptyCursorBundle();
+ if (objectProfileEnabled) sendEmptyObjectBundle();
+ if (blobProfileEnabled) sendEmptyBlobBundle();
invert_x = false;
invert_y = false;
@@ -98,17 +91,18 @@ TuioServer::~TuioServer() {
removeUntouchedStoppedObjects();
removeUntouchedStoppedBlobs();
- sendEmptyCursorBundle();
- sendEmptyObjectBundle();
- sendEmptyBlobBundle();
-
+ if (cursorProfileEnabled) sendEmptyCursorBundle();
+ if (objectProfileEnabled) sendEmptyObjectBundle();
+ if (blobProfileEnabled) sendEmptyBlobBundle();
+
delete []oscBuffer;
delete oscPacket;
delete []fullBuffer;
delete fullPacket;
if (source_name) delete[] source_name;
- if( local_sender) delete primary_sender;
+ for (unsigned int i=0;isendOscPacket(packet);
}
+void TuioServer::setSourceName(const char *name, const char *ip) {
+ if (!source_name) source_name = new char[256];
+ sprintf(source_name,"%s@%s",name,ip);
+}
+
+
void TuioServer::setSourceName(const char *src) {
if (!source_name) source_name = new char[256];
- if (primary_sender->isLocal()) {
+ /*if (senderList[0]->isLocal()) {
sprintf(source_name,"%s",src);
- } else {
+ } else {*/
char hostname[64];
char *source_addr = NULL;
struct hostent *hp = NULL;
@@ -174,9 +174,9 @@ void TuioServer::setSourceName(const char *src) {
source_addr = inet_ntoa(*addr);
}
sprintf(source_name,"%s@%s",src,source_addr);
- }
+ //}
- //std::cout << "source: " << source_name << std::endl;
+ std::cout << "tuio/src " << source_name << std::endl;
}
void TuioServer::commitFrame() {
@@ -302,12 +302,14 @@ void TuioServer::startCursorBundle() {
if (source_name) (*oscPacket) << osc::BeginMessage( "/tuio/2Dcur") << "source" << source_name << osc::EndMessage;
(*oscPacket) << osc::BeginMessage( "/tuio/2Dcur") << "alive";
for (std::list::iterator tuioCursor = cursorList.begin(); tuioCursor!=cursorList.end(); tuioCursor++) {
- (*oscPacket) << (int32)((*tuioCursor)->getSessionID());
+ if ((*tuioCursor)->getTuioState()!=TUIO_ADDED) (*oscPacket) << (int32)((*tuioCursor)->getSessionID());
}
(*oscPacket) << osc::EndMessage;
}
void TuioServer::addCursorMessage(TuioCursor *tcur) {
+
+ if (tcur->getTuioState()==TUIO_ADDED) return;
float xpos = tcur->getX();
float xvel = tcur->getXSpeed();
@@ -405,13 +407,15 @@ void TuioServer::startBlobBundle() {
if (source_name) (*oscPacket) << osc::BeginMessage( "/tuio/2Dblb") << "source" << source_name << osc::EndMessage;
(*oscPacket) << osc::BeginMessage( "/tuio/2Dblb") << "alive";
for (std::list::iterator tuioBlob = blobList.begin(); tuioBlob!=blobList.end(); tuioBlob++) {
- (*oscPacket) << (int32)((*tuioBlob)->getSessionID());
+ if ((*tuioBlob)->getTuioState()!=TUIO_ADDED) (*oscPacket) << (int32)((*tuioBlob)->getSessionID());
}
(*oscPacket) << osc::EndMessage;
}
void TuioServer::addBlobMessage(TuioBlob *tblb) {
+ if (tblb->getTuioState()==TUIO_ADDED) return;
+
float xpos = tblb->getX();
float xvel = tblb->getXSpeed();
if (invert_x) {
diff --git a/TUIO/TuioServer.h b/TUIO/TuioServer.h
index 5fc5a73..66ad0a5 100644
--- a/TUIO/TuioServer.h
+++ b/TUIO/TuioServer.h
@@ -1,29 +1,29 @@
/*
- TUIO Server Component - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (C) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TuioServer_H
#define INCLUDED_TuioServer_H
#include "TuioManager.h"
#include "UdpSender.h"
+#include "TcpSender.h"
+#include "WebSockSender.h"
+#include "FlashSender.h"
#include
#include
#include
@@ -66,7 +66,7 @@ namespace TUIO {
*
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioServer : public TuioManager {
@@ -172,9 +172,21 @@ namespace TUIO {
/**
* Defines the name of this TUIO source, which is transmitted within the /tuio/[profile] source message.
*
- * @param src the desired name of this TUIO source
+ * @param name the desired name of this TUIO source
*/
- void setSourceName(const char *src);
+ void setSourceName(const char *name);
+
+
+ /**
+ * Defines the name and IP address of this TUIO source, which is transmitted within the /tuio/[profile] source message.
+ *
+ * @param name the desired name of this TUIO source
+ * @param ip the local IP address
+ */
+ void setSourceName(const char *name, const char *ip);
+
+
+
void addOscSender(OscSender *sender);
void enableObjectProfile(bool flag) { objectProfileEnabled = flag; };
@@ -183,10 +195,7 @@ namespace TUIO {
private:
- void initialize();
-
- OscSender *primary_sender;
- bool local_sender;
+ void initialize(OscSender *oscsend);
std::vector senderList;
void deliverOscPacket(osc::OutboundPacketStream *packet);
diff --git a/TUIO/TuioTime.cpp b/TUIO/TuioTime.cpp
index 09f5941..f169c14 100644
--- a/TUIO/TuioTime.cpp
+++ b/TUIO/TuioTime.cpp
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "TuioTime.h"
using namespace TUIO;
diff --git a/TUIO/TuioTime.h b/TUIO/TuioTime.h
index b9cc3f9..567c443 100644
--- a/TUIO/TuioTime.h
+++ b/TUIO/TuioTime.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_TUIOTIME_H
#define INCLUDED_TUIOTIME_H
@@ -46,7 +43,7 @@ namespace TUIO {
* The class also provides various addtional convience method, which allow some simple time arithmetics.
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL TuioTime {
diff --git a/TUIO/UdpReceiver.cpp b/TUIO/UdpReceiver.cpp
deleted file mode 100644
index bbd7460..0000000
--- a/TUIO/UdpReceiver.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2009 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "UdpReceiver.h"
-
-using namespace TUIO;
-using namespace osc;
-
-#ifndef WIN32
-static void* ClientThreadFunc( void* obj )
-#else
-static DWORD WINAPI ClientThreadFunc( LPVOID obj )
-#endif
-{
- static_cast(obj)->socket->Run();
- return 0;
-};
-
-UdpReceiver::UdpReceiver(int port)
-: socket (NULL)
-, thread (NULL)
-, locked (false)
-{
- try {
- socket = new UdpListeningReceiveSocket(IpEndpointName( IpEndpointName::ANY_ADDRESS, port ), this );
- } catch (std::exception &e) {
- std::cerr << "could not bind to UDP port " << port << std::endl;
- socket = NULL;
- }
-
- if (socket!=NULL) {
- if (!socket->IsBound()) {
- delete socket;
- socket = NULL;
- } else std::cout << "listening to TUIO messages on UDP port " << port << std::endl;
- }
-}
-
-UdpReceiver::~UdpReceiver() {
- delete socket;
-}
-
-void UdpReceiver::connect(bool lk) {
-
- if (connected) return;
- if (socket==NULL) return;
-
- locked = lk;
- if (!locked) {
-#ifndef WIN32
- pthread_create(&thread , NULL, ClientThreadFunc, this);
-#else
- DWORD threadId;
- thread = CreateThread( 0, 0, ClientThreadFunc, this, 0, &threadId );
-#endif
- } else socket->Run();
-
- connected = true;
-}
-
-void UdpReceiver::disconnect() {
-
- if (!connected) return;
- if (socket==NULL) {
- connected = false;
- return;
- }
- socket->Break();
-
- if (!locked) {
-#ifdef WIN32
- if( thread ) CloseHandle( thread );
-#endif
- thread = 0;
- locked = false;
- }
-
- connected = false;
-}
-
-
diff --git a/TUIO/UdpReceiver.h b/TUIO/UdpReceiver.h
deleted file mode 100644
index 4f0da51..0000000
--- a/TUIO/UdpReceiver.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2009 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef INCLUDED_UDPRECEIVER_H
-#define INCLUDED_UDPRECEIVER_H
-
-#include "OscReceiver.h"
-#include "ip/UdpSocket.h"
-
-namespace TUIO {
-
- /**
- * The UdpReceiver provides the OscReceiver finctionality for the UDP transport method
- *
- * @author Martin Kaltenbrunner
- * @version 1.5
- */
- class LIBDECL UdpReceiver: public OscReceiver {
-
- public:
-
- /**
- * The UDP socket is only public to be accessible from the thread function
- */
- UdpListeningReceiveSocket *socket;
-
- /**
- * This constructor creates a UdpReceiver instance listening to the provided UDP port
- *
- * @param port the number of the UDP port to listen to, defaults to 3333
- */
- UdpReceiver (int port=3333);
-
- /**
- * The destructor is doing nothing in particular.
- */
- virtual ~UdpReceiver();
-
- /**
- * The UdpReceiver connects and starts receiving TUIO messages via UDP
- *
- * @param lock running in the background if set to false (default)
- */
- void connect(bool lock=false);
-
- /**
- * The UdpReceiver disconnects and stops receiving TUIO messages via UDP
- */
- void disconnect();
-
- private:
-
-#ifndef WIN32
- pthread_t thread;
-#else
- HANDLE thread;
-#endif
-
- bool locked;
- };
-};
-#endif /* INCLUDED_UDPRECEIVER_H */
diff --git a/TUIO/UdpSender.cpp b/TUIO/UdpSender.cpp
index d1b3e88..c4f8c10 100644
--- a/TUIO/UdpSender.cpp
+++ b/TUIO/UdpSender.cpp
@@ -1,24 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#include "UdpSender.h"
@@ -30,9 +26,11 @@ UdpSender::UdpSender() {
long unsigned int ip = GetHostByName("localhost");
socket = new UdpTransmitSocket(IpEndpointName(ip, 3333));
buffer_size = MAX_UDP_SIZE;
+ std::cout << "TUIO/UDP messages to " << "127.0.0.1@3333" << std::endl;
} catch (std::exception &e) {
std::cout << "could not create UDP socket" << std::endl;
socket = NULL;
+ throw std::exception();
}
}
@@ -47,9 +45,11 @@ UdpSender::UdpSender(const char *host, int port) {
}
long unsigned int ip = GetHostByName(host);
socket = new UdpTransmitSocket(IpEndpointName(ip, port));
+ std::cout << "TUIO/UDP messages to " << host << "@" << port << std::endl;
} catch (std::exception &e) {
std::cout << "could not create UDP socket" << std::endl;
socket = NULL;
+ throw std::exception();
}
}
@@ -62,9 +62,11 @@ UdpSender::UdpSender(const char *host, int port, int size) {
socket = new UdpTransmitSocket(IpEndpointName(ip, port));
if (buffer_size>MAX_UDP_SIZE) buffer_size = MAX_UDP_SIZE;
else if (buffer_sizeSize() > buffer_size ) return false;
+ if ( bundle->Size() == 0 ) return false;
+
socket->Send( bundle->Data(), bundle->Size() );
return true;
}
diff --git a/TUIO/UdpSender.h b/TUIO/UdpSender.h
index 88bcb42..357f0f7 100644
--- a/TUIO/UdpSender.h
+++ b/TUIO/UdpSender.h
@@ -1,23 +1,20 @@
/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
+ TUIO C++ Library
+ Copyright (c) 2005-2016 Martin Kaltenbrunner
- Copyright (c) 2005-2009 Martin Kaltenbrunner
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
- 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
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
#ifndef INCLUDED_UDPSENDER_H
#define INCLUDED_UDPSENDER_H
@@ -35,7 +32,7 @@ namespace TUIO {
* The UdpSender implements the UDP transport method for OSC
*
* @author Martin Kaltenbrunner
- * @version 1.5
+ * @version 1.1.6
*/
class LIBDECL UdpSender : public OscSender {
@@ -69,7 +66,7 @@ namespace TUIO {
/**
* The destructor closes the socket.
*/
- ~UdpSender();
+ virtual ~UdpSender();
/**
* This method delivers the provided OSC data
@@ -87,6 +84,8 @@ namespace TUIO {
*/
bool isConnected ();
+ const char* tuio_type() { return "TUIO/UDP"; }
+
private:
UdpTransmitSocket *socket;
};
diff --git a/TUIO/WebSockSender.h b/TUIO/WebSockSender.h
new file mode 100644
index 0000000..66c8589
--- /dev/null
+++ b/TUIO/WebSockSender.h
@@ -0,0 +1,121 @@
+/*
+ TUIO C++ Library
+ Copyright (c) 2009-2016 Martin Kaltenbrunner
+ WebSockSender (c) 2015 Florian Echtler
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+*/
+
+#ifndef INCLUDED_WEBSOCKSENDER_H
+#define INCLUDED_WEBSOCKSENDER_H
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#include
+#include
+#define snprintf c99_snprintf
+#define vsnprintf c99_vsnprintf
+
+__inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
+{
+ int count = -1;
+
+ if (size != 0)
+ count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
+ if (count == -1)
+ count = _vscprintf(format, ap);
+
+ return count;
+}
+
+__inline int c99_snprintf(char *outBuf, size_t size, const char *format, ...)
+{
+ int count;
+ va_list ap;
+
+ va_start(ap, format);
+ count = c99_vsnprintf(outBuf, size, format, ap);
+ va_end(ap);
+
+ return count;
+}
+
+#endif
+
+
+/* All of these macros assume use on a 32-bit variable.
+ Additionally, SWAP assumes we're little-endian. */
+#define SWAP(a) ((((a) >> 24) & 0x000000ff) | (((a) >> 8) & 0x0000ff00) | \
+(((a) << 8) & 0x00ff0000) | (((a) << 24) & 0xff000000))
+#define ROL(a, b) (((a) << (b)) | ((a) >> (32 - (b))))
+#define ROR(a, b) ROL((a), (32 - (b)))
+#define SHA1_HASH_SIZE (160/8)
+
+#include "TcpSender.h"
+#include
+#include
+#include
+#include
+
+namespace TUIO {
+
+ /**
+ * The WebSockSender implements the WebSocket transport method for OSC
+ *
+ * @author Florian Echtler
+ * @version 2.0.a0
+ */
+ class LIBDECL WebSockSender : public TcpSender {
+
+ public:
+
+ /**
+ * The default constructor creates a WebSockSender that listens to the default HTTP-alt port 8080 on localhost
+ */
+ WebSockSender();
+
+ /**
+ * This constructor creates a WebSockSender that listens to the provided port
+ *
+ * @param port the listening WebSocket port number
+ */
+ WebSockSender(int port);
+
+ /**
+ * The destructor closes the socket.
+ */
+ virtual ~WebSockSender() {}
+
+ /**
+ * This method delivers the provided OSC data
+ *
+ * @param *bundle the OSC stream to deliver
+ * @return true if the data was delivered successfully
+ */
+ bool sendOscPacket (osc::OutboundPacketStream *bundle);
+
+ /**
+ * This method is called whenever a new client connects
+ *
+ * @param tcp_client the socket handle of the new client
+ */
+ void newClient( int tcp_client );
+
+ const char* tuio_type() { return "TUIO/WEB"; }
+ private:
+
+ void sha1( uint8_t digest[SHA1_HASH_SIZE], const uint8_t* inbuf, size_t length );
+ std::string base64( uint8_t* buffer, size_t size );
+ };
+}
+#endif /* INCLUDED_WEBSOCKSENDER_H */
diff --git a/TongsengApp/English.lproj/InfoPlist.strings b/TongsengApp/English.lproj/InfoPlist.strings
deleted file mode 100644
index 5e45963..0000000
Binary files a/TongsengApp/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/TongsengApp/English.lproj/MainMenu.xib b/TongsengApp/English.lproj/MainMenu.xib
index 08bd409..2b292b6 100644
--- a/TongsengApp/English.lproj/MainMenu.xib
+++ b/TongsengApp/English.lproj/MainMenu.xib
@@ -1,849 +1,170 @@
-
-
-
- 1050
- 9L30
- 677
- 949.54
- 353.00
-
-
-
-
-
-
- 0
- ../TongsengApp.xcodeproj
- 3
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TongsengApp/Info.plist b/TongsengApp/Info.plist
index ce57a49..f5fa2ee 100644
--- a/TongsengApp/Info.plist
+++ b/TongsengApp/Info.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
${EXECUTABLE_NAME}
CFBundleIconFile
-
+ TUIO
CFBundleIdentifier
id.web.fajran.${PRODUCT_NAME:identifier}
CFBundleInfoDictionaryVersion
@@ -19,7 +19,7 @@
CFBundleSignature
????
CFBundleVersion
- 0.4
+ 0.5
NSMainNibFile
MainMenu
NSPrincipalClass
diff --git a/TongsengApp/TUIO.icns b/TongsengApp/TUIO.icns
new file mode 100644
index 0000000..b1a9064
Binary files /dev/null and b/TongsengApp/TUIO.icns differ
diff --git a/TongsengApp/TongsengApp.xcodeproj/TemplateIcon.icns b/TongsengApp/TongsengApp.xcodeproj/TemplateIcon.icns
deleted file mode 100644
index 62cb701..0000000
Binary files a/TongsengApp/TongsengApp.xcodeproj/TemplateIcon.icns and /dev/null differ
diff --git a/TongsengApp/TongsengApp.xcodeproj/project.pbxproj b/TongsengApp/TongsengApp.xcodeproj/project.pbxproj
index d650e70..69d7c33 100644
--- a/TongsengApp/TongsengApp.xcodeproj/project.pbxproj
+++ b/TongsengApp/TongsengApp.xcodeproj/project.pbxproj
@@ -3,16 +3,14 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
- 3F45D5AA10A0FEEB00139241 /* TuioBlob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F45D5A410A0FEEB00139241 /* TuioBlob.cpp */; };
3F45D5AB10A0FEEB00139241 /* TuioContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F45D5A510A0FEEB00139241 /* TuioContainer.cpp */; };
3F45D5AC10A0FEEB00139241 /* TuioCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F45D5A610A0FEEB00139241 /* TuioCursor.cpp */; };
3F45D5AD10A0FEEB00139241 /* TuioDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F45D5A710A0FEEB00139241 /* TuioDispatcher.cpp */; };
- 3F45D5AE10A0FEEB00139241 /* TuioObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F45D5A810A0FEEB00139241 /* TuioObject.cpp */; };
3F45D5AF10A0FEEB00139241 /* TuioPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F45D5A910A0FEEB00139241 /* TuioPoint.cpp */; };
3F6CB36A10374F0C00CFF31E /* tongseng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F6CB36810374F0C00CFF31E /* tongseng.cpp */; };
3F6CB3C010374FB900CFF31E /* NetworkingUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F6CB39010374FB900CFF31E /* NetworkingUtils.cpp */; };
@@ -25,29 +23,26 @@
3F6CB43A10375A6000CFF31E /* TongsengController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F6CB43810375A6000CFF31E /* TongsengController.m */; };
3FAF0802103963CD006DF045 /* TuioManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FAF0800103963CD006DF045 /* TuioManager.cpp */; };
3FAF0803103963CD006DF045 /* UdpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FAF0801103963CD006DF045 /* UdpSender.cpp */; };
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+ B26C5F031D12EDF500354F09 /* OneEuroFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26C5F021D12EDF500354F09 /* OneEuroFilter.cpp */; };
+ B26C5F051D12EF5300354F09 /* TuioObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26C5F041D12EF5300354F09 /* TuioObject.cpp */; };
+ B26C5F071D12EF5A00354F09 /* TuioBlob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26C5F061D12EF5A00354F09 /* TuioBlob.cpp */; };
+ B26C5F091D12F2E000354F09 /* TUIO.icns in Resources */ = {isa = PBXBuildFile; fileRef = B26C5F081D12F2E000354F09 /* TUIO.icns */; };
+ B2A01DF71D1C1D5900EF381B /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2A01DF61D1C1D5900EF381B /* CoreFoundation.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
- 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; };
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; };
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; };
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; };
- 32CA4F630368D1EE00C91783 /* TongsengApp_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TongsengApp_Prefix.pch; sourceTree = ""; };
- 3F45D5A410A0FEEB00139241 /* TuioBlob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioBlob.cpp; sourceTree = ""; };
3F45D5A510A0FEEB00139241 /* TuioContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioContainer.cpp; sourceTree = ""; };
3F45D5A610A0FEEB00139241 /* TuioCursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioCursor.cpp; sourceTree = ""; };
3F45D5A710A0FEEB00139241 /* TuioDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioDispatcher.cpp; sourceTree = ""; };
- 3F45D5A810A0FEEB00139241 /* TuioObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioObject.cpp; sourceTree = ""; };
3F45D5A910A0FEEB00139241 /* TuioPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioPoint.cpp; sourceTree = ""; };
- 3F6CB36810374F0C00CFF31E /* tongseng.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tongseng.cpp; path = ../tongseng.cpp; sourceTree = SOURCE_ROOT; };
+ 3F6CB36810374F0C00CFF31E /* tongseng.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = tongseng.cpp; path = ../tongseng.cpp; sourceTree = SOURCE_ROOT; };
3F6CB36910374F0C00CFF31E /* tongseng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tongseng.h; path = ../tongseng.h; sourceTree = SOURCE_ROOT; };
- 3F6CB36B10374F1600CFF31E /* mt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mt.h; path = ../mt.h; sourceTree = SOURCE_ROOT; };
+ 3F6CB36B10374F1600CFF31E /* multitouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = multitouch.h; path = ../multitouch.h; sourceTree = SOURCE_ROOT; };
3F6CB39010374FB900CFF31E /* NetworkingUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkingUtils.cpp; sourceTree = ""; };
3F6CB39210374FB900CFF31E /* UdpSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UdpSocket.cpp; sourceTree = ""; };
3F6CB39E10374FB900CFF31E /* OscOutboundPacketStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OscOutboundPacketStream.cpp; sourceTree = ""; };
@@ -61,6 +56,11 @@
3FAF0801103963CD006DF045 /* UdpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UdpSender.cpp; sourceTree = ""; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
8D1107320486CEB800E47090 /* Tongseng.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tongseng.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ B26C5F021D12EDF500354F09 /* OneEuroFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OneEuroFilter.cpp; sourceTree = ""; };
+ B26C5F041D12EF5300354F09 /* TuioObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioObject.cpp; sourceTree = ""; };
+ B26C5F061D12EF5A00354F09 /* TuioBlob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuioBlob.cpp; sourceTree = ""; };
+ B26C5F081D12F2E000354F09 /* TUIO.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TUIO.icns; sourceTree = ""; };
+ B2A01DF61D1C1D5900EF381B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -70,6 +70,7 @@
files = (
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
3F6CB41F103754BC00CFF31E /* MultitouchSupport.framework in Frameworks */,
+ B2A01DF71D1C1D5900EF381B /* CoreFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -88,22 +89,13 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
+ B2A01DF61D1C1D5900EF381B /* CoreFoundation.framework */,
+ 3F6CB41E103754BC00CFF31E /* MultitouchSupport.framework */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
);
name = "Linked Frameworks";
sourceTree = "