mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 08:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Include posix files in lubTUIO if its built on a UNIX unit. Small cleanup in touchmodule

Browse Source
This commit is contained in:
Jonathan Bosson
2017-03-07 10:24:07 -07:00
parent 4a2d70b88d
commit 436da23cd2
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/ext/libTUIO/CMakeLists.txt
+26 -18
View File
@@ -2,7 +2,7 @@
# #
# OpenSpace #
# #
# Copyright (c) 2014-2016 #
# Copyright (c) 2014-2017 #
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy of this #
# software and associated documentation files (the "Software"), to deal in the Software #
@@ -25,43 +25,51 @@
project(libTUIO)
message(STATUS "Generating libTUIO project")
add_library(libTUIO
set(TUIO_SOURCE
${PROJECT_SOURCE_DIR}/TUIO/WebSockSender.cpp
${PROJECT_SOURCE_DIR}/TUIO/UdpSender.cpp
${PROJECT_SOURCE_DIR}/TUIO/UdpReceiver.cpp
#${PROJECT_SOURCE_DIR}/TUIO2/TuioToken.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioTime.cpp
#${PROJECT_SOURCE_DIR}/TUIO2/TuioSymbol.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioServer.cpp
#${PROJECT_SOURCE_DIR}/TUIO2/TuioPointer.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioPoint.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioObject.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioManager.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioDispatcher.cpp
#${PROJECT_SOURCE_DIR}/TUIO2/TuioComponent.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioCursor.cpp #
${PROJECT_SOURCE_DIR}/TUIO/TuioContainer.cpp #
${PROJECT_SOURCE_DIR}/TUIO/TuioCursor.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioContainer.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioClient.cpp
#${PROJECT_SOURCE_DIR}/TUIO2/TuioBounds.cpp
${PROJECT_SOURCE_DIR}/TUIO/TuioBlob.cpp #
${PROJECT_SOURCE_DIR}/TUIO/TuioBlob.cpp
${PROJECT_SOURCE_DIR}/TUIO/TcpSender.cpp
${PROJECT_SOURCE_DIR}/TUIO/TcpReceiver.cpp
${PROJECT_SOURCE_DIR}/TUIO/OscReceiver.cpp
${PROJECT_SOURCE_DIR}/TUIO/OneEuroFilter.cpp #
${PROJECT_SOURCE_DIR}/TUIO/OneEuroFilter.cpp
${PROJECT_SOURCE_DIR}/TUIO/FlashSender.cpp
${PROJECT_SOURCE_DIR}/oscpack/ip/IpEndpointName.cpp
#if (WIN32)
${PROJECT_SOURCE_DIR}/oscpack/ip/win32/NetworkingUtils.cpp
${PROJECT_SOURCE_DIR}/oscpack/ip/win32/UdpSocket.cpp
#else (WIN32)
#${PROJECT_SOURCE_DIR}/oscpack/ip/posix/NetworkingUtils.cpp
#${PROJECT_SOURCE_DIR}/oscpack/ip/posix/UdpSocket.cpp
#endif ()
${PROJECT_SOURCE_DIR}/oscpack/osc/OscTypes.cpp
${PROJECT_SOURCE_DIR}/oscpack/osc/OscReceivedElements.cpp
${PROJECT_SOURCE_DIR}/oscpack/osc/OscPrintReceivedElements.cpp
${PROJECT_SOURCE_DIR}/oscpack/osc/OscOutboundPacketStream.cpp
)
if (WIN32)
set(TUIO_SOURCE
${TUIO_SOURCE}
${PROJECT_SOURCE_DIR}/oscpack/ip/win32/NetworkingUtils.cpp
${PROJECT_SOURCE_DIR}/oscpack/ip/win32/UdpSocket.cpp
)
endif ()
if (UNIX)
set(TUIO_SOURCE
${TUIO_SOURCE}
${PROJECT_SOURCE_DIR}/oscpack/ip/posix/NetworkingUtils.cpp
${PROJECT_SOURCE_DIR}/oscpack/ip/posix/UdpSocket.cpp
)
endif ()
add_library(libTUIO
${TUIO_SOURCE}
)
target_include_directories(libTUIO PUBLIC ${PROJECT_SOURCE_DIR})
modules/touch/touchmodule.cpp
+6 -8
View File
@@ -69,16 +69,14 @@ bool TouchModule::gotNewInput() {
return point.first == c.getSessionID();
}
) == list.end(); }),
lastProcessed.end()
);
lastProcessed.end());
// Return true if we got new input
if (list.size() == lastProcessed.size() && list.size() > 0) {
for (Point& p : lastProcessed) {
std::vector<TuioCursor>::iterator foundID = find_if(list.begin(), list.end(), [&p](const TuioCursor& c) { return c.getSessionID() == p.first; });
if (p.second.getTuioTime() == foundID->getPath().back().getTuioTime())
for_each(lastProcessed.begin(), lastProcessed.end(), [this](Point& p) {
if (p.second.getTuioTime() == find_if(list.begin(), list.end(), [&p](const TuioCursor& c) { return c.getSessionID() == p.first; })->getPath().back().getTuioTime())
return false;
}
});
return true;
}
else
@@ -105,10 +103,10 @@ TouchModule::TouchModule()
}
);
OsEng.registerModuleCallback( // maybe call ear->clearInput() here rather than postdraw
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::PreSync,
[&]() {
if (gotNewInput()) {
if (gotNewInput() && OsEng.windowWrapper().isMaster()) {
//std::this_thread::sleep_for(std::chrono::seconds(1));
Camera* cam = OsEng.interactionHandler().camera();