mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 15:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add strict test for whitespace at end of line

Browse Source 
More work on coding style
This commit is contained in:
Alexander Bock
2017-11-09 23:47:51 -05:00
parent 7b12a241ed
commit afa1d6d33e
223 changed files with 1402 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/include/touchinteraction.h
+8 -8
View File
@@ -72,7 +72,7 @@ public:
std::vector<glm::dvec3> selectedPoints;
std::vector<glm::dvec2> screenPoints;
int nDOF;
glm::dvec2(*castToNDC)(glm::dvec3, Camera&, SceneGraphNode*);
glm::dvec2(*castToNDC)(const glm::dvec3&, Camera&, SceneGraphNode*);
double(*distToMinimize)(double* par, int x, void* fdata, LMstat* lmstat);
Camera* camera;
SceneGraphNode* node;
@@ -86,12 +86,12 @@ public:
* 3 Continues if GUI isn't on
* 4 If the node in focus is large enough and all contact points have selected it,
* calls directControl() function for direct-manipulation
* 5 Updates std::vector<SelectedBody> _selected (only if LMA successfully
* 5 Updates std::vector<SelectedBody> _selected (only if LMA successfully
* converged, avoids interaction to snap on LMA fails)
* 6 If directControl() wasn't called this frame, interpret the incoming
* 6 If directControl() wasn't called this frame, interpret the incoming
* list and decide what type of interaction this frame should do
* 7 Compute the new total velocities after interaction
* 8 Evaluate if directControl should be called next frame- true if all contact points
* 8 Evaluate if directControl should be called next frame- true if all contact points
* select the same node and said node is larger than _nodeRadiusThreshold
*/
void updateStateFromInput(const std::vector<TUIO::TuioCursor>& list,
@@ -100,10 +100,10 @@ public:
// Calculates the new camera state with velocities and time since last frame
void step(double dt);
// Used to save LMA data for one frame if the user chose to
// Used to save LMA data for one frame if the user chose to
void unitTest();
// Called each frame we have no new input, used to reset data
// Called each frame we have no new input, used to reset data
void resetAfterInput();
// Sets _tap to true, called if tap occured current frame (called from touchmodule)
@@ -125,7 +125,7 @@ private:
bool guiMode(const std::vector<TUIO::TuioCursor>& list);
/* Function that calculates the new camera state such that it minimizes the L2 error
* in screenspace
* in screenspace
* between contact points and surface coordinates projected to clip space using LMA
*/
void directControl(const std::vector<TUIO::TuioCursor>& list);
@@ -136,7 +136,7 @@ private:
*/
void findSelectedNode(const std::vector<TUIO::TuioCursor>& list);
/* Returns an int (ROT = 0, PINCH, PAN, ROLL, PICK) for what interaction to be used,
/* Returns an int (ROT = 0, PINCH, PAN, ROLL, PICK) for what interaction to be used,
* depending on what input was gotten
*/
int interpretInteraction(const std::vector<TUIO::TuioCursor>& list,