Files
OpenSpace/modules/touch/touchmodule.cpp
Kalle Bladin 2e4f31ded8 Interaction Updates (#353)
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
2017-07-14 17:17:17 +02:00

151 lines
6.3 KiB
C++

/*****************************************************************************************
* *
* OpenSpace *
* *
* 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 *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/touch/touchmodule.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/settingsengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/interaction/navigationhandler.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <ghoul/logging/logmanager.h>
#include <glm/ext.hpp>
#include <sstream>
#include <string>
#include <iostream>
using namespace TUIO;
namespace openspace {
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)
// Erase old input id's that no longer exists
lastProcessed.erase(
std::remove_if(
lastProcessed.begin(),
lastProcessed.end(),
[this](const Point& point) {
return std::find_if(
listOfContactPoints.begin(),
listOfContactPoints.end(),
[&point](const TuioCursor& c) {
return point.first == c.getSessionID();
}
) == listOfContactPoints.end(); }),
lastProcessed.end());
// if tap occured, we have new input
if (listOfContactPoints.empty() && lastProcessed.empty() && ear.tap()) {
TuioCursor c = ear.getTap();
listOfContactPoints.push_back(c);
lastProcessed.emplace_back(c.getSessionID(), c.getPath().back());
touch.tap();
return true;
}
// Return true if we got new input
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; });
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
newInput = true;
}
else if (p.second.getTuioTime().getTotalMilliseconds() == now) {
newInput = false;
}
});
return newInput;
}
else {
return false;
}
}
TouchModule::TouchModule()
: OpenSpaceModule("Touch")
{
addPropertySubOwner(touch);
addPropertySubOwner(markers);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::InitializeGL,
[&]() {
LDEBUGC("TouchModule", "Initializing TouchMarker OpenGL");
markers.initialize();
}
);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::DeinitializeGL,
[&]() {
LDEBUGC("TouchMarker", "Deinitialize TouchMarker OpenGL");
markers.deinitialize();
}
);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::PreSync,
[&]() {
touch.setCamera(OsEng.navigationHandler().camera());
touch.setFocusNode(OsEng.navigationHandler().focusNode());
if (hasNewInput() && OsEng.windowWrapper().isMaster()) {
touch.updateStateFromInput(listOfContactPoints, lastProcessed);
}
else if (listOfContactPoints.empty()) {
touch.resetAfterInput();
}
// update lastProcessed
lastProcessed.clear();
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
}
);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::Render,
[&]() {
markers.render(listOfContactPoints); // render markers, customizable through the GUI
}
);
}
} // namespace openspace