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

func and grad should now be defined correctly, needs to be tested

Browse Source
This commit is contained in:
Jonathan Bosson
2017-04-13 16:20:20 -06:00
parent f2aebcd880
commit 47535e38f9
3 changed files with 174 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@
#endif
#include <list>
#include <functional>
#define ROT 0
#define PINCH 1
@@ -81,6 +82,16 @@ struct SelectedBody {
glm::dvec3 coordinates;
};
struct FunctionData {
Camera* camera;
SceneGraphNode* node;
double aspectRatio;
double* measurements;
int nDOF;
//std::function<glm::dvec3(glm::dvec2 vec, Camera* cam, SceneGraphNode* node, double aspectRatio)> toScreen;
//std::function<glm::dvec2(glm::dvec3 vec, Camera* cam, SceneGraphNode* node, double aspectRatio)> toSurface;
};
using Point = std::pair<int, TUIO::TuioPoint>;
class TouchInteraction : public properties::PropertyOwner