mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 07:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add strict test for whitespace at end of line

Browse Source 
More work on coding style
This commit is contained in:
Alexander Bock
2017-11-09 23:47:51 -05:00
parent 7b12a241ed
commit afa1d6d33e
223 changed files with 1402 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/touchmodule.cpp
+27 -11
View File
@@ -46,7 +46,8 @@ bool TouchModule::hasNewInput() {
// Get new input from listener
listOfContactPoints = ear.getInput();
ear.clearInput();
touch.touchActive(!listOfContactPoints.empty()); // Set touch property to active (to void mouse input, mainly for mtdev bridges)
// Set touch property to active (to void mouse input, mainly for mtdev bridges)
touch.touchActive(!listOfContactPoints.empty());
// Erase old input id's that no longer exists
lastProcessed.erase(
@@ -73,14 +74,25 @@ bool TouchModule::hasNewInput() {
}
// Return true if we got new input
if (listOfContactPoints.size() == lastProcessed.size() && !listOfContactPoints.empty()) {
if (listOfContactPoints.size() == lastProcessed.size() &&
!listOfContactPoints.empty())
{
bool newInput = true;
// go through list and check if the last registrered time is newer than the one in lastProcessed (last frame)
std::for_each(lastProcessed.begin(), lastProcessed.end(), [this, &newInput](Point& p) {
std::vector<TuioCursor>::iterator cursor = std::find_if(listOfContactPoints.begin(), listOfContactPoints.end(),
[&p](const TuioCursor& c) { return c.getSessionID() == p.first; });
// go through list and check if the last registrered time is newer than the one in
// lastProcessed (last frame)
std::for_each(
lastProcessed.begin(),
lastProcessed.end(),
[this, &newInput](Point& p) {
std::vector<TuioCursor>::iterator cursor = std::find_if(
listOfContactPoints.begin(),
listOfContactPoints.end(),
[&p](const TuioCursor& c) { return c.getSessionID() == p.first; }
);
double now = cursor->getPath().back().getTuioTime().getTotalMilliseconds();
if (!cursor->isMoving()) { // if current cursor isn't moving, we want to interpret that as new input for interaction purposes
if (!cursor->isMoving()) {
// if current cursor isn't moving, we want to interpret that as new input
// for interaction purposes
newInput = true;
}
else if (p.second.getTuioTime().getTotalMilliseconds() == now) {
@@ -134,16 +146,20 @@ TouchModule::TouchModule()
for (const TuioCursor& c : listOfContactPoints) {
lastProcessed.emplace_back(c.getSessionID(), c.getPath().back());
}
touch.unitTest(); // used to save data from solver, only calculated for one frame when user chooses in GUI
touch.step(OsEng.windowWrapper().deltaTime()); // calculate the new camera state for this frame
// used to save data from solver, only calculated for one frame when user chooses
// in GUI
touch.unitTest();
// calculate the new camera state for this frame
touch.step(OsEng.windowWrapper().deltaTime());
}
);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::Render,
[&]() {
markers.render(listOfContactPoints); // render markers, customizable through the GUI
}
// render markers, customizable through the GUI
markers.render(listOfContactPoints);
}
);
}