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

include both interaction modes

Browse Source
This commit is contained in:
Jonathan Bosson
2017-04-24 08:38:16 -06:00
parent 3157ac4378
commit b8e6e06aef
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ struct FunctionData {
std::vector<glm::dvec3> selectedPoints;
std::vector<glm::dvec2> screenPoints;
int nDOF;
glm::dvec2(*castToScreen)(glm::dvec3, Camera&, SceneGraphNode*, double);
glm::dvec2(*castToNDC)(glm::dvec3, Camera&, SceneGraphNode*, double);
double(*distToMinimize)(double* par, int x, void* fdata);
Camera* camera;
SceneGraphNode* node;
@@ -107,7 +107,6 @@ class TouchInteraction : public properties::PropertyOwner
void step(double dt);
void configSensitivities(double dist);
void decelerate();
glm::dvec2 modelToScreenSpace(glm::dvec3 vec, SceneGraphNode* node, double aspectRatio);
void clear();
void tap();