Feature/touch web gui support (#798)

* Added touch support for web GUI

* Code cleanup after master merge, no functionality changes

* Fixed alignment of function arguments
This commit is contained in:
Gene Payne
2019-02-21 07:35:47 -07:00
committed by GitHub
parent 21fd957f28
commit c44290fe1f
10 changed files with 124 additions and 10 deletions

View File

@@ -42,6 +42,10 @@ namespace openspace {
* Returns true if new touch input occured since the last frame
*/
bool hasNewInput();
/**
* Checks if touchevent should be parsed to the webgui
*/
void hasNewWebInput(const std::vector<TUIO::TuioCursor>& listOfContactPoints);
TuioEar ear;
TouchInteraction touch;
@@ -49,6 +53,7 @@ namespace openspace {
std::vector<TUIO::TuioCursor> listOfContactPoints;
// contains an id and the TuioPoint that was processed last frame
std::vector<Point> lastProcessed;
glm::ivec2 webPositionCallback = glm::ivec2(0,0);
};
} // namespace openspace