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

Solve merge conflict and add properties for friction and interaction parameters.

Browse Source
This commit is contained in:
kbladin
2016-06-30 14:07:51 -04:00
parent d4f89448e0 e40d393824
commit a89f474502
238 changed files with 3637 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/interactionmode.h
+4 -2
View File
@@ -116,7 +116,7 @@ protected:
}
void decelerate(double dt) {
_currentValue = _currentValue + (- _currentValue) *
min(_friction * dt, 1.0); // less or equal to 1.0 keeps it stable
min(_scaleFactor * _friction * dt, 1.0); // less or equal to 1.0 keeps it stable
}
void setHard(T value) {
_targetValue = value;
@@ -184,7 +184,9 @@ public:
*/
MouseStates(double sensitivity, double velocityScaleFactor);
void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
void setFriction(double friction);
void setRotationalFriction(double friction);
void setHorizontalFriction(double friction);
void setVerticalFriction(double friction);
void setSensitivity(double sensitivity);
void setVelocityScaleFactor(double scaleFactor);
private: