mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into touch-user-study

Browse Source 
# Conflicts:
#	modules/touch/include/touchmarker.h
#	modules/touch/src/touchinteraction.cpp
#	modules/touch/src/touchmarker.cpp
This commit is contained in:
Alexander Bock
2017-11-09 10:30:45 -05:00
parent 16efa28470 ca7053d8f2
commit fc048cd455
405 changed files with 3092 additions and 2579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/touch/include/touchinteraction.h
View File

@@ -47,7 +47,7 @@ class SceneGraphNode;
class TouchInteraction : public properties::PropertyOwner {
public:
using Point = std::pair<int, TUIO::TuioPoint>;
TouchInteraction();
// for interpretInteraction()

4
modules/touch/include/touchmarker.h
View File

@@ -54,7 +54,6 @@ class TouchMarker : public properties::PropertyOwner {
void render(const std::vector<TUIO::TuioCursor>& list);
private:
void createVertexList(const std::vector<TUIO::TuioCursor>& list);
@@ -65,8 +64,9 @@ class TouchMarker : public properties::PropertyOwner {
properties::Vec3Property _color;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
std::vector<GLfloat> _vertexData;
GLuint _quad;
GLuint _vertexPositionBuffer;
};

7
modules/touch/include/tuioear.h
View File

@@ -49,7 +49,6 @@
class TuioEar : public TUIO::TuioListener {
public:
TuioEar();
~TuioEar() {
@@ -57,7 +56,7 @@ class TuioEar : public TUIO::TuioListener {
delete _tuioClient;
delete _oscReceiver;
}
/**
* Callback functions, listens to the TUIO server
*/
@@ -94,7 +93,7 @@ class TuioEar : public TUIO::TuioListener {
* Clears the input list, function called after getInput() each frame
*/
void clearInput();
private:
bool _tap = false;
TUIO::TuioCursor _tapCo = TUIO::TuioCursor(-1, -1, -1.0f, -1.0f);
@@ -103,14 +102,12 @@ class TuioEar : public TUIO::TuioListener {
TUIO::TuioClient *_tuioClient;
TUIO::OscReceiver *_oscReceiver;
std::vector<TUIO::TuioCursor> _list;
/**
* A list that tracks all of the cursor ID's that got removed since last frame
*/
std::vector<int> _removeList;
};
#endif // __OPENSPACE_MODULE_TOUCH___TUIO_EAR___H__