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

Cleanup of TouchInteraction, selected can now only have one node per id

Browse Source
This commit is contained in:
Jonathan Bosson
2017-03-30 13:05:10 -06:00
parent 15450d9a9c
commit 55157ab429
3 changed files with 96 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/touch/include/TouchInteraction.h
View File

@@ -30,6 +30,7 @@
#include <openspace/util/camera.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/interaction/interactionmode.h>
#include <openspace/interaction/interactionhandler.h>
#include <openspace/properties/propertyowner.h>
@@ -83,7 +84,9 @@ class TouchInteraction : public properties::PropertyOwner
~TouchInteraction();
void update(const std::vector<TUIO::TuioCursor>& list, std::vector<Point>& lastProcessed);
void trace(const std::vector<TUIO::TuioCursor>& list);
void interpret(const std::vector<TUIO::TuioCursor>& list, const std::vector<Point>& lastProcessed);
void accelerate(const std::vector<TUIO::TuioCursor>& list, const std::vector<Point>& lastProcessed);
void step(double dt);
void configSensitivities(double dist);
void decelerate();
@@ -102,21 +105,24 @@ class TouchInteraction : public properties::PropertyOwner
void setSensitivity(double sensitivity);
private:
// could be removed
double _baseSensitivity;
double _baseFriction;
double _minHeightFromSurface;
Camera* _camera;
SceneGraphNode* _focusNode = nullptr;
properties::StringProperty _origin;
globebrowsing::RenderableGlobe* _globe;
bool _directTouchMode;
double _projectionScaleFactor;
double _currentRadius;
double _minHeightFromSurface;
std::vector<std::pair<int, SceneGraphNode*>> _selected;
InteractionType _action;
double _baseSensitivity;
double _baseFriction;
glm::dvec3 _centroid;
VelocityStates _vel;
ScaleFactor _friction;
ScaleFactor _sensitivity;