mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

isMaster no longer exists

Browse Source
This commit is contained in:
Jonathan Bosson
2017-03-02 15:57:36 -07:00
parent 4b8111439c
commit dbc5f806f4
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/touch/src/TuioEar.cpp
View File

@@ -130,7 +130,7 @@ void TuioEar::clearInput() {
return std::find_if(
_removeList.begin(),
_removeList.end(),
[&cursor](int id) {\
[&cursor](int id) {
return cursor.getSessionID() == id;
}
) != _removeList.end();

15
modules/touch/touchmodule.cpp
View File

@@ -108,7 +108,7 @@ TouchModule::TouchModule()
OsEng.registerModuleCallback( // maybe call ear->clearInput() here rather than postdraw
OpenSpaceEngine::CallbackOption::PreSync,
[&]() {
if (OsEng.isMaster() && gotNewInput()) {
if (gotNewInput()) {
//std::this_thread::sleep_for(std::chrono::seconds(1));
Camera* cam = OsEng.interactionHandler().camera();
@@ -124,9 +124,6 @@ TouchModule::TouchModule()
centroid.x = std::accumulate(list.begin(), list.end(), 0.0f, [](float x, const TuioCursor& c) { return x + c.getX(); }) / list.size();
centroid.y = std::accumulate(list.begin(), list.end(), 0.0f, [](float y, const TuioCursor& c) { return y + c.getY(); }) / list.size();
// ------- testing, should use more than just one point later on
distance = std::accumulate(list.begin(), list.end(), 0.0f, [&centroid](float d, const TuioCursor& c) {
return d + sqrt(pow(c.getX() - centroid.x, 2) + pow(c.getY() - centroid.y, 2));
@@ -184,16 +181,6 @@ TouchModule::TouchModule()
}
}
);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::PostDraw,
[&]() {
WindowWrapper& wrapper = OsEng.windowWrapper();
if (OsEng.isMaster() && wrapper.isRegularRendering()) {
}
}
);
}