--- a/front_idill/extern/fajran-npTuioClient/src/client.h Thu Apr 12 13:09:46 2012 +0200
+++ b/front_idill/extern/fajran-npTuioClient/src/client.h Thu Apr 12 15:33:25 2012 +0200
@@ -15,36 +15,40 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
+/*
+ Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
+*/
+
#ifndef CLIENT_H_
#define CLIENT_H_
#include <string>
enum TuioEvent {
- TE_OBJECT_ADD = 0,
- TE_OBJECT_UPDATE = 1,
- TE_OBJECT_REMOVE = 2,
- TE_CURSOR_ADD = 3,
- TE_CURSOR_UPDATE = 4,
- TE_CURSOR_REMOVE = 5,
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- TE_STRING_ADD = 6,
- TE_STRING_UPDATE = 7,
- TE_STRING_REMOVE = 8,
+ TE_OBJECT_ADD = 0,
+ TE_OBJECT_UPDATE = 1,
+ TE_OBJECT_REMOVE = 2,
+ TE_CURSOR_ADD = 3,
+ TE_CURSOR_UPDATE = 4,
+ TE_CURSOR_REMOVE = 5,
+ /*
+ * Ajouté par alexandre.bastien@iri.centrepompidou.fr
+ */
+ TE_STRING_ADD = 6,
+ TE_STRING_UPDATE = 7,
+ TE_STRING_REMOVE = 8,
};
typedef struct {
- TuioEvent type;
- long fid;
- int sid;
- float x;
- float y;
- float z;
- float a;
- //Ajouté par alexandre.bastien@iri.centrepompidou.fr
- const char* code;
+ TuioEvent type;
+ long fid;
+ int sid;
+ float x;
+ float y;
+ float z;
+ float a;
+ //Ajouté par alexandre.bastien@iri.centrepompidou.fr
+ const char* code;
} TuioEventData;
/*void tuio_start(int);
@@ -52,11 +56,11 @@
extern void tuio_callback(TuioEventData);
-extern "C"
-{
-__declspec(dllexport) void tuio_start(int);
-__declspec(dllexport) void tuio_stop(void);
-__declspec(dllexport) void t(void);
+extern "C"
+{
+__declspec(dllexport) void tuio_start(int);
+__declspec(dllexport) void tuio_stop(void);
+__declspec(dllexport) void t(void);
}
#endif